diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
index 964b9be..92599c1 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -290,6 +290,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
}
//to disbale layer change slider
$('.ui-slider').slider('disable');
+
+ $scope.isLoading = true;
+ $('#spinner').css('visibility', 'visible');
}
$scope.EnableUI = function () {
@@ -302,6 +305,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
//to enable layer change slider
$('.ui-slider').slider('enable');
+ $scope.isLoading = false;
+
+ $('#spinner').css('visibility', 'hidden');
}
$scope.openView = function ($event) {
@@ -723,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",
@@ -730,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);
@@ -913,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;
@@ -1332,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.
@@ -3611,7 +3638,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
}
-
+ else {
+ $scope.EnableUI();
+ }
})
}
@@ -3659,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
@@ -4390,8 +4424,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
$('#btnTranparency').addClass('tButtonActive');
- $('#btnIdentity').removeClass(' btn-primary');
- $('#btnIdentity').addClass('btn-black');
+ $('#btnIdentify').removeClass(' btn-primary');
+ $('#btnIdentify').addClass('btn-black');
var canvasDiv = document.getElementById('canvasDiv');
$scope.verticalScrollPosition = canvasDiv.scrollTop;
@@ -4494,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));
}
@@ -4792,8 +4831,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
//Dated:18-07-2016 Issue#4975: Transparency box should not be clickable if it is already selected.
$('#btnTranparency').removeClass('tButtonActive');
$('#btnTranparency').addClass('btn-black');
- $('#btnIdentity').removeClass('btn-black');
- $('#btnIdentity').addClass('btn-primary');
+ $('#btnIdentify').removeClass('btn-black');
+ $('#btnIdentify').addClass('btn-primary');
// clear canvas before drawing transparency box
if ($rootScope.isAnnotationWindowOpen == true) {
@@ -5903,7 +5942,14 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
if (TBStartX <= bodyRegionRight && value.X <= TBRight && TBStartY <= bodyRegionBottom && value.Y <= TBBottom) {
if ($scope.isTBDrawnOnBodyRegion == false) {
- $scope.layerNumber = $scope.layerNumber + 1;
+
+
+ if ($scope.layerNumber < $rootScope.totalLayers) {
+
+ $scope.layerNumber = $scope.layerNumber + 1;
+
+ }
+
}
if (value.bodyRegionId == '3') {
@@ -6626,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));
//}
@@ -6678,9 +6726,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
// document.getElementById('btnTranparency').className = 't-transparency'
$('#btnTranparency').removeClass('tButtonActive');
$('#btnTranparency').addClass('btn-black');
- $('#btnIdentity').removeClass('btn-black');
+ $('#btnIdentify').removeClass('btn-black');
- $('#btnIdentity').addClass('btn-primary');
+ $('#btnIdentify').addClass('btn-primary');
document.getElementById('btnTranparency').removeEventListener("click", $scope.createTransparencyBox);
@@ -6771,14 +6819,14 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
};
- $scope.IdentityClick = function () {
+ $scope.IdentifyClick = function () {
//if listanager is visisble then close it
$rootScope.isListManagerSelected = false;
$rootScope.CloseListManager();
- // $('#btnIdentity').addClass('btn-primary');
+ // $('#btnIdentify').addClass('btn-primary');
if ($scope.isTransparencyBtnClicked == true) {
@@ -6792,6 +6840,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
canvasDiv.removeEventListener("mouseup", mouseUpListener)
$('#btnTranparency').removeClass('tButtonActive');
$('#btnTranparency').addClass('btn-black');
+
+ $("#btnExtract").removeClass("disabled");
+ $("#btnExtract").css("pointer-events", "auto");
}
}
@@ -7510,7 +7561,12 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
$scope.isLoading = true;
$('#spinner').css('visibility', 'visible');
- $scope.HighlightBodyByTermList($scope.AllTerms)
+ if ($scope.AllTerms != undefined && $scope.AllTerms.length > 0) {
+ $scope.HighlightBodyByTermList($scope.AllTerms);
+ }
+ else {
+ $scope.EnableUI();
+ }
}, 800);
}
@@ -7999,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
@@ -8016,7 +8075,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
//if user seelcted any term and serached before gender cnage then itshould be highlighted in chnaged gender
- if ((($rootScope.isListManagerSelected == true) ||
+ if ((($rootScope.isListManagerSelected == true) || $rootScope.isListManagerAlreadySelected == true ||
($rootScope.isHighLight == true && $rootScope.previousHighlightList != null
&& $rootScope.previousHighlightList.length > 0))
&& (($rootScope.isGenderChnage == true) || $rootScope.isViewChange == true)) {
@@ -8027,8 +8086,21 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
else if ($rootScope.previousHighlightList != null && $rootScope.previousHighlightList.length > 0 &&
($rootScope.isGenderChnage == true || $rootScope.isViewChange == true)) {
- $rootScope.isHighLight = true
- $scope.setLayerNumberAndHighlightByTermList();
+ $scope.AllTerms = [];
+ $rootScope.isHighLight = true;
+
+ if ($rootScope.TermNumberData != undefined) {
+ $scope.TermList = $scope.getTermNumberList($rootScope.actualTermNumber);
+ if ($scope.TermList != null && $scope.TermList.length>0) {
+ $scope.setLayerNumberAndHighlightByTermList();
+ }
+ else {
+ //actual term number is not found in thsi view menas previously selected body part does not exist in this view
+ // $scope.EnableUI();
+ $scope.CalculateImageCordinates($rootScope.viewOrientationId)
+ }
+ }
+
}
else {
@@ -8722,77 +8794,83 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
$scope.ShowSearch = function () {
-
- var primaryLexiconIndex;
- for (var i = 0; i <= $rootScope.vocabTermDataArray.length - 1; i++) {
- if ($rootScope.vocabTermDataArray[i].language == $rootScope.lexiconLanguageArray[0].language) {
- primaryLexiconIndex = i;
+ if (($rootScope.vocabTermDataArray != null || $rootScope.vocabTermDataArray != undefined) && ($rootScope.vocabTermDataArray.length > 0)) {
+ var primaryLexiconIndex;
+ for (var i = 0; i <= $rootScope.vocabTermDataArray.length - 1; i++) {
+ if ($rootScope.vocabTermDataArray[i].language == $rootScope.lexiconLanguageArray[0].language) {
+ primaryLexiconIndex = i;
+ }
}
- }
- console.log('ShowSearch is called');
- //this check is for log only because we are writing length so need to check if its not null or undefined
- if ($rootScope.vocabTermDataArray[primaryLexiconIndex].vocabTermTxt != null || $rootScope.vocabTermDataArray[primaryLexiconIndex].vocabTermTxt != undefined)
- console.log('$scope.VocabTermTxt.length= ' + $rootScope.vocabTermDataArray[primaryLexiconIndex].vocabTermTxt.length)
+ console.log('ShowSearch is called');
+ //this check is for log only because we are writing length so need to check if its not null or undefined
+ if ($rootScope.vocabTermDataArray[primaryLexiconIndex].vocabTermTxt != null || $rootScope.vocabTermDataArray[primaryLexiconIndex].vocabTermTxt != undefined)
+ console.log('$scope.VocabTermTxt.length= ' + $rootScope.vocabTermDataArray[primaryLexiconIndex].vocabTermTxt.length)
- $timeout(function () {
-
- if (($rootScope.vocabTermDataArray[primaryLexiconIndex].vocabTermTxt != null || $rootScope.vocabTermDataArray[primaryLexiconIndex].vocabTermTxt != undefined) && ($rootScope.vocabTermDataArray[0].vocabTermTxt.length > 0)) {
- //This is added as the $scope.VocabTermTxt can change while changing view also the li elements need to be removed
- //Remove the list and then Repopulate
- if ($('#searchListDiv').html() != "")
- $('#searchListDiv').empty()
- //Delay compile of ul li so that the remove of li is completed.
- $timeout(function () {
- console.log("INSIDE WATCH. LIST IS CREATED");
- $scope.isSearchDataLoaded = true;
+ $timeout(function () {
- if (($scope.ColoredImageSRC != null || $scope.ColoredImageSRC != undefined)) {
+ if (($rootScope.vocabTermDataArray[primaryLexiconIndex].vocabTermTxt != null || $rootScope.vocabTermDataArray[primaryLexiconIndex].vocabTermTxt != undefined) && ($rootScope.vocabTermDataArray[0].vocabTermTxt.length > 0)) {
+ //This is added as the $scope.VocabTermTxt can change while changing view also the li elements need to be removed
+ //Remove the list and then Repopulate
+ if ($('#searchListDiv').html() != "")
+ $('#searchListDiv').empty()
+ //Delay compile of ul li so that the remove of li is completed.
+ $timeout(function () {
+ console.log("INSIDE WATCH. LIST IS CREATED");
+ $scope.isSearchDataLoaded = true;
- if ((($rootScope.viewOrientationId == '1') || ($rootScope.viewOrientationId == '4')) && ($scope.ColoredImageSRC.length == 9)) {
- $rootScope.isLoading = false;
- $('#spinner').css('visibility', 'hidden');
- }
- else if ((($rootScope.viewOrientationId == '2') || ($rootScope.viewOrientationId == '3')) && ($scope.ColoredImageSRC.length == 5)) {
- $rootScope.isLoading = false;
- $('#spinner').css('visibility', 'hidden');
- }
- else if (($rootScope.viewOrientationId == '5') && ($scope.ColoredImageSRC.length == 4)) {
- $rootScope.isLoading = false;
- $('#spinner').css('visibility', 'hidden');
- }
- else if (($rootScope.viewOrientationId == '6') && ($scope.ColoredImageSRC.length == 1)) {
- $rootScope.isLoading = false;
- $('#spinner').css('visibility', 'hidden');
+ if (($scope.ColoredImageSRC != null || $scope.ColoredImageSRC != undefined)) {
+
+ if ((($rootScope.viewOrientationId == '1') || ($rootScope.viewOrientationId == '4')) && ($scope.ColoredImageSRC.length == 9)) {
+ $rootScope.isLoading = false;
+ $('#spinner').css('visibility', 'hidden');
+ }
+ else if ((($rootScope.viewOrientationId == '2') || ($rootScope.viewOrientationId == '3')) && ($scope.ColoredImageSRC.length == 5)) {
+ $rootScope.isLoading = false;
+ $('#spinner').css('visibility', 'hidden');
+ }
+ else if (($rootScope.viewOrientationId == '5') && ($scope.ColoredImageSRC.length == 4)) {
+ $rootScope.isLoading = false;
+ $('#spinner').css('visibility', 'hidden');
+ }
+ else if (($rootScope.viewOrientationId == '6') && ($scope.ColoredImageSRC.length == 1)) {
+ $rootScope.isLoading = false;
+ $('#spinner').css('visibility', 'hidden');
+ }
}
- }
- }, 500);
- $scope.IsSearchVisible = true;
- console.log("s" + $rootScope.vocabTermDataArray[primaryLexiconIndex].language);
- $rootScope.a = primaryLexiconIndex;
- var $e2 = $('
').appendTo('#searchListDiv')
- $compile($e2)($scope);
- document.getElementById("termlistfilter").style.display = "block";
- $timeout(function () {
- $rootScope.searchListArray = [];
- $("#backdrop > #searchListDiv > #termlistfilter > li").each(function (key, value) {
- $rootScope.searchListArray.push({ "name": $(this).find("a").html(), "id": $(this).find("a").attr("id") });
- });
- }, 100);
-
- }
- else {
- $rootScope.loadSearchData();
- if ($rootScope.vocabTermDataArray[primaryLexiconIndex].vocabTermTxt.length > 0) {
- $scope.ShowSearch();
- }
- }
- }, 500);
+ }, 500);
+ $scope.IsSearchVisible = true;
+ console.log("s" + $rootScope.vocabTermDataArray[primaryLexiconIndex].language);
+ $rootScope.a = primaryLexiconIndex;
+ var $e2 = $('').appendTo('#searchListDiv')
+ $compile($e2)($scope);
+ document.getElementById("termlistfilter").style.display = "block";
+ $timeout(function () {
+ $rootScope.searchListArray = [];
+ $("#backdrop > #searchListDiv > #termlistfilter > li").each(function (key, value) {
+ $rootScope.searchListArray.push({ "name": $(this).find("a").html(), "id": $(this).find("a").attr("id") });
+ });
+ }, 100);
-
+ }
+ else {
+ $rootScope.loadSearchData();
+ if ($rootScope.vocabTermDataArray[primaryLexiconIndex].vocabTermTxt.length > 0) {
+ $scope.ShowSearch();
+ }
+ }
+ }, 500);
+ }
+ else
+ {
+ $rootScope.loadSearchData();
+ $scope.ShowSearch();
+
+
+ }
}
@@ -9080,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);
@@ -9094,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
@@ -9152,7 +9232,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
//7.get termList
$scope.fullTermlist = [];
$scope.AllTerms = [];
-
+ console.log("initialised");
if (termNo != DA[0].figLeafTermId) {
$scope.getChildTermList(termNo);
@@ -9180,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();
@@ -9238,6 +9322,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
var isFound = jQuery.inArray(serachTerm, $scope.fullTermlist)
if (isFound == -1) {
$scope.fullTermlist.push(serachTerm);
+ console.log("psudhed in getChildTermList")
$scope.AllTerms.push({ '_TermNumber': serachTerm })
$scope.getChildTermList(serachTerm);
}
@@ -9265,6 +9350,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
if ((data2 != null || data2 != undefined) && (data2.length > 0)) {
for (var i = 0; i < data2.length; i++) {
$scope.fullTermlist.push(data2[i]._TermNumber);
+ console.log("psudhed in getSiblings")
+
$scope.AllTerms.push({ '_TermNumber': data2[i]._TermNumber })
$scope.getChildTermList(data2[i]._TermNumber);
}
@@ -9693,11 +9780,11 @@ function OnEnableHighlight() {
});
}
-function OnIdentityClick() {
- console.log('OnIdentityClick is called outside ');
+function OnIdentifyClick() {
+ console.log('OnIdentifyClick is called outside ');
var scope = angular.element(document.getElementById("daView")).scope();
scope.$apply(function () {
- scope.IdentityClick();
+ scope.IdentifyClick();
});
}
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
index f7d95cf..50b0688 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -1716,49 +1716,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
var btneraseBrushSizeValue = $("#btnBrushSize").val();
$('#canvasPaint').sketch();
$rootScope.eraseshapeSize = parseInt(btneraseBrushSizeValue);
- $.sketch.tools.marker = {
- onEvent: function (e) {
- switch (e.type) {
- case 'mousedown':
- case 'touchstart':
- if (this.painting) {
- this.stopPainting();
- }
- this.startPainting();
- break;
- case 'mouseup':
- case 'mouseout':
- case 'mouseleave':
- case 'touchend':
- case 'touchcancel':
- this.stopPainting();
- }
- if (this.painting) {
- this.action.events.push({
- x: e.pageX - this.canvas.offset().left,
- y: e.pageY - this.canvas.offset().top,
- event: e.type
- });
- return this.redraw();
- }
- },
- draw: function (action) {
- var event, previous, _i, _len, _ref;
- this.context.lineJoin = "round";
- this.context.lineCap = "round";
- this.context.beginPath();
- this.context.moveTo(action.events[0].x, action.events[0].y);
- _ref = action.events;
- for (_i = 0, _len = _ref.length; _i < _len; _i++) {
- event = _ref[_i];
- this.context.lineTo(event.x, event.y);
- previous = event;
- }
- this.context.strokeStyle = action.color;
- this.context.lineWidth = action.size;
- return this.context.stroke();
- }
- };
+
$("#annotationpainteraser").attr("data-size", $rootScope.eraseshapeSize);
return $.sketch.tools.eraser = {
onEvent: function (e) {
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js b/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js
index 6ee86b4..d5c6f2d 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js
@@ -491,10 +491,12 @@ AIA.constant("UserModules", [
"slug": "Link/aod"
}
]);
+
AIA.constant("AIAConstants", {
"NO_BODY_SYSTEM_AVAILABLE": "Selected body system is not available on this layer.",
})
+
AIA.config(function ($routeProvider, pages, $locationProvider) {
$locationProvider.html5Mode(true);
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html b/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
index 1d78188..aa523ce 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
+++ b/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
@@ -139,7 +139,7 @@
-
+