ADAM / AIAHTML5

Commit 4a6500fa7e167e281502ae5f16c241da7af1f6e5

Authored by Nikita Kulshreshtha
2 parents 53f67365 e26f5798

Refs: 7646, 7914 

commit after buBugFix.
Inline Side-by-side
Showing 3 changed files with 77 additions and 15 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @4a6500f
... ... @@ -1462,8 +1462,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1462 1462 // console.log('$rootScope.isListManagerSelected= ' + $rootScope.isListManagerSelected + ' length= ' + $scope.ColoredImageSRC.length)
1463 1463  
1464 1464  
1465   - if (($scope.ColoredImageSRC != null || $scope.ColoredImageSRC != undefined)) {
1466   -
  1465 + if (($scope.ColoredImageSRC != null || $scope.ColoredImageSRC != undefined)) {
  1466 +
1467 1467 if ((($rootScope.viewOrientationId == '1') || ($rootScope.viewOrientationId == '4')) && ($scope.ColoredImageSRC.length == 9)) {
1468 1468 $scope.isEligibleForHighlight = true;
1469 1469 }
... ... @@ -4925,7 +4925,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
4925 4925 $rootScope.isHighlightBodyByBodySystem = false;
4926 4926  
4927 4927 if ($rootScope.isHighLight == true) {
4928   -
  4928 +
4929 4929 }
4930 4930 else {
4931 4931 $rootScope.isHighLight = true;
... ... @@ -4994,6 +4994,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
4994 4994  
4995 4995  
4996 4996 if ($rootScope.isNormalMode == true) {
  4997 +
  4998 +
  4999 +
  5000 +
4997 5001  
4998 5002 }
4999 5003 else {
... ... @@ -5018,7 +5022,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5018 5022  
5019 5023 //7.
5020 5024 $scope.CalculateImageCordinates($rootScope.viewOrientationId);
5021   -
  5025 + // alert($rootScope.viewOrientationId + "gadash")
5022 5026 $("#canvasDiv").scrollTop($rootScope.CanvasDivTopPosition);
5023 5027 $("#canvasDiv").scrollLeft($rootScope.CanvasDivLeftPosition);
5024 5028  
... ... @@ -7422,7 +7426,33 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
7422 7426  
7423 7427 //list manager
7424 7428 $scope.$on('listManagerEvent', function (event, data) {
7425   -
  7429 +
  7430 + if ($rootScope.disableAnnotationtoolOnListManager == true)
  7431 + {
  7432 + $('#AnnotaionPopupDiv').find('input, textarea, button, select').attr('disabled', 'disabled');
  7433 + $('#slider-range-min-2').slider('disable');
  7434 + if ($rootScope.setListManagerZindex == true)
  7435 + {
  7436 + var canvasPaintZindex = $('#canvasPaint').css("z-index"); //x
  7437 +
  7438 + var canvasZindex = $('#canvas').css("z-index"); //y
  7439 + var listManagerZindex = $('#listManager').css("z-index"); //z
  7440 + if (canvasPaintZindex > canvasZindex) {
  7441 + //y = parseInt(canvasPaintZindex) + 1;
  7442 + //if (listManagerZindex <= canvasPaintZindex) {
  7443 + // listManagerZindex = parseInt(canvasPaintZindex) + 1;
  7444 + // $('#listManager').css("z-index", z);
  7445 + //}
  7446 + //else {
  7447 + $('#listManager').css("z-index", canvasPaintZindex);
  7448 + // }
  7449 + } else {
  7450 + //y = parseInt(y) + 1;
  7451 + $('#listManager').css("z-index", canvasZindex);
  7452 + }
  7453 +
  7454 + }
  7455 + }
7426 7456 $('#spinner').css('visibility', 'visible');
7427 7457 console.log('listManagerEvent');
7428 7458  
... ... @@ -7535,6 +7565,19 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
7535 7565 $scope.terminateCurrentlyRunningWPs();
7536 7566 //debugger
7537 7567 $rootScope.isListManagerSelected = true;
  7568 + //---
  7569 + if ($rootScope.isListManagerSelected == true) {
  7570 + $("#btnHighLight").addClass("btn-primary");
  7571 + $("#btnHighLight").removeClass("btn-black");
  7572 + if (!$("#btnNormalMode").hasClass("btn-black")) {
  7573 + $("#btnNormalMode").addClass("btn-black");
  7574 + }
  7575 +
  7576 + if ($("#btnNormalMode").hasClass("btn-primary")) {
  7577 + $("#btnNormalMode").removeClass("btn-primary");
  7578 + }
  7579 + }
  7580 + //---
7538 7581 $rootScope.isLoading = true;
7539 7582  
7540 7583 $('#spinner').css('visibility', 'visible');
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @4a6500f
... ... @@ -26,6 +26,7 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;,
26 26 $rootScope.clickDrag = new Array();
27 27 $rootScope.isLineDrawSelecyed = false;
28 28 $rootScope.isAnnotationWindowClose = false;
  29 + $rootScope.setListManagerZindex = false;
29 30 $rootScope.lastX;
30 31 $rootScope.lastY;
31 32 $rootScope.CommonData;
... ... @@ -158,19 +159,21 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;,
158 159  
159 160  
160 161 //----Annotation Toolbar: Jcanvas-----
161   -
  162 +
162 163 $rootScope.DrLine = function (e) {
163   -
  164 + $rootScope.setListManagerZindex = true;
164 165 $("#canvasPaint").css("display", "block");
165 166 $("#canvas").css("display", "block");
166 167  
167 168 $rootScope.switchCanvas();
168 169 $rootScope.shapeType = "Line";
169   -
  170 +
  171 +
170 172 $('.btnCursor').removeClass('activebtncolor');
171 173 $(".btn-annotation").removeClass("activebtncolor");
172 174 $(".btn-annotation-line").addClass("activebtncolor");
173 175  
  176 +
174 177 }
175 178  
176 179  
... ... @@ -180,6 +183,7 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;,
180 183  
181 184 $rootScope.switchCanvas();
182 185 $rootScope.switchCanvas();
  186 + $rootScope.setListManagerZindex = true;
183 187 $rootScope.shapeType = "Pin";
184 188  
185 189 $('.btnCursor').removeClass('activebtncolor');
... ... @@ -196,8 +200,9 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;,
196 200 $('.btnCursor').addClass('activebtncolor');
197 201 }
198 202  
  203 +
199 204 $rootScope.DrawRectangle = function (e) {
200   -
  205 + $rootScope.setListManagerZindex = true;
201 206 $("#canvasPaint").css("display", "block");
202 207 $("#canvas").css("display", "block");
203 208 $rootScope.switchCanvas();
... ... @@ -209,6 +214,7 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;,
209 214 $rootScope.paintBrush = function () {
210 215 // debugger;
211 216 // $('.btnCursor').addClass('activebtncolor');
  217 + $rootScope.setListManagerZindex = true;
212 218 $("#canvasPaint").css("display", "block");
213 219 $("#canvas").css("display", "block");
214 220 $rootScope.switchCanvasToPaintCanvas();
... ... @@ -244,6 +250,7 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;,
244 250 }
245 251  
246 252 $rootScope.DrawCircle = function (e) {
  253 + $rootScope.setListManagerZindex = true;
247 254 $("#canvasPaint").css("display", "block");
248 255 $("#canvas").css("display", "block");
249 256 $rootScope.switchCanvas();
... ... @@ -254,6 +261,7 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;,
254 261 }
255 262  
256 263 $rootScope.DrawArrow = function (e) {
  264 + $rootScope.setListManagerZindex = true;
257 265 $("#canvasPaint").css("display", "block");
258 266 $("#canvas").css("display", "block");
259 267 $rootScope.switchCanvas();
... ... @@ -263,6 +271,7 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;,
263 271 $(".btn-annotation-arrow").addClass("activebtncolor");
264 272 }
265 273 $rootScope.DrawText = function () {
  274 + $rootScope.setListManagerZindex = true;
266 275 $("#canvasPaint").css("display", "block");
267 276 $("#canvas").css("display", "block");
268 277 $rootScope.switchCanvas();
... ... @@ -276,6 +285,7 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;,
276 285 }
277 286  
278 287 $rootScope.DrawPolygon = function () {
  288 + $rootScope.setListManagerZindex = true;
279 289 $("#canvasPaint").css("display", "block");
280 290 $("#canvas").css("display", "block");
281 291 $rootScope.shapeType = "DrawPolygon";
... ... @@ -441,9 +451,11 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;,
441 451 //list manager function
442 452  
443 453 //list manager function
444   -
  454 +
  455 + $rootScope.disableAnnotationtoolOnListManager = false;
445 456 $rootScope.ShowListManager = function () {
446 457 console.log('ShowListManager')
  458 + $rootScope.disableAnnotationtoolOnListManager = true;
447 459  
448 460 $rootScope.isLoading = true;
449 461 $('#spinner').css('visibility', 'visible');
... ... @@ -460,6 +472,12 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;,
460 472  
461 473 $rootScope.CloseListManager = function () {
462 474 console.log('close')
  475 +
  476 + $rootScope.disableAnnotationtoolOnListManager = false;
  477 + if ($rootScope.disableAnnotationtoolOnListManager == false) {
  478 + $('#AnnotaionPopupDiv').find('input, textarea, button, select,img,div').removeAttr('disabled', 'disabled');
  479 + $('#slider-range-min-2').slider('enable');
  480 + }
463 481 //$rootScope.isListManagerSelected = false;
464 482 $('#listManager').css('display', 'none');
465 483 $("#listManager").css("visibility", "hidden");
... ...
400-SOURCECODE/AIAHTML5.Web/index.html
  View file @4a6500f
... ... @@ -408,18 +408,18 @@
408 408 <button type="button" class="close" aria-label="Close" ng-click="CloseAnnotationTool()"><span aria-hidden="true">&times;</span></button>
409 409 <h4 class="modal-title" id="myModalLabel">Annotation</h4>
410 410 </div>
411   - <div class="modal-body">
  411 + <div class="modal-body" id="AnnotaionPopupDiv" >
412 412 <div class="row">
413 413 <div class="col-sm-12">
414 414 <h5>Mode</h5>
415 415  
416 416 <div class="btn-group btn-group-justified" role="group" aria-label="...">
417 417 <div class="btn-group" role="group" tooltip>
418   - <div id="identify-block" style="display: none; font-size:13px;">Identify Mode</div>
419   - <button id="OnIdentify" type="button" class="btn btn-sm btn-success" ng-click="OnIdentifyClick()">Identify</button>
  418 + <div id="identify-block" style="display: none; font-size:13px;">Identify Mode</div>
  419 + <button id="OnIdentify" type="button" class="btn btn-sm btn-success" ng-click="OnIdentifyClick()">Identify</button>
420 420 </div>
421 421 <div class="btn-group" role="group">
422   - <div id="draw-block" style="display: none; font-size: 13px;">Draw Mode</div>
  422 + <div id="draw-block" style="display: none; font-size: 13px;">Draw Mode</div>
423 423 <button id="DrawMode" type="button" ng-click="DrawingMode()" class="btn btn-sm btn-success">Draw</button>
424 424 </div>
425 425 </div>
... ... @@ -444,7 +444,7 @@
444 444 </div>
445 445 </div>
446 446 <div class="well-popup well">
447   - <img src="content/images/blank-shape.jpg" alt="..." class="img-rounded img-responsive" ng-click="enableAnnotationToolBar()">
  447 + <img src="content/images/blank-shape.jpg" alt="..." class="img-rounded img-responsive" ng-click="disableAnnotationtoolOnListManager||enableAnnotationToolBar()">
448 448 </div>
449 449 <div class="well well-popup">
450 450 <div class="" role="group" aria-label="...">
... ... @@ -1394,6 +1394,7 @@
1394 1394 });
1395 1395 </script>
1396 1396  
  1397 +
1397 1398  
1398 1399  
1399 1400 </body>
... ...