ADAM / AIAHTML5

Commit 089bf91ae55d1d0e71cf5c9ce25d2fd3378c5555

Authored by Amrita Vishnoi
2 parents a1c75d42 eece91e0

Merge branch 'FrequentLayerChangeHighl' into Develop

Inline Side-by-side
Showing 2 changed files with 95 additions and 35 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @089bf91
... ... @@ -593,16 +593,14 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
593 593  
594 594 $("#layerChangeSlider").slider({
595 595 orientation: "vertical",
596   - range: "max", // <--- needed...
  596 + range: "max",
597 597 min: 0,
598   - // max: 100,
599 598 value: 0,
600 599 slide: function (event, ui) {
601   - // $("#txtlayerNumber").val(100 - ui.value); // basic math operation..
  600 + },
602 601  
603   - // $("#txtlayerNumber").val($("#layerChangeSlider").slider("value"));
604   - },
605 602 stop: function (event, ui) {
  603 +
606 604 var la;
607 605 var rootScope = angular.element(document.getElementById("bo")).scope();
608 606 rootScope.$apply(function () {
... ... @@ -614,7 +612,6 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
614 612 rootScope.isLoading = false;
615 613 }
616 614 la = parseInt(scope.totalLayers) //- parseInt(scope.layerNumber);
617   - // $('#layerChangeSlider').slider("option", "value", la - ui.value);
618 615 var slideVal = la - ui.value;
619 616 $("#txtlayerNumber").val(slideVal);
620 617 scope.layerNumber = slideVal;
... ... @@ -969,7 +966,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
969 966 if ($scope.ColoredImageSRC != null && $scope.ColoredImageSRC.length > 0) {
970 967 $scope.ColoredImageSRC = null;
971 968 $scope.ColoredImageSRC = [];
972   -
  969 + console.log('COLOREDIMAGESRC length = ' + $scope.ColoredImageSRC.length);
973 970 // $scope.flushCanvas();
974 971 }
975 972 else {
... ... @@ -1678,19 +1675,36 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1678 1675  
1679 1676  
1680 1677 if (isMaskImage == 'N') {
  1678 + var totalCanvas;
  1679 + if (($rootScope.viewOrientationId == '1') || ($rootScope.viewOrientationId == '4')) {
  1680 + totalCanvas = 9;
  1681 +
  1682 + }
  1683 + else if (($rootScope.viewOrientationId == '2') || ($rootScope.viewOrientationId == '3')) {
  1684 + totalCanvas = 5;
  1685 +
  1686 + }
  1687 + else if (($rootScope.viewOrientationId == '5')) {
  1688 + totalCanvas = 4;
  1689 +
  1690 + }
  1691 + else if (($rootScope.viewOrientationId == '6')) {
  1692 + totalCanvas = 1;
  1693 +
  1694 + }
1681 1695  
1682   -
1683   - $scope.ColoredImageSRC.push(
1684   - {
1685   - "bodyRegionId": bodyRegionId, "SRC": src,
1686   - "Height": h,
1687   - "Width": w,
1688   - "x": x,
1689   - "y": y,
1690   - "haveMirror": 'true'
1691   - }
1692   - );
1693   -
  1696 + if ($scope.ColoredImageSRC.length < totalCanvas) {
  1697 + $scope.ColoredImageSRC.push(
  1698 + {
  1699 + "bodyRegionId": bodyRegionId, "SRC": src,
  1700 + "Height": h,
  1701 + "Width": w,
  1702 + "x": x,
  1703 + "y": y,
  1704 + "haveMirror": 'true'
  1705 + }
  1706 + );
  1707 + }
1694 1708 //-NIKI-for solving extarct issue 8286
1695 1709  
1696 1710 var imageCanvas = document.getElementById('imageCanvas' + bodyRegionId + '_MR');
... ... @@ -1753,7 +1767,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1753 1767 }
1754 1768 }
1755 1769  
1756   - // console.log('ColoredImageSRC. pushed and length: ' + $scope.ColoredImageSRC.length);
  1770 + console.log('DrawMirroredImage- ColoredImageSRC. pushed and length: ' + $scope.ColoredImageSRC.length);
1757 1771 }
1758 1772  
1759 1773 if (FlipedImgCanvas.id.match('_mci')) {
... ... @@ -2066,18 +2080,36 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2066 2080 }
2067 2081 else {
2068 2082  
2069   - $scope.ColoredImageSRC.push(
2070   - {
2071   - "bodyRegionId": bodyRegionId, "SRC": src,
2072   - "Height": h,
2073   - "Width": w,
2074   - "x": x,
2075   - "y": y,
2076   - "haveMirror": 'false'
2077   - }
2078   -
2079   - );
2080   -
  2083 + var totalCanvas;
  2084 + if (($rootScope.viewOrientationId == '1') || ($rootScope.viewOrientationId == '4')) {
  2085 + totalCanvas = 9;
  2086 +
  2087 + }
  2088 + else if (($rootScope.viewOrientationId == '2') || ($rootScope.viewOrientationId == '3')) {
  2089 + totalCanvas = 5;
  2090 +
  2091 + }
  2092 + else if (($rootScope.viewOrientationId == '5')) {
  2093 + totalCanvas = 4;
  2094 +
  2095 + }
  2096 + else if (($rootScope.viewOrientationId == '6')) {
  2097 + totalCanvas = 1;
  2098 + }
  2099 +
  2100 + if ($scope.ColoredImageSRC.length < totalCanvas) {
  2101 + $scope.ColoredImageSRC.push(
  2102 + {
  2103 + "bodyRegionId": bodyRegionId, "SRC": src,
  2104 + "Height": h,
  2105 + "Width": w,
  2106 + "x": x,
  2107 + "y": y,
  2108 + "haveMirror": 'false'
  2109 + }
  2110 +
  2111 + );
  2112 + }
2081 2113  
2082 2114 //-NIKI-for solving extarct issue 8286
2083 2115  
... ... @@ -2152,7 +2184,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2152 2184 }
2153 2185 }
2154 2186  
2155   - console.log('ColoredImageSRC. pushed and length: ' + $scope.ColoredImageSRC.length);
  2187 + console.log('DrawImage- ColoredImageSRC. pushed and length: ' + $scope.ColoredImageSRC.length);
2156 2188 }
2157 2189 }
2158 2190  
... ... @@ -2443,6 +2475,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2443 2475  
2444 2476 // $timeout(function () { $scope.DisableProgressBar() }, 1000);
2445 2477  
  2478 +
