Merge branch 'Develop' of http://52.6.196.163/ADAM/AIAHTML5 into HEAD

unknown
2 parents 29c622f5 00a3c44f
Showing 3 changed files with 104 additions and 68 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
@@ -45,7 +45,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
     $scope.doHighlightOrExtract = false;
     $scope.isEligibleForHighlightBodyByTermList = false;
-  //  $scope.AnteriorView = "active";
+    //  $scope.AnteriorView = "active";
     $scope.zoomInOut = 75;
     $scope.speechBubbleCounter = 0;
@@ -943,17 +943,17 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
         var isiOSSafari = (navigator.userAgent.match(/iPad/i)) ? true : false;
         //set scrollbars on canvas and hide loading label
-         $('#daLoaderLabel').css('visibility', 'hidden')
+        $('#daLoaderLabel').css('visibility', 'hidden')
-            $('#canvasDiv').css('overflow', 'scroll')
-            if (isiOSSafari) {
-                $('#canvasDiv').scrollLeft($('#canvasDiv').width() + 150)
+        $('#canvasDiv').css('overflow', 'scroll')
+        if (isiOSSafari) {
+            $('#canvasDiv').scrollLeft($('#canvasDiv').width() + 150)
-            }
-            else {
-                $('#canvasDiv').scrollLeft($('#canvasDiv').width() / 2)
-            }
+        }
+        else {
+            $('#canvasDiv').scrollLeft($('#canvasDiv').width() / 2)
+        }
         // $('#canvasDiv').scrollLeft($scope.imageHorizontlScrollPosition)
