ADAM / AIAHTML5

Commit 2b3ceebc7e357b3b70c9af2511c0e51f1f4d8ff9

Authored by Amrita Vishnoi
2 parents 5d3c82a6 2205318c

Merge branch 'SliderLogs' into Develop-IPAD-MAC

Inline Side-by-side
Showing 1 changed file with 49 additions and 7 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @2b3ceeb
@@ -729,6 +729,12 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -729,6 +729,12 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
729 $rootScope.selectedBodySystemId = 0; 729 $rootScope.selectedBodySystemId = 0;
730 $rootScope.searchSelectedText = ''; 730 $rootScope.searchSelectedText = '';
731 }); 731 });
  732 +
  733 + var sliderVal = document.getElementById('layerChangeSlider');
  734 +
  735 + console.log('on slider initialize:' + sliderVal);
  736 +
  737 +
732 $("#layerChangeSlider").slider({ 738 $("#layerChangeSlider").slider({
733 orientation: "vertical", 739 orientation: "vertical",
734 range: "max", 740 range: "max",
@@ -736,6 +742,10 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -736,6 +742,10 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
736 value: 0, 742 value: 0,
737 slide: function (event, ui) 743 slide: function (event, ui)
738 { 744 {
  745 + var sliderVal = document.getElementById('layerChangeSlider');
  746 +
  747 + console.log('on slider slide :' + sliderVal);
  748 +
739 var layerNum; 749 var layerNum;
740 var daViewScope = angular.element(document.getElementById("daView")).scope(); 750 var daViewScope = angular.element(document.getElementById("daView")).scope();
741 layerNum = parseInt(daViewScope.totalLayers) //- parseInt(scope.layerNumber); 751 layerNum = parseInt(daViewScope.totalLayers) //- parseInt(scope.layerNumber);
@@ -919,6 +929,11 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -919,6 +929,11 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
919 $rootScope.totalLayers = dataLength - 1; 929 $rootScope.totalLayers = dataLength - 1;
920 930
921 $('#txtLayerNumber').attr('max', $rootScope.totalLayers); 931 $('#txtLayerNumber').attr('max', $rootScope.totalLayers);
  932 +
  933 + var layerChangeSliderVal = document.getElementById('layerChangeSlider');
  934 +
  935 + console.log('inside bodyViewWorker.onmessage. $rootScope.totalLayers = ' + $rootScope.totalLayers + ' #layerChangeSlider value: ' + layerChangeSliderVal);
  936 +
922 $('#layerChangeSlider').slider("option", "max", $rootScope.totalLayers); 937 $('#layerChangeSlider').slider("option", "max", $rootScope.totalLayers);
923 938
924 $scope.isBodylayerdataLoaded = true; 939 $scope.isBodylayerdataLoaded = true;
@@ -1338,9 +1353,15 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -1338,9 +1353,15 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
1338 1353
1339 // $('#canvasDiv').scrollLeft($scope.imageHorizontlScrollPosition) 1354 // $('#canvasDiv').scrollLeft($scope.imageHorizontlScrollPosition)
1340 $('#canvasDiv').scrollTop(50) 1355 $('#canvasDiv').scrollTop(50)
1341 - var abc = $rootScope.BodyRegionCordinatesData; 1356 + //var abc = $rootScope.BodyRegionCordinatesData;
1342 1357
1343 - $('#layerChangeSlider').slider("option", "value", parseInt($rootScope.totalLayers) - parseInt($scope.layerNumber)); 1358 + var sliderVal = parseInt($rootScope.totalLayers) - parseInt($scope.layerNumber);
  1359 +
  1360 + console.log('inside CalculateImageCordinates line no 1350. document.getElementById layerChangeSlider value : ' + document.getElementById('layerChangeSlider') + '$rootScope.totalLayers: ' + $rootScope.totalLayers + '- parseInt($scope.layerNumber)' + parseInt($scope.layerNumber) + 'set value: ' + sliderVal);
  1361 +
  1362 + $('#layerChangeSlider').slider("option", "value",sliderVal );
  1363 +
  1364 +
1344 // $('#spinner').css('visibility', 'hidden'); 1365 // $('#spinner').css('visibility', 'hidden');
1345 $rootScope.isLoading = false; 1366 $rootScope.isLoading = false;
1346 //Dated:16-07-2016 Issue #4957 :While selecting the Zoom-in\Zoom-out button scroll should be go on top. 1367 //Dated:16-07-2016 Issue #4957 :While selecting the Zoom-in\Zoom-out button scroll should be go on top.
@@ -3667,7 +3688,12 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -3667,7 +3688,12 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
3667 } 3688 }
3668 } 3689 }
3669 3690
3670 - $('#layerChangeSlider').slider("option", "value", parseInt($rootScope.totalLayers) - parseInt($scope.layerNumber)); 3691 + var sliderVal = parseInt($rootScope.totalLayers) - parseInt($scope.layerNumber);
  3692 +
  3693 + console.log('inside CalculateImageCordinates. document.getElementById layerChangeSlider value : ' + document.getElementById('layerChangeSlider') + '$rootScope.totalLayers: ' + $rootScope.totalLayers + '- parseInt($scope.layerNumber) ' + parseInt($scope.layerNumber) + 'set value: ' + sliderVal);
  3694 +
  3695 +
  3696 + $('#layerChangeSlider').slider("option", "value", sliderVal);
3671 3697
3672 // Annotations Closing Code 3698 // Annotations Closing Code
3673 3699
@@ -4502,8 +4528,13 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -4502,8 +4528,13 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
4502 4528
4503 4529
4504 //Dated:19-07-2016 Issue#4975: Transparency box should not be clickable if it is already selected. 4530 //Dated:19-07-2016 Issue#4975: Transparency box should not be clickable if it is already selected.
4505 - if ($("#txtlayerNumber").val() != 0 && $rootScope.currentLayerNumber != undefined) {  
4506 - $('#layerChangeSlider').slider("option", "value", parseInt($rootScope.totalLayers) - parseInt($rootScope.currentLayerNumber)); 4531 + if ($("#txtlayerNumber").val() != 0 && $rootScope.currentLayerNumber != undefined) {
  4532 +
  4533 + var sliderVal = parseInt($rootScope.totalLayers) - parseInt($rootScope.currentLayerNumber);
  4534 + console.log('inside mouseDownListener. document.getElementById layerChangeSlider value : ' + document.getElementById('layerChangeSlider') + '$rootScope.totalLayers: ' + $rootScope.totalLayers + ' - $rootScope.currentLayerNumber: ' + $rootScope.currentLayerNumber + ' = set value for layerChangeSlider: ' + sliderVal);
  4535 +
  4536 + $('#layerChangeSlider').slider("option", "value", sliderVal);
  4537 +
4507 $("#txtlayerNumber").val(parseInt($rootScope.currentLayerNumber)); 4538 $("#txtlayerNumber").val(parseInt($rootScope.currentLayerNumber));
4508 } 4539 }
4509 4540
@@ -6641,9 +6672,11 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -6641,9 +6672,11 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
6641 //txtTransparencyChange.value = 0; 6672 //txtTransparencyChange.value = 0;
6642 // document.getElementById('txtLayerNumber').value = 0; 6673 // document.getElementById('txtLayerNumber').value = 0;
6643 6674
  6675 + var sliderVal = parseInt($rootScope.totalLayers) - parseInt($rootScope.currentLayerNumber);
6644 6676
  6677 + console.log('inside mouseDownListener. document.getElementById layerChangeSlider value : ' + document.getElementById('layerChangeSlider') + '$rootScope.totalLayers: ' + $rootScope.totalLayers + ' - $rootScope.currentLayerNumber: ' + $rootScope.currentLayerNumber + ' = set value for layerChangeSlider: ' + sliderVal);
6645 6678
6646 - $('#layerChangeSlider').slider("option", "value", parseInt($rootScope.totalLayers) - parseInt($rootScope.currentLayerNumber)); 6679 + $('#layerChangeSlider').slider("option", "value", sliderVal);
6647 //if ($scope.isGenderChnage || $rootScope.isViewChange) { 6680 //if ($scope.isGenderChnage || $rootScope.isViewChange) {
6648 // $("#txtlayerNumber").val(parseInt(0)); 6681 // $("#txtlayerNumber").val(parseInt(0));
6649 //} 6682 //}
@@ -8022,6 +8055,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -8022,6 +8055,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
8022 $rootScope.totalLayers = dataLength - 1; 8055 $rootScope.totalLayers = dataLength - 1;
8023 8056
8024 $('#txtLayerNumber').attr('max', $rootScope.totalLayers); 8057 $('#txtLayerNumber').attr('max', $rootScope.totalLayers);
  8058 +
  8059 + console.log('inside DataService.getJson. document.getElementById layerChangeSlider value : ' + document.getElementById('layerChangeSlider') + 'set value: ' + $rootScope.totalLayers);
  8060 +
8025 $('#layerChangeSlider').slider("option", "max", $rootScope.totalLayers); 8061 $('#layerChangeSlider').slider("option", "max", $rootScope.totalLayers);
8026 8062
8027 //set max for LayerNumber input 8063 //set max for LayerNumber input
@@ -9122,6 +9158,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -9122,6 +9158,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
9122 } 9158 }
9123 9159
9124 $scope.setLayerNumberAndHighlightByTermList = function () { 9160 $scope.setLayerNumberAndHighlightByTermList = function () {
  9161 +
9125 console.log(' $scope.actualTermNumber insde setLayerNumberAndHighlightByTermList= ' + $rootScope.actualTermNumber) 9162 console.log(' $scope.actualTermNumber insde setLayerNumberAndHighlightByTermList= ' + $rootScope.actualTermNumber)
9126 9163
9127 $scope.TermList = $scope.getTermNumberList($rootScope.actualTermNumber); 9164 $scope.TermList = $scope.getTermNumberList($rootScope.actualTermNumber);
@@ -9136,6 +9173,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -9136,6 +9173,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
9136 } 9173 }
9137 9174
9138 internalLayerNumberList.sort(function (a, b) { return a - b }) 9175 internalLayerNumberList.sort(function (a, b) { return a - b })
  9176 +
