Navigator working fine.

Mitali Srivastava
1 parent fba1b7a5
Showing 3 changed files with 43 additions and 34 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
@@ -87,18 +87,20 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
     $scope.isBodyRegionDataLoaded = false;
     //currentTitleFromJson shows the current BodyView Title 
     $scope.currentTitleFromJson;
+
     //navigator man functionality
     $scope.NavOrientationdata;
     $scope.NavigatorData;
     $scope.navimgsrc;
  
-    $scope.dragdivleft=35;
-    $scope.dragdivtop=10;
+    $scope.dragdivleft=0;
+    $scope.dragdivtop=0;
  
     $scope.dragdivposition = {
         "left": $scope.dragdivleft,
         "top": $scope.dragdivtop
     };
+    //Navman scope ends
  
     $scope.showme = false;
     $scope.IsVisible = function () {
@@ -810,7 +812,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
  
         }
         else {
-            $('#canvasDiv').scrollLeft($('#canvasDiv').width() / 2)
+             $('#canvasDiv').scrollLeft($('#canvasDiv').width() / 2)
         }
         // $('#canvasDiv').scrollLeft($scope.imageHorizontlScrollPosition)
         $('#canvasDiv').scrollTop(50)
@@ -826,15 +828,38 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
  
         //NavMan Code
  
-        //var navdivh = Math.floor($('#canvasDiv').height() / 3);
-        //var navdivw = Math.floor($('#canvasDiv').width() / 9);
+        var navdivh = Math.floor($('#canvasDiv').height() / 3);
+        var navdivw = Math.floor($('#canvasDiv').width() / 9);
+
+        var dragdivh = Math.floor(($('#canvasDiv').height() / $('#canvasDiv')[0].scrollHeight) * 119) //119px is the height of the image
+
+        if ($('#canvasDiv')[0].scrollWidth > $('#canvasDiv')[0].clientWidth) {
  
-        //alert("nav div height and width should be:" + navdivh + "navdivw");
+            var dragdivw = 42
+            $scope.dragdivleft = 21;
+            $scope.dragdivtop = 0;
+
+            $scope.dragdivposition = {
+                "left": 21,
+                "top": 0
+            };
+        }
+        else
+        {
+            var dragdivw = 83;
+
+            $scope.dragdivleft = 0;
+            $scope.dragdivtop = 0;
+
+            $scope.dragdivposition = {
+                "left": 0,
+                "top": 0
+
+            };
+        }
  
-        //$('#containment-wrapper').css('width', navdivw);
-        //$('#containment-wrapper').css('height', navdivh)
-        //$scope.ycan = $("#canvasDiv").scrollTop();
-        //$scope.xcan = $("#canvasDiv").scrollLeft();
+        $('#draggable').css('width', dragdivw);
+        $('#draggable').css('height', dragdivh)
     }
  
     function scaleRectangle(x, y, height, width, mirrorValue) {
@@ -15,7 +15,8 @@
 </style>-->
  
 <style>
-    #draggable { width: 50px; height: 26px;opacity: 0.2;border:solid;position:absolute;}   
+    /*#draggable { width: 50px; height: 26px;opacity: 0.2;border:solid;position:absolute;}*/ 
+     #draggable { opacity: 0.2;border:solid;position:absolute;}     
     #wrapper {
         position: relative;
         width: 100%;
@@ -199,34 +200,19 @@
                             <i class="fa fa-male"></i>
                         </button> 
  
-                        <div class="dropdown-menu active" style="min-height:144px;min-width:auto;">
-                            <div class="paddlftrgt10" id="containment-wrapper" align="center" style="width:120px;height:144px;">
-                                <!--<img src="~/../content/images/DA/ethnicity/body-views/1/A/navigator_images/da_oi_81.jpg" alt="">-->
-                                <img src="{{navimgsrc}}" alt=""></img>
+                        <div class="dropdown-menu active" style="min-height:119px;min-width:auto;">
+                            <div id="containment-wrapper" align="center" style="min-width:auto;height:119px;">
+                                <img id="navimg" src="{{navimgsrc}}" alt=""></img>
                                 <div id="draggable" class="draggable ui-widget-content" ng-mouseup="ScrollCanvasDiv()" ng-style="dragdivposition">
                                 </div>
                             </div>
                         </div>
-                            <!--<div id="Navcanvasdiv" class="dropdown-menu active" style="min-width:auto;">
-            <div class="paddlftrgt10">
-                <canvas id="navcanvas" align="center"></canvas>
-            </div>
-        </div>-->
-
                         </div>
  
                 </div>
             </div>
         </div>
  
-        <!--<div id="Navcanvasdiv" class="collapse">
-            <canvas id="navcanvas">
-             <div class="draggable ui-widget-content">
-                <p id="draggable4" class="ui-widget-header">I'm contained within my parent</p>
-            </div>
-            </canvas>
-        </div>-->
-
  
  
         <div class=" canavsParent col-sm-12 " id="cp">
@@ -219,9 +219,6 @@ footer.dark {
 .marginTopBtm10 {
 	margin: 10px 0!important
 }
-.paddingTopBtm10 {
-	padding: 10px 0
-}
 .page-header {
 	border-bottom: 0!important
 }
@@ -770,5 +767,6 @@ cursor:pointer;
 }
  
 .annotationbar {
-            max-width: 300px;
-            width: 100%;
 \ No newline at end of file
+    max-width: 300px;
+    width: 100%;
+}