diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
index c1bda75..92599c1 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -729,6 +729,12 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
$rootScope.selectedBodySystemId = 0;
$rootScope.searchSelectedText = '';
});
+
+ var sliderVal = document.getElementById('layerChangeSlider');
+
+ console.log('on slider initialize:' + sliderVal);
+
+
$("#layerChangeSlider").slider({
orientation: "vertical",
range: "max",
@@ -736,6 +742,10 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
value: 0,
slide: function (event, ui)
{
+ var sliderVal = document.getElementById('layerChangeSlider');
+
+ console.log('on slider slide :' + sliderVal);
+
var layerNum;
var daViewScope = angular.element(document.getElementById("daView")).scope();
layerNum = parseInt(daViewScope.totalLayers) //- parseInt(scope.layerNumber);
@@ -919,6 +929,11 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
$rootScope.totalLayers = dataLength - 1;
$('#txtLayerNumber').attr('max', $rootScope.totalLayers);
+
+ var layerChangeSliderVal = document.getElementById('layerChangeSlider');
+
+ console.log('inside bodyViewWorker.onmessage. $rootScope.totalLayers = ' + $rootScope.totalLayers + ' #layerChangeSlider value: ' + layerChangeSliderVal);
+
$('#layerChangeSlider').slider("option", "max", $rootScope.totalLayers);
$scope.isBodylayerdataLoaded = true;
@@ -1338,9 +1353,15 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
// $('#canvasDiv').scrollLeft($scope.imageHorizontlScrollPosition)
$('#canvasDiv').scrollTop(50)
- var abc = $rootScope.BodyRegionCordinatesData;
+ //var abc = $rootScope.BodyRegionCordinatesData;
- $('#layerChangeSlider').slider("option", "value", parseInt($rootScope.totalLayers) - parseInt($scope.layerNumber));
+ var sliderVal = parseInt($rootScope.totalLayers) - parseInt($scope.layerNumber);
+
+ 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);
+
+ $('#layerChangeSlider').slider("option", "value",sliderVal );
+
+
// $('#spinner').css('visibility', 'hidden');
$rootScope.isLoading = false;
//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
}
}
- $('#layerChangeSlider').slider("option", "value", parseInt($rootScope.totalLayers) - parseInt($scope.layerNumber));
+ var sliderVal = parseInt($rootScope.totalLayers) - parseInt($scope.layerNumber);
+
+ console.log('inside CalculateImageCordinates. document.getElementById layerChangeSlider value : ' + document.getElementById('layerChangeSlider') + '$rootScope.totalLayers: ' + $rootScope.totalLayers + '- parseInt($scope.layerNumber) ' + parseInt($scope.layerNumber) + 'set value: ' + sliderVal);
+
+
+ $('#layerChangeSlider').slider("option", "value", sliderVal);
// Annotations Closing Code
@@ -4502,8 +4528,13 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
//Dated:19-07-2016 Issue#4975: Transparency box should not be clickable if it is already selected.
- if ($("#txtlayerNumber").val() != 0 && $rootScope.currentLayerNumber != undefined) {
- $('#layerChangeSlider').slider("option", "value", parseInt($rootScope.totalLayers) - parseInt($rootScope.currentLayerNumber));
+ if ($("#txtlayerNumber").val() != 0 && $rootScope.currentLayerNumber != undefined) {
+
+ var sliderVal = parseInt($rootScope.totalLayers) - parseInt($rootScope.currentLayerNumber);
+ console.log('inside mouseDownListener. document.getElementById layerChangeSlider value : ' + document.getElementById('layerChangeSlider') + '$rootScope.totalLayers: ' + $rootScope.totalLayers + ' - $rootScope.currentLayerNumber: ' + $rootScope.currentLayerNumber + ' = set value for layerChangeSlider: ' + sliderVal);
+
+ $('#layerChangeSlider').slider("option", "value", sliderVal);
+
$("#txtlayerNumber").val(parseInt($rootScope.currentLayerNumber));
}
@@ -6641,9 +6672,11 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
//txtTransparencyChange.value = 0;
// document.getElementById('txtLayerNumber').value = 0;
+ var sliderVal = parseInt($rootScope.totalLayers) - parseInt($rootScope.currentLayerNumber);
+ console.log('inside mouseDownListener. document.getElementById layerChangeSlider value : ' + document.getElementById('layerChangeSlider') + '$rootScope.totalLayers: ' + $rootScope.totalLayers + ' - $rootScope.currentLayerNumber: ' + $rootScope.currentLayerNumber + ' = set value for layerChangeSlider: ' + sliderVal);
- $('#layerChangeSlider').slider("option", "value", parseInt($rootScope.totalLayers) - parseInt($rootScope.currentLayerNumber));
+ $('#layerChangeSlider').slider("option", "value", sliderVal);
//if ($scope.isGenderChnage || $rootScope.isViewChange) {
// $("#txtlayerNumber").val(parseInt(0));
//}
@@ -8022,6 +8055,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
$rootScope.totalLayers = dataLength - 1;
$('#txtLayerNumber').attr('max', $rootScope.totalLayers);
+
+ console.log('inside DataService.getJson. document.getElementById layerChangeSlider value : ' + document.getElementById('layerChangeSlider') + 'set value: ' + $rootScope.totalLayers);
+
$('#layerChangeSlider').slider("option", "max", $rootScope.totalLayers);
//set max for LayerNumber input
@@ -9122,6 +9158,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
}
$scope.setLayerNumberAndHighlightByTermList = function () {
+
console.log(' $scope.actualTermNumber insde setLayerNumberAndHighlightByTermList= ' + $rootScope.actualTermNumber)
$scope.TermList = $scope.getTermNumberList($rootScope.actualTermNumber);
@@ -9136,6 +9173,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
}
internalLayerNumberList.sort(function (a, b) { return a - b })
+
var internalLayerNumber = internalLayerNumberList[0]//.replace('00', '');
//3. get layer number
@@ -9222,7 +9260,11 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
}
$('#txtlayerNumber').val((parseInt($scope.layerNumber)));
- $('#layerChangeSlider').slider("option", "value", parseInt($rootScope.totalLayers) - parseInt($scope.layerNumber));
+
+ var sliderVal = parseInt($rootScope.totalLayers) - parseInt($scope.layerNumber);
+ 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);
+
+ $('#layerChangeSlider').slider("option", "value",sliderVal );
//8.remove current layer canavses
// $scope.flushCanvas();