diff --git a/150-DOCUMENTATION/AIA-July-Report.pptx b/150-DOCUMENTATION/AIA-July-Report.pptx index 07ab44c..c05d403 100644 --- a/150-DOCUMENTATION/AIA-July-Report.pptx +++ b/150-DOCUMENTATION/AIA-July-Report.pptx diff --git a/150-DOCUMENTATION/AIA-June-Report.pptx b/150-DOCUMENTATION/AIA-June-Report.pptx index 07ab44c..412a2f5 100644 --- a/150-DOCUMENTATION/AIA-June-Report.pptx +++ b/150-DOCUMENTATION/AIA-June-Report.pptx diff --git a/400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj b/400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj index 8d52ed7..81044ec 100644 --- a/400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj +++ b/400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj @@ -39,9 +39,7 @@ - - @@ -77,146 +75,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -363,8 +221,8 @@ - - + + diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index 7c0ec22..d77bad1 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -686,7 +686,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo //1.Get image source var src = $scope.GetImageSource(value._BodyRegionId); - + $scope.imageSource = src; // debugger; @@ -993,45 +993,45 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo var SelectedLayerData = []; SelectedLayerData = $rootScope.BodyLayerData.Layers.DataLayer[dataLength - $scope.userInput - 1]; - if((SelectedLayerData!=null || SelectedLayerData!=undefined) && SelectedLayerData.BodyRegion.length>0){ - if ($scope.layerNumber == 0) { - for (var z = 0; z < SelectedLayerData.BodyRegion.length; z++) { + if ((SelectedLayerData != null || SelectedLayerData != undefined) && SelectedLayerData.BodyRegion.length > 0) { + if ($scope.layerNumber == 0) { + for (var z = 0; z < SelectedLayerData.BodyRegion.length; z++) { - var bodyRegion = SelectedLayerData.BodyRegion[z]._BodyRegionId; - var bodyRegionSkinTone = SelectedLayerData.BodyRegion[z].Image._SkintTone; + var bodyRegion = SelectedLayerData.BodyRegion[z]._BodyRegionId; + var bodyRegionSkinTone = SelectedLayerData.BodyRegion[z].Image._SkintTone; - if (bodyRegion == bodyRegionId && bodyRegionSkinTone == $scope.skinTone) { + if (bodyRegion == bodyRegionId && bodyRegionSkinTone == $scope.skinTone) { - return "content/images/DA/" + $scope.zoomInOut + "/body-views/" + $rootScope.voId + "/layers/" + $scope.layerNumber + "/" + bodyRegionId + "/" + $scope.skinTone + "/" + SelectedLayerData.BodyRegion[z].Image._ImageName; + return "content/images/DA/" + $scope.zoomInOut + "/body-views/" + $rootScope.voId + "/layers/" + $scope.layerNumber + "/" + bodyRegionId + "/" + $scope.skinTone + "/" + SelectedLayerData.BodyRegion[z].Image._ImageName; + } } } - } - else { - // debugger; - //below 4 bodyviews have only single body region - if ($rootScope.voId == 9 || $rootScope.voId == 11 || $rootScope.voId == 10 || $rootScope.voId == 12) { - var bodyRegion = SelectedLayerData.BodyRegion._BodyRegionId; + else { + // debugger; + //below 4 bodyviews have only single body region + if ($rootScope.voId == 9 || $rootScope.voId == 11 || $rootScope.voId == 10 || $rootScope.voId == 12) { + var bodyRegion = SelectedLayerData.BodyRegion._BodyRegionId; - return "content/images/DA/" + $scope.zoomInOut + "/body-views/" + $rootScope.voId + "/layers/" + $scope.layerNumber + "/" + bodyRegionId + "/" + SelectedLayerData.BodyRegion.Image._ImageName; + return "content/images/DA/" + $scope.zoomInOut + "/body-views/" + $rootScope.voId + "/layers/" + $scope.layerNumber + "/" + bodyRegionId + "/" + SelectedLayerData.BodyRegion.Image._ImageName; - } - else // it is for other body view which have multiple body regions and layer no > 0 - { - // debugger; - for (var z = 0; z <= SelectedLayerData.BodyRegion.length; z++) { - var bodyRegion = SelectedLayerData.BodyRegion[z]._BodyRegionId; - if (bodyRegion == bodyRegionId) { + } + else // it is for other body view which have multiple body regions and layer no > 0 + { + // debugger; + for (var z = 0; z <= SelectedLayerData.BodyRegion.length; z++) { + var bodyRegion = SelectedLayerData.BodyRegion[z]._BodyRegionId; + if (bodyRegion == bodyRegionId) { - return "content/images/DA/" + $scope.zoomInOut + "/body-views/" + $rootScope.voId + "/layers/" + $scope.layerNumber + "/" + bodyRegionId + "/" + SelectedLayerData.BodyRegion[z].Image._ImageName; + return "content/images/DA/" + $scope.zoomInOut + "/body-views/" + $rootScope.voId + "/layers/" + $scope.layerNumber + "/" + bodyRegionId + "/" + SelectedLayerData.BodyRegion[z].Image._ImageName; + } } } } } } - } $scope.GetBackgroundImgSource = function (bodyRegionId) { // debugger; @@ -4326,36 +4326,74 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $scope.flushCanvas = function () { - if ($scope.ColoredImageSRC != null || $scope.ColoredImageSRC != undefined) { - angular.forEach($scope.ColoredImageSRC, function (value, key) { + //if ($scope.ColoredImageSRC != null || $scope.ColoredImageSRC != undefined) { + // angular.forEach($scope.ColoredImageSRC, function (value, key) { + + // var id; + // var maskId; + // if (value.haveMirror == 'true') { + // id = 'imageCanvas' + value.bodyRegionId + '_MR'; + // maskId = 'imageCanvas' + value.bodyRegionId + '_MR_mci' + // } + // else { + // id = 'imageCanvas' + value.bodyRegionId; + // maskId = 'imageCanvas' + value.bodyRegionId + '_mci'; + // } + + // var canvas = document.getElementById(id); + // if (canvas != null || canvas != undefined) { + // document.getElementById('canvasDiv').removeChild(canvas); + // } + + // var maskcanvas = document.getElementById(maskId); + // if (maskcanvas != null || maskcanvas != undefined) { + // document.getElementById('canvasDiv').removeChild(maskcanvas); + + // } + + // var modestyCanvases = $("canvas[id*='imageCanvasmodestyImg']"); + // for (var i = 0; i < modestyCanvases.length; i++) { + // modestyCanvases[i].remove(); + // } + // }); + //} - var id; - var maskId; - if (value.haveMirror == 'true') { - id = 'imageCanvas' + value.bodyRegionId + '_MR'; - maskId = 'imageCanvas' + value.bodyRegionId + '_MR_mci' - } - else { - id = 'imageCanvas' + value.bodyRegionId; - maskId = 'imageCanvas' + value.bodyRegionId + '_mci'; - } + for (var i = 1; i < 7; i++) { + + var id; + var maskId; + + id = 'imageCanvas' + i; + maskId = 'imageCanvas' + i + '_mci'; + + var canvas = document.getElementById(id); + if (canvas != null || canvas!=undefined) + document.getElementById('canvasDiv').removeChild(canvas); + + var maskcanvas = document.getElementById(maskId); + if (maskcanvas != null || maskcanvas != undefined) + document.getElementById('canvasDiv').removeChild(maskcanvas); + + if (i == 4 || i == 5 || i == 6) { + id = 'imageCanvas' + i + '_MR'; + maskId = 'imageCanvas' + i + '_MR_mci'; var canvas = document.getElementById(id); - if (canvas != null || canvas != undefined) { - document.getElementById('canvasDiv').removeChild(canvas); - } + if (canvas != null || canvas != undefined) + document.getElementById('canvasDiv').removeChild(canvas); var maskcanvas = document.getElementById(maskId); - if (maskcanvas != null || maskcanvas != undefined) { - document.getElementById('canvasDiv').removeChild(maskcanvas); - - } + if (maskcanvas != null || maskcanvas != undefined) + document.getElementById('canvasDiv').removeChild(maskcanvas); + } - var modestyCanvases = $("canvas[id*='imageCanvasmodestyImg']"); - for (var i = 0; i < modestyCanvases.length; i++) { - modestyCanvases[i].remove(); + //remove modesty canavs + var modestyCanvases = $("canvas[id*='imageCanvasmodestyImg']"); + if (modestyCanvases != null || modestyCanvases != undefined && modestyCanvases.length > 0) { + for (var j = 0; j < modestyCanvases.length; j++) { + modestyCanvases[j].remove(); } - }); + } } } @@ -5564,37 +5602,38 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $('#layerChangeSlider').slider("option", "value", parseInt($scope.totalLayers) - parseInt($scope.layerNumber)); //8.remove current layer canavses - for (var i = 1; i < 7; i++) { + $scope.flushCanvas(); + //for (var i = 1; i < 7; i++) { - var id; - var maskId; + // var id; + // var maskId; - id = 'imageCanvas' + i; - maskId = 'imageCanvas' + i + '_mci'; + // id = 'imageCanvas' + i; + // maskId = 'imageCanvas' + i + '_mci'; - var canvas = document.getElementById(id); - document.getElementById('canvasDiv').removeChild(canvas); + // var canvas = document.getElementById(id); + // document.getElementById('canvasDiv').removeChild(canvas); - var maskcanvas = document.getElementById(maskId); - document.getElementById('canvasDiv').removeChild(maskcanvas); + // var maskcanvas = document.getElementById(maskId); + // document.getElementById('canvasDiv').removeChild(maskcanvas); - if (i == 4 || i == 5 || i == 6) { - id = 'imageCanvas' + i + '_MR'; - maskId = 'imageCanvas' + i + '_MR_mci'; + // if (i == 4 || i == 5 || i == 6) { + // id = 'imageCanvas' + i + '_MR'; + // maskId = 'imageCanvas' + i + '_MR_mci'; - var canvas = document.getElementById(id); - document.getElementById('canvasDiv').removeChild(canvas); + // var canvas = document.getElementById(id); + // document.getElementById('canvasDiv').removeChild(canvas); - var maskcanvas = document.getElementById(maskId); - document.getElementById('canvasDiv').removeChild(maskcanvas); - } + // var maskcanvas = document.getElementById(maskId); + // document.getElementById('canvasDiv').removeChild(maskcanvas); + // } - //remove modesty canavs - var modestyCanvases = $("canvas[id*='imageCanvasmodestyImg']"); - for (var j = 0; j < modestyCanvases.length; j++) { - modestyCanvases[j].remove(); - } - } + // //remove modesty canavs + // var modestyCanvases = $("canvas[id*='imageCanvasmodestyImg']"); + // for (var j = 0; j < modestyCanvases.length; j++) { + // modestyCanvases[j].remove(); + // } + //} //9. $timeout(function () { diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js index af32c1d..d3df609 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js @@ -49,7 +49,6 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", //called on jsanel minimize $rootScope.setState = function (state, title) { - debugger; var alreadyOpenThisView = new jinqJs() @@ -60,7 +59,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", if (alreadyOpenThisView != null) { for (var i = 0; i < $rootScope.openViews.length; i++) { k++; - if ($rootScope.openViews[i].body - views == title) { + if ($rootScope.openViews[i].body-views == title) { $rootScope.openViews.splice((k - 1), 1); $rootScope.openViews.push( @@ -98,8 +97,8 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", //annotation tool custom events $rootScope.ShowAnnotationWindow = function () { $rootScope.isAnnotationWindowOpen = true; - $(".annotationTollbar").css("display", "block"); - $rootScope.$broadcast('annotationToolEvent',true); + // $(".annotationTollbar").css("display", "block"); + // $rootScope.$broadcast('annotationToolEvent',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 fb9220d..d01699c 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html +++ b/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html @@ -123,22 +123,22 @@
Highlight Options
- +
@@ -167,7 +167,7 @@

- +

@@ -179,8 +179,8 @@
- - + +