2446 2479  
2447 2480  
2448 2481 };
... ... @@ -2705,6 +2738,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2705 2738  
2706 2739 }
2707 2740 }
  2741 + $('#canvasDiv').scrollLeft($('#canvasDiv').width() / 2);
  2742 +
2708 2743  
2709 2744 };
2710 2745 worker.onerror = function (e) {
... ... @@ -6611,8 +6646,25 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
6611 6646  
6612 6647 imageCanvas.style.visibility = 'visible';
6613 6648 //push BRID into array
6614   - $scope.grayedBR.push({ 'BRID': value.bodyRegionId });
  6649 + var totalCanvas;
  6650 + if (($rootScope.viewOrientationId == '1') || ($rootScope.viewOrientationId == '4')) {
  6651 + totalCanvas = 9;
  6652 +
  6653 + }
  6654 + else if (($rootScope.viewOrientationId == '2') || ($rootScope.viewOrientationId == '3')) {
  6655 + totalCanvas = 5;
  6656 +
  6657 + }
  6658 + else if (($rootScope.viewOrientationId == '5')) {
  6659 + totalCanvas = 4;
6615 6660  
  6661 + }
  6662 + else if (($rootScope.viewOrientationId == '6')) {
  6663 + totalCanvas = 1;
  6664 + }
  6665 + if ($scope.grayedBR.length < totalCanvas) {
  6666 + $scope.grayedBR.push({ 'BRID': value.bodyRegionId });
  6667 + }
6616 6668 var grayImageData = context_gray.getImageData(0, 0, width, ht);
6617 6669 var grayImageImageDataVar = grayImageData.data;
6618 6670  
... ...
400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
  View file @089bf91
... ... @@ -202,7 +202,14 @@ footer.dark {
202 202 clear: both;
203 203 margin: 20px auto 30px;
204 204 width: 1rem;
  205 + pointer-events: none;
205 206 }
  207 +
  208 +.vert_slider > .ui-slider-handle {
  209 +pointer-events: auto;
  210 +/* Other settings here */
  211 +}
  212 +
206 213 #inner-anatomyPage .nav > li > a:hover {
207 214 background: #1c92d0;
208 215 color: #fff;
... ... @@ -990,4 +997,5 @@ background-size:cover;
990 997 border-top: none;
991 998 padding: 20px 10px;
992 999 text-align:center;
993   - }
994 1000 \ No newline at end of file
  1001 + }
  1002 +
995 1003 \ No newline at end of file
... ...