From 6eb119dcc5b092221d94b94b4e57995963d01743 Mon Sep 17 00:00:00 2001 From: nikita Date: Tue, 18 Apr 2017 16:14:06 +0530 Subject: [PATCH] Bug #16713 issue work around. --- 400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js | 113 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------- 400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css | 10 +++++++++- 2 files changed, 94 insertions(+), 29 deletions(-) diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index a538c79..529e239 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -598,11 +598,16 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo // max: 100, value: 0, slide: function (event, ui) { + // event.stopImmediatePropagation(); + // alert('slide') // $("#txtlayerNumber").val(100 - ui.value); // basic math operation.. // $("#txtlayerNumber").val($("#layerChangeSlider").slider("value")); }, + stop: function (event, ui) { + // alert('stop') + var la; var rootScope = angular.element(document.getElementById("bo")).scope(); rootScope.$apply(function () { @@ -969,7 +974,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo if ($scope.ColoredImageSRC != null && $scope.ColoredImageSRC.length > 0) { $scope.ColoredImageSRC = null; $scope.ColoredImageSRC = []; - + console.log('COLOREDIMAGESRC length = ' + $scope.ColoredImageSRC.length); // $scope.flushCanvas(); } else { @@ -1678,19 +1683,36 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo if (isMaskImage == 'N') { + var totalCanvas; + if (($rootScope.viewOrientationId == '1') || ($rootScope.viewOrientationId == '4')) { + totalCanvas = 9; + + } + else if (($rootScope.viewOrientationId == '2') || ($rootScope.viewOrientationId == '3')) { + totalCanvas = 5; + + } + else if (($rootScope.viewOrientationId == '5')) { + totalCanvas = 4; + + } + else if (($rootScope.viewOrientationId == '6')) { + totalCanvas = 1; + + } - - $scope.ColoredImageSRC.push( - { - "bodyRegionId": bodyRegionId, "SRC": src, - "Height": h, - "Width": w, - "x": x, - "y": y, - "haveMirror": 'true' - } - ); - + if ($scope.ColoredImageSRC.length < totalCanvas) { + $scope.ColoredImageSRC.push( + { + "bodyRegionId": bodyRegionId, "SRC": src, + "Height": h, + "Width": w, + "x": x, + "y": y, + "haveMirror": 'true' + } + ); + } //-NIKI-for solving extarct issue 8286 var imageCanvas = document.getElementById('imageCanvas' + bodyRegionId + '_MR'); @@ -1758,7 +1780,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo } } - // console.log('ColoredImageSRC. pushed and length: ' + $scope.ColoredImageSRC.length); + console.log('DrawMirroredImage- ColoredImageSRC. pushed and length: ' + $scope.ColoredImageSRC.length); } if (FlipedImgCanvas.id.match('_mci')) { @@ -2071,18 +2093,36 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo } else { - $scope.ColoredImageSRC.push( - { - "bodyRegionId": bodyRegionId, "SRC": src, - "Height": h, - "Width": w, - "x": x, - "y": y, - "haveMirror": 'false' - } - - ); - + var totalCanvas; + if (($rootScope.viewOrientationId == '1') || ($rootScope.viewOrientationId == '4')) { + totalCanvas = 9; + + } + else if (($rootScope.viewOrientationId == '2') || ($rootScope.viewOrientationId == '3')) { + totalCanvas = 5; + + } + else if (($rootScope.viewOrientationId == '5')) { + totalCanvas = 4; + + } + else if (($rootScope.viewOrientationId == '6')) { + totalCanvas = 1; + } + + if ($scope.ColoredImageSRC.length < totalCanvas) { + $scope.ColoredImageSRC.push( + { + "bodyRegionId": bodyRegionId, "SRC": src, + "Height": h, + "Width": w, + "x": x, + "y": y, + "haveMirror": 'false' + } + + ); + } //-NIKI-for solving extarct issue 8286 @@ -2157,7 +2197,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo } } - console.log('ColoredImageSRC. pushed and length: ' + $scope.ColoredImageSRC.length); + console.log('DrawImage- ColoredImageSRC. pushed and length: ' + $scope.ColoredImageSRC.length); } } @@ -6573,8 +6613,25 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo imageCanvas.style.visibility = 'visible'; //push BRID into array - $scope.grayedBR.push({ 'BRID': value.bodyRegionId }); + var totalCanvas; + if (($rootScope.viewOrientationId == '1') || ($rootScope.viewOrientationId == '4')) { + totalCanvas = 9; + + } + else if (($rootScope.viewOrientationId == '2') || ($rootScope.viewOrientationId == '3')) { + totalCanvas = 5; + + } + else if (($rootScope.viewOrientationId == '5')) { + totalCanvas = 4; + } + else if (($rootScope.viewOrientationId == '6')) { + totalCanvas = 1; + } + if ($scope.grayedBR.length < totalCanvas) { + $scope.grayedBR.push({ 'BRID': value.bodyRegionId }); + } var grayImageData = context_gray.getImageData(0, 0, width, ht); var grayImageImageDataVar = grayImageData.data; diff --git a/400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css b/400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css index cdb4183..072c896 100644 --- a/400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css +++ b/400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css @@ -202,7 +202,14 @@ footer.dark { clear: both; margin: 20px auto 30px; width: 1rem; + pointer-events: none; } + +.vert_slider > .ui-slider-handle { +pointer-events: auto; +/* Other settings here */ +} + #inner-anatomyPage .nav > li > a:hover { background: #1c92d0; color: #fff; @@ -990,4 +997,5 @@ background-size:cover; border-top: none; padding: 20px 10px; text-align:center; - } \ No newline at end of file + } + \ No newline at end of file -- libgit2 0.21.4