9139 var internalLayerNumber = internalLayerNumberList[0]//.replace('00', ''); 9177 var internalLayerNumber = internalLayerNumberList[0]//.replace('00', '');
9140 9178
9141 //3. get layer number 9179 //3. get layer number
@@ -9222,7 +9260,11 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -9222,7 +9260,11 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
9222 } 9260 }
9223 9261
9224 $('#txtlayerNumber').val((parseInt($scope.layerNumber))); 9262 $('#txtlayerNumber').val((parseInt($scope.layerNumber)));
9225 - $('#layerChangeSlider').slider("option", "value", parseInt($rootScope.totalLayers) - parseInt($scope.layerNumber)); 9263 +
  9264 + var sliderVal = parseInt($rootScope.totalLayers) - parseInt($scope.layerNumber);
  9265 + console.log('inside setLayerNumberAndHighlightByTermList. document.getElementById layerChangeSlider value : ' + document.getElementById('layerChangeSlider') + '$rootScope.totalLayers: ' + $rootScope.totalLayers + ' - parseInt($scope.layerNumber): ' + parseInt($scope.layerNumber) + ' = set value for layerChangeSlider: ' + sliderVal);
  9266 +
  9267 + $('#layerChangeSlider').slider("option", "value",sliderVal );
9226 9268
9227 //8.remove current layer canavses 9269 //8.remove current layer canavses
9228 // $scope.flushCanvas(); 9270 // $scope.flushCanvas();