diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
index d7e3462..f9beb74 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -1718,7 +1718,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
else {
// for existing DA
- var viewOrientationId=$scope.GetwindowStoreData(windowviewid,'viewOrientationId');
+ var viewOrientationId = $scope.GetwindowStoreData(windowviewid, 'viewOrientationId');
+
$scope.CalculateImageCordinates(viewOrientationId, windowviewid);
}
@@ -1886,7 +1887,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
$('#spinner').css('visibility', 'visible');
//redraw body of respective layer
- var viewOrientationId=$scope.GetwindowStoreData(windowviewid,'viewOrientationId');
+ var viewOrientationId = $scope.GetwindowStoreData(windowviewid, 'viewOrientationId');
+
$scope.CalculateImageCordinates(viewOrientationId, windowviewid);
}, 500);
@@ -2319,13 +2321,12 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
else
lNumber = $scope.GetwindowStoreData(windowviewid, 'layerNumberBeforeTBDraw');
- alert("GetImageSource lNumber IF= " + lNumber);
-
+ console.log("GetImageSource lNumber IF= " + lNumber)
}
else{
lNumber = $scope.GetwindowStoreData(windowviewid, 'layerNumber');
- alert("GetImageSource lNumber = " + lNumber);
+ console.log("GetImageSource lNumber = " + lNumber);
}
$scope.userInput = parseInt(lNumber);
@@ -4716,7 +4717,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
}
//2.
- var viewOrientationId=$scope.GetwindowStoreData(windowviewid,'viewOrientationId');
+ var viewOrientationId = $scope.GetwindowStoreData(windowviewid, 'viewOrientationId');
+ console.log("CalculateImageCordinates call from 4723");
+
$scope.CalculateImageCordinates(viewOrientationId,windowviewid);
//3.
@@ -5649,7 +5652,6 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
e.preventDefault();
$scope.SetwindowStoreData(windowviewid, 'isTBDrawnOnBodyRegion', false);
- $scope.SetwindowStoreData(windowviewid, 'isTransparencyActivated', true);
$scope.SetwindowStoreData(windowviewid, 'IsNormalModeBeforeTBDraw', $scope.GetwindowStoreData(windowviewid, 'isNormalMode'));
$scope.SetwindowStoreData(windowviewid, 'IsHighlightModeBeforeTBDraw', $scope.GetwindowStoreData(windowviewid, 'isHighlight'));
@@ -5827,8 +5829,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
$scope.DrawTransparencyBox = function (windowviewid) {
var newDimes = null;
// if ($scope.GetwindowStoreData(windowviewid, 'zoomInOut') == 25) {
- if ($scope.GetwindowStoreData(windowviewid, 'isZoomed') == true) {
- alert("ZOOM");
+ if ( $scope.GetwindowStoreData(windowviewid, 'isTransparencyActivated') && $scope.GetwindowStoreData(windowviewid, 'isZoomed') == true) {
+ // alert("ZOOM");
newDimes = $scope.scaleTransparencyBox(windowviewid);
$scope.TransparencyBoxStartX = newDimes.scaledX1;
@@ -6046,7 +6048,6 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
else {
existingZoon = 25;
}
- alert( 'nzoom = '+nzoom+',existingZoon= '+existingZoon )
var X = 0;
var scaledY = 0;
var scaledHeight = 0;
@@ -6412,7 +6413,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
$scope.loadTransparencyImage = function (bodyRegionId, Height, Width, X, Y, IsMirror, TransparencyBoxStartX, TransparencyEndX, TransparencyBoxStartY, TransparencyBoxEndY, scope, isLayerChanged, isTransparencyChanged, isResized, windowviewid) {
$scope.SetwindowStoreData(windowviewid, 'isCallForTransparencyImage', true);
-
+ // $scope.SetwindowStoreData(windowviewid, 'isZoomed',false);
var transparencyCanvas = document.getElementById('transparencyCanvas_' + windowviewid);
TransparencyBoxStartX = parseInt((transparencyCanvas.style.left).replace('px', ''));
@@ -6431,21 +6432,24 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
var WidthforTransImage = TBImageDimensions.WidthforTransImageTB;
var HeightforTransImage = TBImageDimensions.HeightforTransImageTB;
var YforTransImage = TBImageDimensions.YforTransImageTB;
+ var tranparencyLayer;
+ var isResized = $scope.GetwindowStoreData(windowviewid, "isResized");
//0. get current layer number
if (isResized || isLayerChanged) {
//do nothing
$scope.SetwindowStoreData(windowviewid,'transNumber',100);
$("#tbSlider_" + windowviewid).slider('value', 100);
+ tranparencyLayer = parseInt($('#txtLayerNumberDA_' + windowviewid).val());
}
else {
- var tranparencyLayer;
+
// alert($scope.GetwindowStoreData(windowviewid, "isTransparencyActivated")+"---"+($scope.GetwindowStoreData(windowviewid, "isNormalBtnClicked")))
- if ($scope.GetwindowStoreData(windowviewid, "isTransparencyActivated") == true && (($scope.GetwindowStoreData(windowviewid, "isNormalBtnClicked") == true || $scope.GetwindowStoreData(windowviewid, "isHighlightlBtnClicked") == true)) ){
+ if ($scope.GetwindowStoreData(windowviewid, "isTransparencyActivated") == true && (($scope.GetwindowStoreData(windowviewid, "isNormalBtnClicked") == true || $scope.GetwindowStoreData(windowviewid, "isHighlightlBtnClicked") == true) || $scope.GetwindowStoreData(windowviewid, "isZoomed") == true)) {
tranparencyLayer = parseInt($('#txtLayerNumberDA_' + windowviewid).val());
$scope.SetwindowStoreData(windowviewid, 'isNormalBtnClicked', false);
$scope.SetwindowStoreData(windowviewid, 'isHighlightlBtnClicked', false);
@@ -6461,9 +6465,11 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
tranparencyLayer = currentLayer + 1;
}
}
- $scope.SetwindowStoreData(windowviewid,'layerNumber',tranparencyLayer);
}
+ console.log("loadTransparencyImage::: tranparencyLayer = " + tranparencyLayer);
+ $scope.SetwindowStoreData(windowviewid, 'layerNumber', tranparencyLayer);
+ console.log(" $scope.GetwindowStoreData(windowviewid, 'layerNumber')===" + $scope.GetwindowStoreData(windowviewid, 'layerNumber'));
$('#txtLayerNumberDA_' + windowviewid).val( $scope.GetwindowStoreData(windowviewid,'layerNumber'));
@@ -7113,8 +7119,12 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
}
+
$scope.SetwindowStoreData(windowviewid, 'isTransparencyActivated', true);
$scope.EnableUI();
+
+ $scope.SetwindowStoreData(windowviewid, 'isZoomed',false);
+
}
$scope.changeTransparency = function (windowviewid) {
@@ -7411,179 +7421,190 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
if (tCanvasHeight != $scope.transparencyCanvasHeight || tCanvasWidth != $scope.transparencyCanvasWidth) {
+ $scope.TransparencyBoxStartX = tBoxStartX;
+ $scope.TransparencyBoxStartY = tBoxStartY;
+ $scope.TBoxEndX = tBoxEndX;
+ $scope.TBoxEndY = tBoxEndY;
+ $scope.TBHeight = tBoxEndY - tBoxStartY;
+ $scope.TBWidth = tBoxEndX - tBoxStartX;
- var transparencyCanvas = document.createElement('canvas');
- transparencyCanvas.id = 'transparencyCanvas_' + windowviewid;
- $scope.transparencyCanvas = tCanvas.id;
- transparencyCanvas.height = tCanvasHeight;
- transparencyCanvas.width = tCanvasWidth;
- transparencyCanvas.style.position = "absolute";
- transparencyCanvas.style.left = tCanvas.style.left; // x + "px";
- transparencyCanvas.style.top = tCanvas.style.top//y + "px";
- transparencyCanvas.style.border = "black 1px solid";
- transparencyCanvas.style.zIndex = 200;
+ $scope.SetwindowStoreData(windowviewid, "isResized", true);
- document.getElementById('canvasDivDA_' + windowviewid).appendChild(transparencyCanvas);
+ $scope.DrawTransparencyBox(windowviewid);
- $('#transparencyCanvas_' + windowviewid).resizable({ handles: "e,s,se,w,n,ne,nw,sw", stop: function (event, ui) { resizeTransparencyBox(windowviewid); }, start: function (event, ui) { clearTransCanvas(windowviewid); } });
- $(".ui-wrapper").css("z-index", $scope.GetwindowStoreData(windowviewid,'UIWrapperZIndex'));
+ // var transparencyCanvas = document.createElement('canvas');
+ // transparencyCanvas.id = 'transparencyCanvas_' + windowviewid;
+ // $scope.transparencyCanvas = tCanvas.id;
+ // transparencyCanvas.height = tCanvasHeight;
+ // transparencyCanvas.width = tCanvasWidth;
+ // transparencyCanvas.style.position = "absolute";
+ // transparencyCanvas.style.left = tCanvas.style.left; // x + "px";
+ // transparencyCanvas.style.top = tCanvas.style.top//y + "px";
+ // transparencyCanvas.style.border = "black 1px solid";
+ // transparencyCanvas.style.zIndex = 200;
- //bind click listener
- transparencyCanvas.addEventListener('click', TransparencyCanvasClickListener);
- }
- $scope.transparencyCanvasHeight = tCanvasHeight;
- $scope.transparencyCanvasWidth = tCanvasWidth;
+ // document.getElementById('canvasDivDA_' + windowviewid).appendChild(transparencyCanvas);
- //create temp cavas to retain the original anavs data for use in transparency change as
- //if u use original canvas data for transprency change then at 0 transparency all data will become transparent and if u increase transparency with this data then the canavs will be blank
- if (document.getElementById('tempCanvas_' + windowviewid) != null) {
- $('#tempCanvas_'+ windowviewid).remove();
- }
- var tempCanvas = document.createElement('canvas');
- tempCanvas.id = 'tempCanvas_' + windowviewid;
- $scope.tempCanvas = tempCanvas.id;
- tempCanvas.height = $scope.transparencyCanvasHeight;
- tempCanvas.width = $scope.transparencyCanvasWidth;
- tempCanvas.style.position = "absolute";
- tempCanvas.style.left = 200 + 'px';
- tempCanvas.style.backgroundColor = "transparent";
- tempCanvas.style.visibility = 'hidden';
- // tempCanvas.style.border = "black 1px solid";
-
- document.getElementById('canvasDivDA_' + windowviewid).appendChild(tempCanvas);
-
- var BodyRegionDictionary = $scope.GetwindowStoreData(windowviewid,'BodyRegionCordinatesData');
-
- $scope.IncludedBodyRegions = [];
- $scope.transparencyDrawnRegions = [];
- $scope.canThirdBRDrawn = false;
- var counter = 0;
- var bodyVid=$scope.GetwindowStoreData(windowviewid,'voId');
- $.each(BodyRegionDictionary, function (index, value) {
-
- var bodyRegionRight = parseInt(value.X) + parseInt(value.Width);
- var bodyRegionBottom = parseInt(value.Y) + parseInt(value.Height);
- var TBRight = parseInt((document.getElementById('transparencyCanvas_' + windowviewid).style.left).replace('px', '')) + parseInt((document.getElementById('transparencyCanvas_' + windowviewid).style.width).replace('px', ''));
- var TBBottom = parseInt((document.getElementById('transparencyCanvas_' + windowviewid).style.top).replace('px', '')) + parseInt((document.getElementById('transparencyCanvas_' + windowviewid).style.height).replace('px', ''));
- var TBStartX = parseInt((document.getElementById('transparencyCanvas_'+ windowviewid).style.left).replace('px', ''));
- var TBStartY = parseInt((document.getElementById('transparencyCanvas_' + windowviewid).style.top).replace('px', ''));
-
- if (TBStartX <= bodyRegionRight && value.X <= TBRight && TBStartY <= bodyRegionBottom && value.Y <= TBBottom) {
-
- if ($scope.GetwindowStoreData(windowviewid,'isTBDrawnOnBodyRegion') == false) {
- var totalayer=$scope.GetwindowStoreData(windowviewid,'totalLayers');
- var layer=$scope.GetwindowStoreData(windowviewid,'layerNumber');
- if (layer < totalayer) {
-
- var layerup=layer+1;
- $scope.SetwindowStoreData(windowviewid,'layerNumber',layerup);
- }
-
- }
-
- if (value.bodyRegionId == '3') {
-
- var BR_SixTBData = new jinqJs()
- .from($scope.transparencyDrawnRegions)
- .where('BRID == 6')
- .select();
-
- if (BR_SixTBData != null && BR_SixTBData != undefined && BR_SixTBData.length > 0) {
-
- $scope.canThirdBRDrawn = true;
-
- }
-
-
- }
-
- if ((bodyVid == "9" || bodyVid == "11" || bodyVid == "2" || bodyVid == "3" || bodyVid == "6" ||bodyVid == "7")) {
- if (value.bodyRegionId == "6") {
- $scope.loadTransparencyImage(value.bodyRegionId, value.Height, value.Width, value.X, value.Y, value.IsMirror, $scope.TransparencyBoxStartX, $scope.TransparencyEndX, $scope.TransparencyBoxStartY, $scope.TransparencyBoxEndY, $scope, false, false, true, windowviewid);
- }
- else {
- $scope.loadTransparencyImage(value.bodyRegionId, value.Height, value.Width, value.X, value.Y, value.IsMirror, $scope.TransparencyBoxStartX, $scope.TransparencyEndX, $scope.TransparencyBoxStartY, $scope.TransparencyBoxEndY, $scope, false, false, true, windowviewid);
- }
- }
- else {
- if (value.bodyRegionId == '3' && $scope.canThirdBRDrawn == true) {
+ // $('#transparencyCanvas_' + windowviewid).resizable({ handles: "e,s,se,w,n,ne,nw,sw", stop: function (event, ui) { resizeTransparencyBox(windowviewid); }, start: function (event, ui) { clearTransCanvas(windowviewid); } });
+ // $(".ui-wrapper").css("z-index", $scope.GetwindowStoreData(windowviewid,'UIWrapperZIndex'));
- $scope.loadTransparencyImage(value.bodyRegionId, value.Height, value.Width, value.X, value.Y, value.IsMirror, $scope.TransparencyBoxStartX, $scope.TransparencyEndX, $scope.TransparencyBoxStartY, $scope.TransparencyBoxEndY, $scope, false, false, true, windowviewid);
- }
-
- else {
-
- if (value.bodyRegionId == '3' && $scope.canThirdBRDrawn == false) {
-
- //1. draw 6th
- var BRSixData = new jinqJs()
- .from(BodyRegionDictionary)
- .where('bodyRegionId == 6')
- .select();
- var isMirror = BRSixData[0].IsMirror;
- if (isMirror == 'Yes') {
- //draw mirror arm
- $scope.loadTransparencyImage(BRSixData[0].bodyRegionId, BRSixData[0].Height, BRSixData[0].Width, BRSixData[0].X, BRSixData[0].Y, 'Yes', $scope.TransparencyBoxStartX, $scope.TransparencyEndX, $scope.TransparencyBoxStartY, $scope.TransparencyBoxEndY, $scope, false, false, true, windowviewid);
- //draw non mirror arm
- $scope.loadTransparencyImage(BRSixData[1].bodyRegionId, BRSixData[1].Height, BRSixData[1].Width, BRSixData[1].X, BRSixData[1].Y, 'No', $scope.TransparencyBoxStartX, $scope.TransparencyEndX, $scope.TransparencyBoxStartY, $scope.TransparencyBoxEndY, $scope, false, false, true, windowviewid);
- //draw 3rd BR
- $timeout(function () {
- $scope.loadTransparencyImage(value.bodyRegionId, value.Height, value.Width, value.X, value.Y, value.IsMirror, $scope.TransparencyBoxStartX, $scope.TransparencyEndX, $scope.TransparencyBoxStartY, $scope.TransparencyBoxEndY, $scope, false, false, true, windowviewid);
- }, 200);
- }
- else {
- //draw mirror arm
- $scope.loadTransparencyImage(BRSixData[0].bodyRegionId, BRSixData[0].Height, BRSixData[0].Width, BRSixData[0].X, BRSixData[0].Y, 'No', $scope.TransparencyBoxStartX, $scope.TransparencyEndX, $scope.TransparencyBoxStartY, $scope.TransparencyBoxEndY, $scope, false, false, true, windowviewid);
- //draw non mirror arm
- $scope.loadTransparencyImage(BRSixData[1].bodyRegionId, BRSixData[1].Height, BRSixData[1].Width, BRSixData[1].X, BRSixData[1].Y, 'Yes', $scope.TransparencyBoxStartX, $scope.TransparencyEndX, $scope.TransparencyBoxStartY, $scope.TransparencyBoxEndY, $scope, false, false, true, windowviewid);
- //draw 3rd BR
- $timeout(function () {
- $scope.loadTransparencyImage(value.bodyRegionId, value.Height, value.Width, value.X, value.Y, value.IsMirror, $scope.TransparencyBoxStartX, $scope.TransparencyEndX, $scope.TransparencyBoxStartY, $scope.TransparencyBoxEndY, $scope, false, false, true, windowviewid);
- }, 200);
- }
-
-
- }
- else {
- var BR_SixTBData = new jinqJs()
- .from($scope.transparencyDrawnRegions)
- .where('BRID == 6')
- .select();
- if (value.bodyRegionId == "6" && BR_SixTBData != undefined && BR_SixTBData != null && BR_SixTBData.length > 0) {
- //do not draw 6 BR again, its already drawn
- }
- else
- $scope.loadTransparencyImage(value.bodyRegionId, value.Height, value.Width, value.X, value.Y, value.IsMirror, $scope.TransparencyBoxStartX, $scope.TransparencyEndX, $scope.TransparencyBoxStartY, $scope.TransparencyBoxEndY, $scope, false, false, true, windowviewid);
- }
- }
- }
- $scope.SetwindowStoreData(windowviewid,'isTBDrawnOnBodyRegion',true);
- }
-
-
- })
-
- var isModestyOn=$scope.GetwindowStoreData(windowviewid,'isModestyOn');
- var modestyImageInfo=$scope.GetwindowStoreData(windowviewid,'modestyImageInfo');
- //for modesty
- if (isModestyOn == true && modestyImageInfo.length > 0) {
- $.each(modestyImageInfo, function (index, value) {
-
- var bodyRegionRight = parseInt(value.x) + parseInt(value.Width);
- var bodyRegionBottom = parseInt(value.y) + parseInt(value.Height);
- var TBRight = parseInt((document.getElementById('transparencyCanvas_' + windowviewid).style.left).replace('px', '')) + parseInt((document.getElementById('transparencyCanvas_' + windowviewid).style.width).replace('px', ''));
- var TBBottom = parseInt((document.getElementById('transparencyCanvas_' + windowviewid).style.top).replace('px', '')) + parseInt((document.getElementById('transparencyCanvas_' + windowviewid).style.height).replace('px', ''));
- var TBStartX = parseInt((document.getElementById('transparencyCanvas_' + windowviewid).style.left).replace('px', ''));
- var TBStartY = parseInt((document.getElementById('transparencyCanvas_' + windowviewid).style.top).replace('px', ''));
-
- if (TBStartX <= bodyRegionRight && value.x <= TBRight && TBStartY <= bodyRegionBottom && value.y <= TBBottom) {
+ // //bind click listener
+ // transparencyCanvas.addEventListener('click', TransparencyCanvasClickListener);
+ //}
+ //$scope.transparencyCanvasHeight = tCanvasHeight;
+ //$scope.transparencyCanvasWidth = tCanvasWidth;
- $scope.loadTransparencyImage(value.bodyRegionId, value.Height, value.Width, value.x, value.y, value.IsMirror, $scope.TransparencyBoxStartX, $scope.TransparencyEndX, $scope.TransparencyBoxStartY, $scope.TransparencyBoxEndY, $scope, false, false, true, windowviewid);
- }
- })
+ ////create temp cavas to retain the original anavs data for use in transparency change as
+ ////if u use original canvas data for transprency change then at 0 transparency all data will become transparent and if u increase transparency with this data then the canavs will be blank
+ //if (document.getElementById('tempCanvas_' + windowviewid) != null) {
+ // $('#tempCanvas_'+ windowviewid).remove();
+ //}
+ //var tempCanvas = document.createElement('canvas');
+ //tempCanvas.id = 'tempCanvas_' + windowviewid;
+ //$scope.tempCanvas = tempCanvas.id;
+ //tempCanvas.height = $scope.transparencyCanvasHeight;
+ //tempCanvas.width = $scope.transparencyCanvasWidth;
+ //tempCanvas.style.position = "absolute";
+ //tempCanvas.style.left = 200 + 'px';
+ //tempCanvas.style.backgroundColor = "transparent";
+ //tempCanvas.style.visibility = 'hidden';
+ //// tempCanvas.style.border = "black 1px solid";
+
+ //document.getElementById('canvasDivDA_' + windowviewid).appendChild(tempCanvas);
+
+ //var BodyRegionDictionary = $scope.GetwindowStoreData(windowviewid,'BodyRegionCordinatesData');
+
+ //$scope.IncludedBodyRegions = [];
+ //$scope.transparencyDrawnRegions = [];
+ //$scope.canThirdBRDrawn = false;
+ //var counter = 0;
+ //var bodyVid=$scope.GetwindowStoreData(windowviewid,'voId');
+ //$.each(BodyRegionDictionary, function (index, value) {
+
+ // var bodyRegionRight = parseInt(value.X) + parseInt(value.Width);
+ // var bodyRegionBottom = parseInt(value.Y) + parseInt(value.Height);
+ // var TBRight = parseInt((document.getElementById('transparencyCanvas_' + windowviewid).style.left).replace('px', '')) + parseInt((document.getElementById('transparencyCanvas_' + windowviewid).style.width).replace('px', ''));
+ // var TBBottom = parseInt((document.getElementById('transparencyCanvas_' + windowviewid).style.top).replace('px', '')) + parseInt((document.getElementById('transparencyCanvas_' + windowviewid).style.height).replace('px', ''));
+ // var TBStartX = parseInt((document.getElementById('transparencyCanvas_'+ windowviewid).style.left).replace('px', ''));
+ // var TBStartY = parseInt((document.getElementById('transparencyCanvas_' + windowviewid).style.top).replace('px', ''));
+
+ // if (TBStartX <= bodyRegionRight && value.X <= TBRight && TBStartY <= bodyRegionBottom && value.Y <= TBBottom) {
+
+ // if ($scope.GetwindowStoreData(windowviewid,'isTBDrawnOnBodyRegion') == false) {
+ // var totalayer=$scope.GetwindowStoreData(windowviewid,'totalLayers');
+ // var layer=$scope.GetwindowStoreData(windowviewid,'layerNumber');
+ // if (layer < totalayer) {
+
+ // var layerup=layer+1;
+ // $scope.SetwindowStoreData(windowviewid,'layerNumber',layerup);
+ // }
+
+ // }
+
+ // if (value.bodyRegionId == '3') {
+
+ // var BR_SixTBData = new jinqJs()
+ // .from($scope.transparencyDrawnRegions)
+ // .where('BRID == 6')
+ // .select();
+
+ // if (BR_SixTBData != null && BR_SixTBData != undefined && BR_SixTBData.length > 0) {
+
+ // $scope.canThirdBRDrawn = true;
+
+ // }
+
+
+ // }
+
+ // if ((bodyVid == "9" || bodyVid == "11" || bodyVid == "2" || bodyVid == "3" || bodyVid == "6" ||bodyVid == "7")) {
+ // if (value.bodyRegionId == "6") {
+ // $scope.loadTransparencyImage(value.bodyRegionId, value.Height, value.Width, value.X, value.Y, value.IsMirror, $scope.TransparencyBoxStartX, $scope.TransparencyEndX, $scope.TransparencyBoxStartY, $scope.TransparencyBoxEndY, $scope, false, false, true, windowviewid);
+ // }
+ // else {
+ // $scope.loadTransparencyImage(value.bodyRegionId, value.Height, value.Width, value.X, value.Y, value.IsMirror, $scope.TransparencyBoxStartX, $scope.TransparencyEndX, $scope.TransparencyBoxStartY, $scope.TransparencyBoxEndY, $scope, false, false, true, windowviewid);
+ // }
+ // }
+ // else {
+ // if (value.bodyRegionId == '3' && $scope.canThirdBRDrawn == true) {
+
+ // $scope.loadTransparencyImage(value.bodyRegionId, value.Height, value.Width, value.X, value.Y, value.IsMirror, $scope.TransparencyBoxStartX, $scope.TransparencyEndX, $scope.TransparencyBoxStartY, $scope.TransparencyBoxEndY, $scope, false, false, true, windowviewid);
+ // }
+
+ // else {
+
+ // if (value.bodyRegionId == '3' && $scope.canThirdBRDrawn == false) {
+
+ // //1. draw 6th
+ // var BRSixData = new jinqJs()
+ // .from(BodyRegionDictionary)
+ // .where('bodyRegionId == 6')
+ // .select();
+ // var isMirror = BRSixData[0].IsMirror;
+ // if (isMirror == 'Yes') {
+ // //draw mirror arm
+ // $scope.loadTransparencyImage(BRSixData[0].bodyRegionId, BRSixData[0].Height, BRSixData[0].Width, BRSixData[0].X, BRSixData[0].Y, 'Yes', $scope.TransparencyBoxStartX, $scope.TransparencyEndX, $scope.TransparencyBoxStartY, $scope.TransparencyBoxEndY, $scope, false, false, true, windowviewid);
+ // //draw non mirror arm
+ // $scope.loadTransparencyImage(BRSixData[1].bodyRegionId, BRSixData[1].Height, BRSixData[1].Width, BRSixData[1].X, BRSixData[1].Y, 'No', $scope.TransparencyBoxStartX, $scope.TransparencyEndX, $scope.TransparencyBoxStartY, $scope.TransparencyBoxEndY, $scope, false, false, true, windowviewid);
+ // //draw 3rd BR
+ // $timeout(function () {
+ // $scope.loadTransparencyImage(value.bodyRegionId, value.Height, value.Width, value.X, value.Y, value.IsMirror, $scope.TransparencyBoxStartX, $scope.TransparencyEndX, $scope.TransparencyBoxStartY, $scope.TransparencyBoxEndY, $scope, false, false, true, windowviewid);
+ // }, 200);
+ // }
+ // else {
+ // //draw mirror arm
+ // $scope.loadTransparencyImage(BRSixData[0].bodyRegionId, BRSixData[0].Height, BRSixData[0].Width, BRSixData[0].X, BRSixData[0].Y, 'No', $scope.TransparencyBoxStartX, $scope.TransparencyEndX, $scope.TransparencyBoxStartY, $scope.TransparencyBoxEndY, $scope, false, false, true, windowviewid);
+ // //draw non mirror arm
+ // $scope.loadTransparencyImage(BRSixData[1].bodyRegionId, BRSixData[1].Height, BRSixData[1].Width, BRSixData[1].X, BRSixData[1].Y, 'Yes', $scope.TransparencyBoxStartX, $scope.TransparencyEndX, $scope.TransparencyBoxStartY, $scope.TransparencyBoxEndY, $scope, false, false, true, windowviewid);
+ // //draw 3rd BR
+ // $timeout(function () {
+ // $scope.loadTransparencyImage(value.bodyRegionId, value.Height, value.Width, value.X, value.Y, value.IsMirror, $scope.TransparencyBoxStartX, $scope.TransparencyEndX, $scope.TransparencyBoxStartY, $scope.TransparencyBoxEndY, $scope, false, false, true, windowviewid);
+ // }, 200);
+ // }
+
+
+ // }
+ // else {
+ // var BR_SixTBData = new jinqJs()
+ // .from($scope.transparencyDrawnRegions)
+ // .where('BRID == 6')
+ // .select();
+ // if (value.bodyRegionId == "6" && BR_SixTBData != undefined && BR_SixTBData != null && BR_SixTBData.length > 0) {
+ // //do not draw 6 BR again, its already drawn
+ // }
+ // else
+ // $scope.loadTransparencyImage(value.bodyRegionId, value.Height, value.Width, value.X, value.Y, value.IsMirror, $scope.TransparencyBoxStartX, $scope.TransparencyEndX, $scope.TransparencyBoxStartY, $scope.TransparencyBoxEndY, $scope, false, false, true, windowviewid);
+ // }
+ // }
+ // }
+ // $scope.SetwindowStoreData(windowviewid,'isTBDrawnOnBodyRegion',true);
+ // }
+
+
+ //})
+
+ //var isModestyOn=$scope.GetwindowStoreData(windowviewid,'isModestyOn');
+ //var modestyImageInfo=$scope.GetwindowStoreData(windowviewid,'modestyImageInfo');
+ ////for modesty
+ //if (isModestyOn == true && modestyImageInfo.length > 0) {
+ // $.each(modestyImageInfo, function (index, value) {
+
+ // var bodyRegionRight = parseInt(value.x) + parseInt(value.Width);
+ // var bodyRegionBottom = parseInt(value.y) + parseInt(value.Height);
+ // var TBRight = parseInt((document.getElementById('transparencyCanvas_' + windowviewid).style.left).replace('px', '')) + parseInt((document.getElementById('transparencyCanvas_' + windowviewid).style.width).replace('px', ''));
+ // var TBBottom = parseInt((document.getElementById('transparencyCanvas_' + windowviewid).style.top).replace('px', '')) + parseInt((document.getElementById('transparencyCanvas_' + windowviewid).style.height).replace('px', ''));
+ // var TBStartX = parseInt((document.getElementById('transparencyCanvas_' + windowviewid).style.left).replace('px', ''));
+ // var TBStartY = parseInt((document.getElementById('transparencyCanvas_' + windowviewid).style.top).replace('px', ''));
+
+ // if (TBStartX <= bodyRegionRight && value.x <= TBRight && TBStartY <= bodyRegionBottom && value.y <= TBBottom) {
+
+ // $scope.loadTransparencyImage(value.bodyRegionId, value.Height, value.Width, value.x, value.y, value.IsMirror, $scope.TransparencyBoxStartX, $scope.TransparencyEndX, $scope.TransparencyBoxStartY, $scope.TransparencyBoxEndY, $scope, false, false, true, windowviewid);
+
+ // }
+ // })
}
}
@@ -8265,7 +8286,13 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
$('.ui-wrapper').remove();
$scope.SetwindowStoreData(windowviewid,'layerNumber',currentlayer);
- $scope.SetwindowStoreData(windowviewid,'transNumber',100);
+ $scope.SetwindowStoreData(windowviewid, 'transNumber', 100);
+
+ $scope.SetwindowStoreData(windowviewid, 'isTransparencyBtnClicked', false);
+
+ $scope.SetwindowStoreData(windowviewid, 'isZoomed', false);
+ $scope.SetwindowStoreData(windowviewid, 'isResized', false);
+
}
var modestyTempCanvases = $("canvas[id*='tempCanvasModesty']");
@@ -8439,7 +8466,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
$('#zoomValueDA_' + windowviewid).attr('value', $scope.GetwindowStoreData(windowviewid,'zoomInOut'));
}
- var viewOrientationId=$scope.GetwindowStoreData(windowviewid,'viewOrientationId');
+ var viewOrientationId = $scope.GetwindowStoreData(windowviewid, 'viewOrientationId');
$scope.CalculateImageCordinates(viewOrientationId,windowviewid);
@@ -8576,7 +8603,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
$scope.flushCanvas(windowviewid);
//3.
- var viewOrientationId=$scope.GetwindowStoreData(windowviewid,'viewOrientationId');
+ var viewOrientationId = $scope.GetwindowStoreData(windowviewid, 'viewOrientationId');
+
$scope.CalculateImageCordinates(viewOrientationId,windowviewid);
@@ -8687,6 +8715,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
}
var viewOrientationId = $scope.GetwindowStoreData(windowviewid, 'viewOrientationId');
+
$scope.CalculateImageCordinates(viewOrientationId, windowviewid);
var CanvasDivLeftPosition = $scope.GetwindowStoreData(windowviewid, 'CanvasDivLeftPosition');
@@ -9757,6 +9786,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
}
else {
//actual term number is not found in thsi view menas previously selected body part does not exist in this view
+
$scope.CalculateImageCordinates(viewOrientationId, windowviewid)
}
}
@@ -10178,7 +10208,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
$scope.SetwindowStoreData(windowviewid,'isHighLight',true);
if ($scope.GetwindowStoreData(windowviewid,'isExtract') == true) {
- $scope.SetwindowStoreData(windowviewid,'isExtract',false);
+ $scope.SetwindowStoreData(windowviewid, 'isExtract', false);
+
$scope.CalculateImageCordinates(viewOrientationId, windowviewid);
}
else
@@ -10847,7 +10878,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
$('#spinner').css('visibility', 'visible');
//redraw body of respective layer
- var viewOrientationId=$scope.GetwindowStoreData(windowviewid,'viewOrientationId');
+ var viewOrientationId = $scope.GetwindowStoreData(windowviewid, 'viewOrientationId');
+
$scope.CalculateImageCordinates(viewOrientationId, windowviewid);
}, 500);