ADAM / AIAHTML5

Commit b9c3a6f7634eacc0e18eaace87cdbab66fea872a

Authored by unknown
2 parents 29c622f5 00a3c44f

Merge branch 'Develop' of http://52.6.196.163/ADAM/AIAHTML5 into HEAD

Inline Side-by-side
Showing 3 changed files with 104 additions and 68 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @b9c3a6f
... ... @@ -45,7 +45,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
45 45 $scope.doHighlightOrExtract = false;
46 46 $scope.isEligibleForHighlightBodyByTermList = false;
47 47  
48   - // $scope.AnteriorView = "active";
  48 + // $scope.AnteriorView = "active";
49 49  
50 50 $scope.zoomInOut = 75;
51 51 $scope.speechBubbleCounter = 0;
... ... @@ -943,17 +943,17 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
943 943 var isiOSSafari = (navigator.userAgent.match(/iPad/i)) ? true : false;
944 944  
945 945 //set scrollbars on canvas and hide loading label
946   - $('#daLoaderLabel').css('visibility', 'hidden')
  946 + $('#daLoaderLabel').css('visibility', 'hidden')
947 947  
948 948  
949   - $('#canvasDiv').css('overflow', 'scroll')
950   - if (isiOSSafari) {
951   - $('#canvasDiv').scrollLeft($('#canvasDiv').width() + 150)
  949 + $('#canvasDiv').css('overflow', 'scroll')
  950 + if (isiOSSafari) {
  951 + $('#canvasDiv').scrollLeft($('#canvasDiv').width() + 150)
952 952  
953   - }
954   - else {
955   - $('#canvasDiv').scrollLeft($('#canvasDiv').width() / 2)
956   - }
  953 + }
  954 + else {
  955 + $('#canvasDiv').scrollLeft($('#canvasDiv').width() / 2)
  956 + }
