Commit 68f8eacb1e1b6a47c3bea2eb1b9b2fec36bf4b06
88 Merged Request
Showing
3 changed files
with
77 additions
and
13 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
| ... | ... | @@ -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 | } |
| ... | ... | @@ -4926,7 +4926,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo |
| 4926 | 4926 | $rootScope.isHighlightBodyByBodySystem = false; |
| 4927 | 4927 | |
| 4928 | 4928 | if ($rootScope.isHighLight == true) { |
| 4929 | - | |
| 4929 | + | |
| 4930 | 4930 | } |
| 4931 | 4931 | else { |
| 4932 | 4932 | $rootScope.isHighLight = true; |
| ... | ... | @@ -5000,6 +5000,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo |
| 5000 | 5000 | |
| 5001 | 5001 | |
| 5002 | 5002 | if ($rootScope.isNormalMode == true) { |
| 5003 | + | |
| 5004 | + | |
| 5005 | + | |
| 5006 | + | |
| 5003 | 5007 | |
| 5004 | 5008 | } |
| 5005 | 5009 | else { |
| ... | ... | @@ -5024,6 +5028,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo |
| 5024 | 5028 | |
| 5025 | 5029 | //7. |
| 5026 | 5030 | $scope.CalculateImageCordinates($rootScope.viewOrientationId); |
| 5031 | + // alert($rootScope.viewOrientationId + "gadash") | |
| 5027 | 5032 | |
| 5028 | 5033 | |
| 5029 | 5034 | $("#canvasDiv").scrollTop($rootScope.CanvasDivTopPosition); |
| ... | ... | @@ -7428,7 +7433,33 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo |
| 7428 | 7433 | |
| 7429 | 7434 | //list manager |
| 7430 | 7435 | $scope.$on('listManagerEvent', function (event, data) { |
| 7431 | - | |
| 7436 | + | |
| 7437 | + if ($rootScope.disableAnnotationtoolOnListManager == true) | |
| 7438 | + { | |
| 7439 | + $('#AnnotaionPopupDiv').find('input, textarea, button, select').attr('disabled', 'disabled'); | |
| 7440 | + $('#slider-range-min-2').slider('disable'); | |
| 7441 | + if ($rootScope.setListManagerZindex == true) | |
| 7442 | + { | |
| 7443 | + var canvasPaintZindex = $('#canvasPaint').css("z-index"); //x | |
| 7444 | + | |
| 7445 | + var canvasZindex = $('#canvas').css("z-index"); //y | |
| 7446 | + var listManagerZindex = $('#listManager').css("z-index"); //z | |
| 7447 | + if (canvasPaintZindex > canvasZindex) { | |
| 7448 | + //y = parseInt(canvasPaintZindex) + 1; | |
| 7449 | + //if (listManagerZindex <= canvasPaintZindex) { | |
| 7450 | + // listManagerZindex = parseInt(canvasPaintZindex) + 1; | |
| 7451 | + // $('#listManager').css("z-index", z); | |
| 7452 | + //} | |
| 7453 | + //else { | |
| 7454 | + $('#listManager').css("z-index", canvasPaintZindex); | |
| 7455 | + // } | |
| 7456 | + } else { | |
| 7457 | + //y = parseInt(y) + 1; | |
| 7458 | + $('#listManager').css("z-index", canvasZindex); | |
| 7459 | + } | |
| 7460 | + | |
| 7461 | + } | |
| 7462 | + } | |
| 7432 | 7463 | $('#spinner').css('visibility', 'visible'); |
| 7433 | 7464 | console.log('listManagerEvent'); |
| 7434 | 7465 | |
| ... | ... | @@ -7541,6 +7572,19 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo |
| 7541 | 7572 | $scope.terminateCurrentlyRunningWPs(); |
| 7542 | 7573 | //debugger |
| 7543 | 7574 | $rootScope.isListManagerSelected = true; |
| 7575 | + //--- | |
| 7576 | + if ($rootScope.isListManagerSelected == true) { | |
| 7577 | + $("#btnHighLight").addClass("btn-primary"); | |
| 7578 | + $("#btnHighLight").removeClass("btn-black"); | |
| 7579 | + if (!$("#btnNormalMode").hasClass("btn-black")) { | |
| 7580 | + $("#btnNormalMode").addClass("btn-black"); | |
| 7581 | + } | |
| 7582 | + | |
| 7583 | + if ($("#btnNormalMode").hasClass("btn-primary")) { | |
| 7584 | + $("#btnNormalMode").removeClass("btn-primary"); | |
| 7585 | + } | |
| 7586 | + } | |
| 7587 | + //--- | |
| 7544 | 7588 | $rootScope.isLoading = true; |
| 7545 | 7589 | |
| 7546 | 7590 | $('#spinner').css('visibility', 'visible'); | ... | ... |
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
| ... | ... | @@ -26,6 +26,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", |
| 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; |
| ... | ... | @@ -167,19 +168,21 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", |
| 167 | 168 | |
| 168 | 169 | |
| 169 | 170 | //----Annotation Toolbar: Jcanvas----- |
| 170 | - | |
| 171 | + | |
| 171 | 172 | $rootScope.DrLine = function (e) { |
| 172 | - | |
| 173 | + $rootScope.setListManagerZindex = true; | |
| 173 | 174 | $("#canvasPaint").css("display", "block"); |
| 174 | 175 | $("#canvas").css("display", "block"); |
| 175 | 176 | |
| 176 | 177 | $rootScope.switchCanvas(); |
| 177 | 178 | $rootScope.shapeType = "Line"; |
| 178 | - | |
| 179 | + | |
| 180 | + | |
| 179 | 181 | $('.btnCursor').removeClass('activebtncolor'); |
| 180 | 182 | $(".btn-annotation").removeClass("activebtncolor"); |
| 181 | 183 | $(".btn-annotation-line").addClass("activebtncolor"); |
| 182 | 184 | |
| 185 | + | |
| 183 | 186 | } |
| 184 | 187 | |
| 185 | 188 | |
| ... | ... | @@ -189,6 +192,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", |
| 189 | 192 | |
| 190 | 193 | $rootScope.switchCanvas(); |
| 191 | 194 | $rootScope.switchCanvas(); |
| 195 | + $rootScope.setListManagerZindex = true; | |
| 192 | 196 | $rootScope.shapeType = "Pin"; |
| 193 | 197 | |
| 194 | 198 | $('.btnCursor').removeClass('activebtncolor'); |
| ... | ... | @@ -205,8 +209,9 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", |
| 205 | 209 | $('.btnCursor').addClass('activebtncolor'); |
| 206 | 210 | } |
| 207 | 211 | |
| 212 | + | |
| 208 | 213 | $rootScope.DrawRectangle = function (e) { |
| 209 | - | |
| 214 | + $rootScope.setListManagerZindex = true; | |
| 210 | 215 | $("#canvasPaint").css("display", "block"); |
| 211 | 216 | $("#canvas").css("display", "block"); |
| 212 | 217 | $rootScope.switchCanvas(); |
| ... | ... | @@ -218,6 +223,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", |
| 218 | 223 | $rootScope.paintBrush = function () { |
| 219 | 224 | // debugger; |
| 220 | 225 | // $('.btnCursor').addClass('activebtncolor'); |
| 226 | + $rootScope.setListManagerZindex = true; | |
| 221 | 227 | $("#canvasPaint").css("display", "block"); |
| 222 | 228 | $("#canvas").css("display", "block"); |
| 223 | 229 | $rootScope.switchCanvasToPaintCanvas(); |
| ... | ... | @@ -253,6 +259,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", |
| 253 | 259 | } |
| 254 | 260 | |
| 255 | 261 | $rootScope.DrawCircle = function (e) { |
| 262 | + $rootScope.setListManagerZindex = true; | |
| 256 | 263 | $("#canvasPaint").css("display", "block"); |
| 257 | 264 | $("#canvas").css("display", "block"); |
| 258 | 265 | $rootScope.switchCanvas(); |
| ... | ... | @@ -263,6 +270,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", |
| 263 | 270 | } |
| 264 | 271 | |
| 265 | 272 | $rootScope.DrawArrow = function (e) { |
| 273 | + $rootScope.setListManagerZindex = true; | |
| 266 | 274 | $("#canvasPaint").css("display", "block"); |
| 267 | 275 | $("#canvas").css("display", "block"); |
| 268 | 276 | $rootScope.switchCanvas(); |
| ... | ... | @@ -272,6 +280,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", |
| 272 | 280 | $(".btn-annotation-arrow").addClass("activebtncolor"); |
| 273 | 281 | } |
| 274 | 282 | $rootScope.DrawText = function () { |
| 283 | + $rootScope.setListManagerZindex = true; | |
| 275 | 284 | $("#canvasPaint").css("display", "block"); |
| 276 | 285 | $("#canvas").css("display", "block"); |
| 277 | 286 | $rootScope.switchCanvas(); |
| ... | ... | @@ -285,6 +294,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", |
| 285 | 294 | } |
| 286 | 295 | |
| 287 | 296 | $rootScope.DrawPolygon = function () { |
| 297 | + $rootScope.setListManagerZindex = true; | |
| 288 | 298 | $("#canvasPaint").css("display", "block"); |
| 289 | 299 | $("#canvas").css("display", "block"); |
| 290 | 300 | $rootScope.shapeType = "DrawPolygon"; |
| ... | ... | @@ -472,9 +482,11 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", |
| 472 | 482 | //list manager function |
| 473 | 483 | |
| 474 | 484 | //list manager function |
| 475 | - | |
| 485 | + | |
| 486 | + $rootScope.disableAnnotationtoolOnListManager = false; | |
| 476 | 487 | $rootScope.ShowListManager = function () { |
| 477 | 488 | console.log('ShowListManager') |
| 489 | + $rootScope.disableAnnotationtoolOnListManager = true; | |
| 478 | 490 | |
| 479 | 491 | $rootScope.isLoading = true; |
| 480 | 492 | $('#spinner').css('visibility', 'visible'); |
| ... | ... | @@ -491,6 +503,12 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", |
| 491 | 503 | |
| 492 | 504 | $rootScope.CloseListManager = function () { |
| 493 | 505 | console.log('close') |
| 506 | + | |
| 507 | + $rootScope.disableAnnotationtoolOnListManager = false; | |
| 508 | + if ($rootScope.disableAnnotationtoolOnListManager == false) { | |
| 509 | + $('#AnnotaionPopupDiv').find('input, textarea, button, select,img,div').removeAttr('disabled', 'disabled'); | |
| 510 | + $('#slider-range-min-2').slider('enable'); | |
| 511 | + } | |
| 494 | 512 | //$rootScope.isListManagerSelected = false; |
| 495 | 513 | $('#listManager').css('display', 'none'); |
| 496 | 514 | $("#listManager").css("visibility", "hidden"); | ... | ... |
400-SOURCECODE/AIAHTML5.Web/index.html
| ... | ... | @@ -428,18 +428,18 @@ |
| 428 | 428 | <button type="button" class="close" aria-label="Close" ng-click="CloseAnnotationTool()"><span aria-hidden="true">×</span></button> |
| 429 | 429 | <h4 class="modal-title" id="myModalLabel">Annotation</h4> |
| 430 | 430 | </div> |
| 431 | - <div class="modal-body"> | |
| 431 | + <div class="modal-body" id="AnnotaionPopupDiv" > | |
| 432 | 432 | <div class="row"> |
| 433 | 433 | <div class="col-sm-12"> |
| 434 | 434 | <h5>Mode</h5> |
| 435 | 435 | |
| 436 | 436 | <div class="btn-group btn-group-justified" role="group" aria-label="..."> |
| 437 | 437 | <div class="btn-group" role="group" tooltip> |
| 438 | - <div id="identify-block" style="display: none; font-size:13px;">Identify Mode</div> | |
| 439 | - <button id="OnIdentify" type="button" class="btn btn-sm btn-success" ng-click="OnIdentifyClick()">Identify</button> | |
| 438 | + <div id="identify-block" style="display: none; font-size:13px;">Identify Mode</div> | |
| 439 | + <button id="OnIdentify" type="button" class="btn btn-sm btn-success" ng-click="OnIdentifyClick()">Identify</button> | |
| 440 | 440 | </div> |
| 441 | 441 | <div class="btn-group" role="group"> |
| 442 | - <div id="draw-block" style="display: none; font-size: 13px;">Draw Mode</div> | |
| 442 | + <div id="draw-block" style="display: none; font-size: 13px;">Draw Mode</div> | |
| 443 | 443 | <button id="DrawMode" type="button" ng-click="DrawingMode()" class="btn btn-sm btn-success">Draw</button> |
| 444 | 444 | </div> |
| 445 | 445 | </div> |
| ... | ... | @@ -465,6 +465,7 @@ |
| 465 | 465 | </div> |
| 466 | 466 | <div class="well-popup well"> |
| 467 | 467 | <!--#7931--> |
| 468 | + <img src="content/images/blank-shape.jpg" alt="..." class="img-rounded img-responsive" ng-click="disableAnnotationtoolOnListManager||enableAnnotationToolBar()"> | |
| 468 | 469 | <div id="edit-block" style="display: none; font-size: 13px;">Edit Shape Style</div> |
| 469 | 470 | <img id="OnEdtShape" src="content/images/blank-shape.jpg" alt="..." class="img-rounded img-responsive" ng-click="enableAnnotationToolBar()"> |
| 470 | 471 | |
| ... | ... | @@ -1428,6 +1429,7 @@ |
| 1428 | 1429 | }); |
| 1429 | 1430 | </script> |
| 1430 | 1431 | |
| 1432 | + | |
| 1431 | 1433 | |
| 1432 | 1434 | |
| 1433 | 1435 | </body> | ... | ... |