Merge branch 'SearchFixForMLRandMedialView' into Develop

Amrita Vishnoi
2 parents 280181a9 8eb71d1a
Showing 1 changed file with 14 additions and 10 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -4905,21 +4905,26 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
         //        }
         //    }
         //}
-        var loopLength = 0;
+        var endIndex = 0;
+        var startIndex = 0;
         if (($rootScope.viewOrientationId == '1') || ($rootScope.viewOrientationId == '4')) {
-            loopLength = 7;
+            endIndex = 6;
+            startIndex = 1;
         }
-        else if (($rootScope.viewOrientationId == '2') || ($rootScope.viewOrientationId == '3')){
-            loopLength = 5;
+        else if (($rootScope.viewOrientationId == '2') || ($rootScope.viewOrientationId == '3')) {
+            endIndex = 5;
+            startIndex = 1;
         }
         else if (($rootScope.viewOrientationId == '5')) {
-            loopLength = 4;
+            endIndex = 6;
+            startIndex = 2;
         }
-        else if (($rootScope.viewOrientationId == '6'))  {
-            loopLength = 1;
+        else if (($rootScope.viewOrientationId == '6')) {
+            endIndex = 6;
+            startIndex = 6;
         }
-        for (var i = 1; i < loopLength; i++) {
+        for (var i = startIndex; i <= endIndex; i++) {
             var id;
             var maskId;
@@ -4935,7 +4940,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
             if (maskcanvas != null || maskcanvas != undefined)
                 document.getElementById('canvasDiv').removeChild(maskcanvas);
-            if (loopLength == 7) {
+            if (endIndex == 6) {
                 if (i == 4 || i == 5 || i == 6) {
                     id = 'imageCanvas' + i + '_MR';
@@ -4962,7 +4967,6 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
     }
-
     $scope.terminateCurrentlyRunningWPs = function () {
         if ($scope.runningWorkers != null || $scope.runningWorkers != undefined) {
             var workerCount = $scope.runningWorkers.length;