957 957  
958 958  
959 959 // $('#canvasDiv').scrollLeft($scope.imageHorizontlScrollPosition)
... ... @@ -1420,16 +1420,19 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1420 1420  
1421 1421  
1422 1422 if (isMaskImage == 'N') {
1423   - $scope.ColoredImageSRC.push(
1424   - {
1425   - "bodyRegionId": bodyRegionId, "SRC": src,
1426   - "Height": h,
1427   - "Width": w,
1428   - "x": x,
1429   - "y": y,
1430   - "haveMirror": 'true'
1431   - }
1432   - );
  1423 +
  1424 +
  1425 + $scope.ColoredImageSRC.push(
  1426 + {
  1427 + "bodyRegionId": bodyRegionId, "SRC": src,
  1428 + "Height": h,
  1429 + "Width": w,
  1430 + "x": x,
  1431 + "y": y,
  1432 + "haveMirror": 'true'
  1433 + }
  1434 + );
  1435 +
1433 1436  
1434 1437 // console.log('$rootScope.isListManagerSelected= ' + $rootScope.isListManagerSelected + ' length= ' + $scope.ColoredImageSRC.length)
1435 1438  
... ... @@ -1454,7 +1457,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1454 1457  
1455 1458 if ($scope.isEligibleForHighlight == true)
1456 1459 {
1457   - if ($rootScope.isHighLight == true || ($rootScope.isListManagerSelected == true) || (($rootScope.isGenderChnage == true) && ($rootScope.isHighLight == true)) || (($rootScope.isViewChange == true) && ($rootScope.isHighLight == true))) {
  1460 + if ($rootScope.isHighLight == true || ($rootScope.isListManagerSelected == true) || (($rootScope.isGenderChnage == true) && ($rootScope.isHighLight == true)) || (($rootScope.isViewChange == true) && ($rootScope.isHighLight == true))) {
1458 1461  
1459 1462 $rootScope.isLoading = false;
1460 1463 $('#spinner').css('visibility', 'hidden');
... ... @@ -1734,6 +1737,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1734 1737  
1735 1738 img.src = src;
1736 1739  
  1740 +
  1741 +
1737 1742 function start() {
1738 1743 //debugger;
1739 1744 context.drawImage(img, 0, 0);
... ... @@ -1743,17 +1748,19 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1743 1748 //do nothing
1744 1749 }
1745 1750 else {
1746   - $scope.ColoredImageSRC.push(
1747   - {
1748   - "bodyRegionId": bodyRegionId, "SRC": src,
1749   - "Height": h,
1750   - "Width": w,
1751   - "x": x,
1752   - "y": y,
1753   - "haveMirror": 'false'
1754   - }
1755   -
1756   - );
  1751 +
  1752 + $scope.ColoredImageSRC.push(
  1753 + {
  1754 + "bodyRegionId": bodyRegionId, "SRC": src,
  1755 + "Height": h,
  1756 + "Width": w,
  1757 + "x": x,
  1758 + "y": y,
  1759 + "haveMirror": 'false'
  1760 + }
  1761 +
  1762 + );
  1763 +
1757 1764  
1758 1765 if (($scope.ColoredImageSRC != null || $scope.ColoredImageSRC != undefined)) {
1759 1766  
... ... @@ -1851,10 +1858,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1851 1858  
1852 1859 if ($rootScope.isListManagerSelected) {
1853 1860  
1854   - multiTermList = $scope.AllTerms;
  1861 + multiTermList = $scope.AllTerms;
1855 1862  
1856   - }
1857   - else if (($rootScope.previousHighlightList != null || $rootScope.previousHighlightList != undefined) && ($rootScope.previousHighlightList.length > 0)) {
  1863 + }
  1864 + else if (($rootScope.previousHighlightList != null || $rootScope.previousHighlightList != undefined) && ($rootScope.previousHighlightList.length > 0)) {
1858 1865 angular.forEach($rootScope.previousHighlightList, function (value, key) {
1859 1866  
1860 1867 var ActualTermNo = $scope.getActualTermNumber(value);
... ... @@ -2414,10 +2421,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2414 2421 $scope.LayerChange = function () {
2415 2422  
2416 2423  
2417   - //if listanager is visisble then close it
2418   - $rootScope.isListManagerSelected = false;
  2424 + //if listanager is visisble then close it
  2425 + $rootScope.isListManagerSelected = false;
2419 2426  
2420   - $rootScope.CloseListManager();
  2427 + $rootScope.CloseListManager();
2421 2428  
2422 2429  
2423 2430  
... ... @@ -2506,6 +2513,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2506 2513 }
2507 2514  
2508 2515 else {
  2516 +
  2517 +
2509 2518 //1. Dated:13-07-2016 Issue #4965 : The layer number should not extend beyond its level through layer text box.
2510 2519 var dataLength = $rootScope.BodyLayerData.Layers.DataLayer.length;
2511 2520 if (parseInt($('#txtlayerNumber').val()) > (dataLength - 1)) {
... ... @@ -2516,6 +2525,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2516 2525 else
2517 2526 $scope.currentLayerNumber = parseInt($('#txtlayerNumber').val());
2518 2527  
  2528 + //$scope.isMousUp();
  2529 +
  2530 + //alert('$scope.currentLayerNumber');
  2531 +
2519 2532 $rootScope.isLoading = true;
2520 2533 $('#spinner').css('visibility', 'visible');
2521 2534 var canDiv = document.getElementById('canvasDiv');
... ... @@ -2524,6 +2537,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2524 2537 canDiv.innerHTML = '';
2525 2538 }
2526 2539  
  2540 +
  2541 +
2527 2542 //2.
2528 2543 $scope.CalculateImageCordinates($rootScope.viewOrientationId);
2529 2544  
... ... @@ -2543,6 +2558,14 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2543 2558 $('#layerChangeSlider').slider("option", "value", parseInt($rootScope.totalLayers) - parseInt($scope.layerNumber));
2544 2559 }
2545 2560  
  2561 + $scope.LayerChangeOnMouseUpDown = function (e)
  2562 + {
  2563 +
  2564 + $scope.LayerChange();
  2565 +
  2566 + }
  2567 +
  2568 +
2546 2569 $scope.DisableProgressBar = function () {
2547 2570  
2548 2571 // alert('Disabled wait cursor is called');
... ... @@ -3406,8 +3429,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
3406 3429  
3407 3430 //if listanager is visisble then close it
3408 3431  
3409   - $rootScope.isListManagerSelected = false;
3410   - $rootScope.CloseListManager();
  3432 + $rootScope.isListManagerSelected = false;
  3433 + $rootScope.CloseListManager();
3411 3434  
3412 3435  
3413 3436 $scope.isTransparencyActivated = true;
... ... @@ -3427,6 +3450,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
3427 3450  
3428 3451 canvasDiv.addEventListener("mouseup", mouseUpListener)
3429 3452  
  3453 +
3430 3454 }
3431 3455  
3432 3456 function mouseDownListener(e) {
... ... @@ -3511,6 +3535,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
3511 3535 // $selection.remove();
3512 3536 // debugger;
3513 3537  
  3538 + //alert('mouse up');
  3539 + console.log('MOUSE UP');
  3540 +
3514 3541 $scope.currentLayerNumber = parseInt($('#txtlayerNumber').val());
3515 3542 $('.rectangle').remove();
3516 3543  
... ... @@ -3813,7 +3840,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
3813 3840 //do nothing
3814 3841 }
3815 3842 else if (isLayerChanged) {
3816   - // debugger
  3843 +
  3844 + // alert('isMousUp on isLayerChanged');
  3845 +
3817 3846 $scope.layerNumber = parseInt($('#txtlayerNumber').val());
3818 3847  
3819 3848 }
... ... @@ -4803,7 +4832,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
4803 4832  
4804 4833 //if listanager is visisble then close it
4805 4834  
4806   - // $rootScope.isListManagerSelected = false;
  4835 + // $rootScope.isListManagerSelected = false;
4807 4836 $rootScope.CloseListManager();
4808 4837  
4809 4838 if ($rootScope.isHighLight == true) {
... ... @@ -4864,10 +4893,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
4864 4893 console.log('enableNormalMode is called');
4865 4894  
4866 4895  
4867   - // $rootScope.isHighLight = false;
  4896 + // $rootScope.isHighLight = false;
4868 4897  
4869   - //to do should not call every time
4870   - $rootScope.CloseListManager();
  4898 + //to do should not call every time
  4899 + $rootScope.CloseListManager();
4871 4900  
4872 4901  
4873 4902 if ($rootScope.isNormalMode == true) {
... ... @@ -4928,7 +4957,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
4928 4957  
4929 4958 //if listanager is visisble then close it
4930 4959  
4931   - // $rootScope.isListManagerSelected = false;
  4960 + // $rootScope.isListManagerSelected = false;
4932 4961 $rootScope.CloseListManager();
4933 4962 //1.
4934 4963 $rootScope.isLoading = true;
... ... @@ -5213,7 +5242,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5213 5242 else if ($rootScope.isListManagerSelected == true) {
5214 5243 console.log('1. $rootScope.isExtract=true and $rootScope.isListManagerSelected == true')
5215 5244  
5216   - $timeout(function () { $scope.HighlightBodyOnExtract() }, 50);
  5245 + $timeout(function () { $scope.HighlightBodyOnExtract() }, 50);
5217 5246  
5218 5247 }
5219 5248 }
... ... @@ -5376,7 +5405,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5376 5405 console.log('2. $rootScope.isExtract=true and $rootScope.isListManagerSelected == true')
5377 5406 $timeout(function () { $scope.HighlightBodyOnExtract() }, 50);
5378 5407  
5379   - }
  5408 + }
5380 5409 }
5381 5410  
5382 5411 }
... ... @@ -5458,8 +5487,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5458 5487  
5459 5488 //if listanager is visisble then close it
5460 5489  
5461   - $rootScope.isListManagerSelected = false;
5462   - $rootScope.CloseListManager();
  5490 + $rootScope.isListManagerSelected = false;
  5491 + $rootScope.CloseListManager();
5463 5492  
5464 5493 $rootScope.isLoading = true;
5465 5494 $('#spinner').css('visibility', 'visible');
... ... @@ -5778,13 +5807,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5778 5807 $scope.$on('reloadDABodyViewEvent', function (event, data) {
5779 5808 //console.log('reloadDABodyViewEvent');
5780 5809 $scope.layerNumber = parseInt($('#txtlayerNumber').val());
5781   - //$scope.ReloadBodyViewId = data.reloadDABodyViewId;
5782   - // $scope.layerNumber = 0;
5783   - // debugger;
  5810 + //alert('mouseUp');
5784 5811  
5785   - //console.log('reloadDABodyViewEvent ' + $scope.ReloadBodyViewId);
5786   -
5787   - //if ($rootScope.isSettingEventAlredayDispachted == true) {
  5812 +
5788 5813  
5789 5814 $scope.loadSelectedBodyView(data.reloadDABodyViewId);
5790 5815  
... ... @@ -5797,6 +5822,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5797 5822  
5798 5823 })
5799 5824  
  5825 +
  5826 +
5800 5827 $scope.loadSelectedBodyViewNavigator = function (currentBodyViewId) {
5801 5828  
5802 5829 //$rootScope.voId = currentBodyViewId;
... ... @@ -7630,7 +7657,14 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
7630 7657  
7631 7658 }
7632 7659  
7633   -
  7660 + $scope.LayerChangeBasedOnKeyPressed = function (e) {
  7661 +
  7662 + if(e.keyCode==13)
  7663 + {
  7664 + $scope.LayerChange();
  7665 + }
  7666 +
  7667 + }
7634 7668 }]
7635 7669  
7636 7670 );
7637 7671 \ No newline at end of file
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @b9c3a6f
... ... @@ -312,6 +312,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
312 312 $rootScope.shapestyle = function (id) {
313 313  
314 314 document.getElementById('modelbackground').style.display = "none";
  315 + document.getElementById('modeleditstyle').style.display = "none";
315 316  
316 317 $rootScope.shapestyleOpacity = $("#" + id).css('opacity');
317 318 $rootScope.shapestyleFillColor = $("#" + id).parent().css('background-color');
... ... @@ -334,15 +335,17 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
334 335 }
335 336  
336 337 $rootScope.enableAnnotationToolBar = function () {
337   -
  338 +
338 339 document.getElementById('modelbackground').style.display = "block";
339   - $("#editshapestyle").modal('show');
  340 + //$("#editshapestyle").modal('show');
  341 + document.getElementById('modeleditstyle').style.display = "block";
340 342  
341 343 }
342 344  
343 345 $rootScope.disableAnnotationToolBar = function () {
344 346  
345 347 document.getElementById('modelbackground').style.display = "none";
  348 + document.getElementById('modeleditstyle').style.display = "none";
346 349  
347 350 }
348 351  
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
  View file @b9c3a6f
... ... @@ -55,19 +55,18 @@
55 55 display: none;
56 56 }
57 57 .customTooltip {
58   - background-color: #fff !important;
59   - color: #000 !important;
  58 + background: #333 !important;
  59 + color: #fff !important;
60 60 opacity: 0.9 !important;
61   -
62 61 }
63 62  
64 63  
65 64  
66 65  
67 66 .custom-tooltip {
68   - background-color: #fff;
  67 + background-color: #333;
69 68 border: 0 none;
70   - color: #000;
  69 + color: #fff !important;
71 70 left: -52px;
72 71 opacity: 0.9;
73 72 padding: 7px;
... ... @@ -83,9 +82,9 @@
83 82 }
84 83  
85 84 .custom-tooltip1 {
86   - background-color: #fff;
  85 + background-color: #333;
87 86 border: 0 none;
88   - color: #000;
  87 + color: #fff !important;
89 88 left: 52px;
90 89 opacity: 0.9;
91 90 padding: 7px;
... ... @@ -101,9 +100,9 @@
101 100 }
102 101  
103 102 .custom-tooltip2 {
104   - background-color: #fff;
  103 + background-color: #333;
105 104 border: 0 none;
106   - color: #000;
  105 + color: #fff !important;
107 106 right: 10px;
108 107 opacity: 0.9;
109 108 padding: 7px;
... ... @@ -222,7 +221,7 @@
222 221 </div>
223 222 <div class="">
224 223 <p>
225   - <input type="number" id="txtlayerNumber" value="0" step="1" min="0" style="width:80px; margin:10px 0 0 15px;" ng-model="layerNumber" ng-change="LayerChange()" />
  224 + <input class="item" type="number" id="txtlayerNumber" value="0" step="1" min="0" style="width:80px; margin:10px 0 0 15px;" ng-model="layerNumber" ng-keydown="LayerChangeBasedOnKeyPressed($event)" ng-click="LayerChangeOnMouseUpDown($event)" />
226 225 </p>
227 226 <div id="layerChangeSlider" style="height:140px;" class="vert_slider " ng-model="layerNumber"></div>
228 227 </div>
... ...