diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index a918d73..c2fe829 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -593,16 +593,14 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $("#layerChangeSlider").slider({ orientation: "vertical", - range: "max", // <--- needed... + range: "max", min: 0, - // max: 100, value: 0, slide: function (event, ui) { - // $("#txtlayerNumber").val(100 - ui.value); // basic math operation.. + }, - // $("#txtlayerNumber").val($("#layerChangeSlider").slider("value")); - }, stop: function (event, ui) { + var la; var rootScope = angular.element(document.getElementById("bo")).scope(); rootScope.$apply(function () { @@ -614,7 +612,6 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo rootScope.isLoading = false; } la = parseInt(scope.totalLayers) //- parseInt(scope.layerNumber); - // $('#layerChangeSlider').slider("option", "value", la - ui.value); var slideVal = la - ui.value; $("#txtlayerNumber").val(slideVal); scope.layerNumber = slideVal; @@ -969,7 +966,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 +1675,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'); @@ -1753,7 +1767,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')) { @@ -2066,18 +2080,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 @@ -2152,7 +2184,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); } } @@ -2443,6 +2475,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo // $timeout(function () { $scope.DisableProgressBar() }, 1000); + }; @@ -2705,6 +2738,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo } } + $('#canvasDiv').scrollLeft($('#canvasDiv').width() / 2); + }; worker.onerror = function (e) { @@ -6611,8 +6646,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