ADAM / AIAHTML5

Commit 6eb119dcc5b092221d94b94b4e57995963d01743

Authored by Nikita Kulshreshtha
1 parent b75d4b2c

Bug #16713 issue work around.

Inline Side-by-side
Showing 2 changed files with 94 additions and 29 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @6eb119d
... ... @@ -598,11 +598,16 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
598 598 // max: 100,
599 599 value: 0,
600 600 slide: function (event, ui) {
  601 + // event.stopImmediatePropagation();
  602 + // alert('slide')
601 603 // $("#txtlayerNumber").val(100 - ui.value); // basic math operation..
602 604  
603 605 // $("#txtlayerNumber").val($("#layerChangeSlider").slider("value"));
604 606 },
  607 +
605 608 stop: function (event, ui) {
  609 + // alert('stop')
  610 +
606 611 var la;
607 612 var rootScope = angular.element(document.getElementById("bo")).scope();
608 613 rootScope.$apply(function () {
... ... @@ -969,7 +974,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
969 974 if ($scope.ColoredImageSRC != null && $scope.ColoredImageSRC.length > 0) {
970 975 $scope.ColoredImageSRC = null;
971 976 $scope.ColoredImageSRC = [];
972   -
  977 + console.log('COLOREDIMAGESRC length = ' + $scope.ColoredImageSRC.length);
973 978 // $scope.flushCanvas();
974 979 }
975 980 else {
... ... @@ -1678,19 +1683,36 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1678 1683  
1679 1684  
1680 1685 if (isMaskImage == 'N') {
  1686 + var totalCanvas;
  1687 + if (($rootScope.viewOrientationId == '1') || ($rootScope.viewOrientationId == '4')) {
  1688 + totalCanvas = 9;
  1689 +
  1690 + }
  1691 + else if (($rootScope.viewOrientationId == '2') || ($rootScope.viewOrientationId == '3')) {
  1692 + totalCanvas = 5;
  1693 +
  1694 + }
  1695 + else if (($rootScope.viewOrientationId == '5')) {
  1696 + totalCanvas = 4;
  1697 +
  1698 + }
  1699 + else if (($rootScope.viewOrientationId == '6')) {
  1700 + totalCanvas = 1;
  1701 +
  1702 + }
1681 1703  
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   -
  1704 + if ($scope.ColoredImageSRC.length < totalCanvas) {
  1705 + $scope.ColoredImageSRC.push(
  1706 + {
  1707 + "bodyRegionId": bodyRegionId, "SRC": src,
  1708 + "Height": h,
  1709 + "Width": w,
  1710 + "x": x,
  1711 + "y": y,
  1712 + "haveMirror": 'true'
  1713 + }
  1714 + );
  1715 + }
1694 1716 //-NIKI-for solving extarct issue 8286
1695 1717  
1696 1718 var imageCanvas = document.getElementById('imageCanvas' + bodyRegionId + '_MR');
... ... @@ -1758,7 +1780,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1758 1780 }
1759 1781 }
1760 1782  
1761   - // console.log('ColoredImageSRC. pushed and length: ' + $scope.ColoredImageSRC.length);
  1783 + console.log('DrawMirroredImage- ColoredImageSRC. pushed and length: ' + $scope.ColoredImageSRC.length);
1762 1784 }
1763 1785  
1764 1786 if (FlipedImgCanvas.id.match('_mci')) {
... ... @@ -2071,18 +2093,36 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2071 2093 }
2072 2094 else {
2073 2095  
2074   - $scope.ColoredImageSRC.push(
2075   - {
2076   - "bodyRegionId": bodyRegionId, "SRC": src,
2077   - "Height": h,
2078   - "Width": w,
2079   - "x": x,
2080   - "y": y,
2081   - "haveMirror": 'false'
2082   - }
2083   -
2084   - );
2085   -
  2096 + var totalCanvas;
  2097 + if (($rootScope.viewOrientationId == '1') || ($rootScope.viewOrientationId == '4')) {
  2098 + totalCanvas = 9;
  2099 +
  2100 + }
  2101 + else if (($rootScope.viewOrientationId == '2') || ($rootScope.viewOrientationId == '3')) {
  2102 + totalCanvas = 5;
  2103 +
  2104 + }
  2105 + else if (($rootScope.viewOrientationId == '5')) {
  2106 + totalCanvas = 4;
  2107 +
  2108 + }
  2109 + else if (($rootScope.viewOrientationId == '6')) {
  2110 + totalCanvas = 1;
  2111 + }
  2112 +
  2113 + if ($scope.ColoredImageSRC.length < totalCanvas) {
  2114 + $scope.ColoredImageSRC.push(
  2115 + {
  2116 + "bodyRegionId": bodyRegionId, "SRC": src,
  2117 + "Height": h,
  2118 + "Width": w,
  2119 + "x": x,
  2120 + "y": y,
  2121 + "haveMirror": 'false'
  2122 + }
  2123 +
  2124 + );
  2125 + }
2086 2126  
2087 2127 //-NIKI-for solving extarct issue 8286
2088 2128  
... ... @@ -2157,7 +2197,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2157 2197 }
2158 2198 }
2159 2199  
2160   - console.log('ColoredImageSRC. pushed and length: ' + $scope.ColoredImageSRC.length);
  2200 + console.log('DrawImage- ColoredImageSRC. pushed and length: ' + $scope.ColoredImageSRC.length);
2161 2201 }
2162 2202 }
2163 2203  
... ... @@ -6573,8 +6613,25 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
6573 6613  
6574 6614 imageCanvas.style.visibility = 'visible';
6575 6615 //push BRID into array
6576   - $scope.grayedBR.push({ 'BRID': value.bodyRegionId });
  6616 + var totalCanvas;
  6617 + if (($rootScope.viewOrientationId == '1') || ($rootScope.viewOrientationId == '4')) {
  6618 + totalCanvas = 9;
  6619 +
  6620 + }
  6621 + else if (($rootScope.viewOrientationId == '2') || ($rootScope.viewOrientationId == '3')) {
  6622 + totalCanvas = 5;
  6623 +
  6624 + }
  6625 + else if (($rootScope.viewOrientationId == '5')) {
  6626 + totalCanvas = 4;
6577 6627  
  6628 + }
  6629 + else if (($rootScope.viewOrientationId == '6')) {
  6630 + totalCanvas = 1;
  6631 + }
  6632 + if ($scope.grayedBR.length < totalCanvas) {
  6633 + $scope.grayedBR.push({ 'BRID': value.bodyRegionId });
  6634 + }
6578 6635 var grayImageData = context_gray.getImageData(0, 0, width, ht);
6579 6636 var grayImageImageDataVar = grayImageData.data;
6580 6637  
... ...
400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
  View file @6eb119d
... ... @@ -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
... ...