diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index a959b8b..5c2d917 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -4726,7 +4726,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo } //set modesty image visiblility true/false as per layer - + // if(bodyRegionId.match('modestyImg3')) var layerInfo = new jinqJs() .from($scope.layerInfoForModesty) @@ -4758,6 +4758,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo } } + } } @@ -5311,6 +5312,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $scope.IncludedBodyRegions = []; $scope.transparencyDrawnRegions = []; + $scope.canThirdBRDrawn = false; // $scope.layerNo = parseInt(document.getElementById('')) var counter = 0; $.each(BodyRegionDictionary, function (index, value) { @@ -5330,7 +5332,70 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo if ($scope.isTBDrawnOnBodyRegion == false) { $scope.layerNumber = $scope.layerNumber + 1; } - $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); + + if (value.bodyRegionId == '3') { + + var BR6 = new jinqJs() + .from($scope.transparencyDrawnRegions) + .where('BRID == 6') + .select(); + + if (BR6 != null && BR6 != undefined && BR6.length > 0) { + + $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); + + 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); + } + + 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') { + $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); + $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); + $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); + // $scope.transparencyDrawnRegions.push({'BRID':'6'}); + } + else { + $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); + $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); + $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); + // $scope.transparencyDrawnRegions.push({ 'BRID': '6' }); + } + //$timeout(function () { + + // $scope.loadTransparencyImage(value.bodyRegionId, value.Height, value.Width, value.X, value.Y, value.IsMirror, $scope.TransparencyBoxStartX, TransparencyEndX, $scope.TransparencyBoxStartY, TransparencyBoxEndY, $scope, false, false); + + // }, 500); + + //2. draw 3rd + + } + else { + var BR6 = new jinqJs() + .from($scope.transparencyDrawnRegions) + .where('BRID == 6') + .select(); + if (value.bodyRegionId == "6" && BR6 != undefined && BR6 != null && BR6.length > 0) { } + 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); + } + } $scope.isTBDrawnOnBodyRegion = true; }