@@ -1420,16 +1420,19 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
             if (isMaskImage == 'N') {
-                $scope.ColoredImageSRC.push(
-                                                {
-                                                    "bodyRegionId": bodyRegionId, "SRC": src,
-                                                    "Height": h,
-                                                    "Width": w,
-                                                    "x": x,
-                                                    "y": y,
-                                                    "haveMirror": 'true'
-                                                }
-                                               );
+
+              
+                    $scope.ColoredImageSRC.push(
+                                                    {
+                                                        "bodyRegionId": bodyRegionId, "SRC": src,
+                                                        "Height": h,
+                                                        "Width": w,
+                                                        "x": x,
+                                                        "y": y,
+                                                        "haveMirror": 'true'
+                                                    }
+                                                   );
+                
                 //   console.log('$rootScope.isListManagerSelected= ' + $rootScope.isListManagerSelected + ' length= ' + $scope.ColoredImageSRC.length)
@@ -1454,7 +1457,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                     if ($scope.isEligibleForHighlight == true)
                     {
-                      if ($rootScope.isHighLight == true || ($rootScope.isListManagerSelected == true) || (($rootScope.isGenderChnage == true) && ($rootScope.isHighLight == true)) || (($rootScope.isViewChange == true) && ($rootScope.isHighLight == true))) {
+                        if ($rootScope.isHighLight == true || ($rootScope.isListManagerSelected == true) || (($rootScope.isGenderChnage == true) && ($rootScope.isHighLight == true)) || (($rootScope.isViewChange == true) && ($rootScope.isHighLight == true))) {
                             $rootScope.isLoading = false;
                             $('#spinner').css('visibility', 'hidden');
@@ -1734,6 +1737,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
         img.src = src;
+        
+
         function start() {
             //debugger;
             context.drawImage(img, 0, 0);
@@ -1743,17 +1748,19 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                     //do nothing
                 }
                 else {
-                    $scope.ColoredImageSRC.push(
-                                       {
-                                           "bodyRegionId": bodyRegionId, "SRC": src,
-                                           "Height": h,
-                                           "Width": w,
-                                           "x": x,
-                                           "y": y,
-                                           "haveMirror": 'false'
-                                       }
-
-                                      );
+                  
+                        $scope.ColoredImageSRC.push(
+                                           {
+                                               "bodyRegionId": bodyRegionId, "SRC": src,
+                                               "Height": h,
+                                               "Width": w,
+                                               "x": x,
+                                               "y": y,
+                                               "haveMirror": 'false'
+                                           }
+
+                                          );
+                    
                     if (($scope.ColoredImageSRC != null || $scope.ColoredImageSRC != undefined)) {
@@ -1851,10 +1858,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
         if ($rootScope.isListManagerSelected) {
-                    multiTermList = $scope.AllTerms;
+            multiTermList = $scope.AllTerms;
-       }          
-       else if (($rootScope.previousHighlightList != null || $rootScope.previousHighlightList != undefined) && ($rootScope.previousHighlightList.length > 0)) {
+        }          
+        else if (($rootScope.previousHighlightList != null || $rootScope.previousHighlightList != undefined) && ($rootScope.previousHighlightList.length > 0)) {
             angular.forEach($rootScope.previousHighlightList, function (value, key) {
                 var ActualTermNo = $scope.getActualTermNumber(value);
@@ -2414,10 +2421,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
     $scope.LayerChange = function () {
-         //if listanager is visisble then close it
-         $rootScope.isListManagerSelected = false;
+        //if listanager is visisble then close it
+        $rootScope.isListManagerSelected = false;
-         $rootScope.CloseListManager();
+        $rootScope.CloseListManager();
@@ -2506,6 +2513,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
         }
         else {
+
+           
             //1. Dated:13-07-2016 Issue #4965 : The layer number should not extend beyond its level through layer text box.
             var dataLength = $rootScope.BodyLayerData.Layers.DataLayer.length;
             if (parseInt($('#txtlayerNumber').val()) > (dataLength - 1)) {
@@ -2516,6 +2525,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
             else
                 $scope.currentLayerNumber = parseInt($('#txtlayerNumber').val());
+            //$scope.isMousUp();
+
+            //alert('$scope.currentLayerNumber');
+
             $rootScope.isLoading = true;
             $('#spinner').css('visibility', 'visible');
             var canDiv = document.getElementById('canvasDiv');
@@ -2524,6 +2537,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                 canDiv.innerHTML = '';
             }
+
+
             //2.
             $scope.CalculateImageCordinates($rootScope.viewOrientationId);
@@ -2543,6 +2558,14 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
         $('#layerChangeSlider').slider("option", "value", parseInt($rootScope.totalLayers) - parseInt($scope.layerNumber));
     }
+    $scope.LayerChangeOnMouseUpDown = function (e)
+    {
+     
+        $scope.LayerChange();
+
+    }
+
+
     $scope.DisableProgressBar = function () {
         // alert('Disabled wait cursor is called');
@@ -3406,8 +3429,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
         //if listanager is visisble then close it
-            $rootScope.isListManagerSelected = false;
-            $rootScope.CloseListManager();
+        $rootScope.isListManagerSelected = false;
+        $rootScope.CloseListManager();
         $scope.isTransparencyActivated = true;
@@ -3427,6 +3450,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
         canvasDiv.addEventListener("mouseup", mouseUpListener)
+        
     }
     function mouseDownListener(e) {
@@ -3511,6 +3535,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
         // $selection.remove();
         // debugger;
+        //alert('mouse up');
+        console.log('MOUSE UP');
+
         $scope.currentLayerNumber = parseInt($('#txtlayerNumber').val());
         $('.rectangle').remove();
@@ -3813,7 +3840,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                 //do nothing
             }
             else if (isLayerChanged) {
-                // debugger
+               
+               // alert('isMousUp on isLayerChanged');
+
                 $scope.layerNumber = parseInt($('#txtlayerNumber').val());
             }
@@ -4803,7 +4832,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
         //if listanager is visisble then close it
-      //  $rootScope.isListManagerSelected = false;
+        //  $rootScope.isListManagerSelected = false;
         $rootScope.CloseListManager();
         if ($rootScope.isHighLight == true) {
@@ -4864,10 +4893,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
         console.log('enableNormalMode is called');
-       // $rootScope.isHighLight = false;
+        // $rootScope.isHighLight = false;
-            //to do should not call every time
-            $rootScope.CloseListManager();
+        //to do should not call every time
+        $rootScope.CloseListManager();
         if ($rootScope.isNormalMode == true) {
@@ -4928,7 +4957,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
         //if listanager is visisble then close it
-       // $rootScope.isListManagerSelected = false;
+        // $rootScope.isListManagerSelected = false;
         $rootScope.CloseListManager();
         //1.
         $rootScope.isLoading = true;
@@ -5213,7 +5242,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                             else if ($rootScope.isListManagerSelected == true) {
                                 console.log('1. $rootScope.isExtract=true and $rootScope.isListManagerSelected == true')
-                               $timeout(function () { $scope.HighlightBodyOnExtract() }, 50);
+                                $timeout(function () { $scope.HighlightBodyOnExtract() }, 50);
                             }
                         }
@@ -5376,7 +5405,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                             console.log('2. $rootScope.isExtract=true and $rootScope.isListManagerSelected == true')
                             $timeout(function () { $scope.HighlightBodyOnExtract() }, 50);
-                         }
+                        }
                     }
                 }
@@ -5458,8 +5487,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
         //if listanager is visisble then close it
-            $rootScope.isListManagerSelected = false;
-            $rootScope.CloseListManager();
+        $rootScope.isListManagerSelected = false;
+        $rootScope.CloseListManager();
         $rootScope.isLoading = true;
         $('#spinner').css('visibility', 'visible');
@@ -5778,13 +5807,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
     $scope.$on('reloadDABodyViewEvent', function (event, data) {
         //console.log('reloadDABodyViewEvent');
         $scope.layerNumber = parseInt($('#txtlayerNumber').val());
-        //$scope.ReloadBodyViewId = data.reloadDABodyViewId;
-        //  $scope.layerNumber = 0;
-        //  debugger;
+        //alert('mouseUp');
-        //console.log('reloadDABodyViewEvent ' + $scope.ReloadBodyViewId);
-
-        //if ($rootScope.isSettingEventAlredayDispachted == true) {
+      
         $scope.loadSelectedBodyView(data.reloadDABodyViewId);
@@ -5797,6 +5822,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
     })
+ 
+
     $scope.loadSelectedBodyViewNavigator = function (currentBodyViewId) {
         //$rootScope.voId = currentBodyViewId;
@@ -7630,7 +7657,14 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
     }
-
+    $scope.LayerChangeBasedOnKeyPressed = function (e) {
+       
+        if(e.keyCode==13)
+        {
+           $scope.LayerChange();
+        }
+      
+    }
 }]
 );
 \ No newline at end of file
@@ -312,6 +312,7 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;, 
         $rootScope.shapestyle = function (id) {
             document.getElementById('modelbackground').style.display = "none";
+            document.getElementById('modeleditstyle').style.display = "none";
             $rootScope.shapestyleOpacity = $("#" + id).css('opacity');
             $rootScope.shapestyleFillColor = $("#" + id).parent().css('background-color');
@@ -334,15 +335,17 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;, 
         }
         $rootScope.enableAnnotationToolBar = function () {
-
+           
             document.getElementById('modelbackground').style.display = "block";
-            $("#editshapestyle").modal('show');
+            //$("#editshapestyle").modal('show');
+            document.getElementById('modeleditstyle').style.display = "block";
         }
         $rootScope.disableAnnotationToolBar = function () {
             document.getElementById('modelbackground').style.display = "none";
+            document.getElementById('modeleditstyle').style.display = "none";
         }
@@ -55,19 +55,18 @@
         display: none;
     }
     .customTooltip {
-        background-color: #fff !important;
-        color: #000 !important;
+        background: #333 !important;
+        color: #fff !important;
         opacity: 0.9 !important;
-       
     }
     .custom-tooltip {
-        background-color: #fff;
+        background-color: #333;
         border: 0 none;
-        color: #000;
+        color: #fff !important;
         left: -52px;
         opacity: 0.9;
         padding: 7px;
@@ -83,9 +82,9 @@
     }
     .custom-tooltip1 {
-        background-color: #fff;
+        background-color: #333;
         border: 0 none;
-        color: #000;
+        color: #fff !important;
         left: 52px;
         opacity: 0.9;
         padding: 7px;
@@ -101,9 +100,9 @@
     }
     .custom-tooltip2 {
-        background-color: #fff;
+        background-color: #333;
         border: 0 none;
-        color: #000;
+        color: #fff !important;
         right: 10px;
         opacity: 0.9;
         padding: 7px;
@@ -222,7 +221,7 @@
         </div>
         <div class="">
             <p>
-                <input type="number" id="txtlayerNumber" value="0" step="1" min="0" style="width:80px; margin:10px 0 0 15px;" ng-model="layerNumber" ng-change="LayerChange()" />
+                <input class="item" type="number" id="txtlayerNumber" value="0" step="1" min="0" style="width:80px; margin:10px 0 0 15px;" ng-model="layerNumber" ng-keydown="LayerChangeBasedOnKeyPressed($event)" ng-click="LayerChangeOnMouseUpDown($event)" />
             </p>
             <div id="layerChangeSlider" style="height:140px;" class="vert_slider " ng-model="layerNumber"></div>
         </div>