From 8b31725c7b6e3814f1e7c95edca03076e09da10e Mon Sep 17 00:00:00 2001 From: amrita.vishnoi Date: Fri, 5 Aug 2016 14:54:58 +0530 Subject: [PATCH] Body View worker is introduced. --- 400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js | 141 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------ 400-SOURCECODE/AIAHTML5.Web/body-view-wp.js | 72 ++++++++++++++++++++++++++++++++++++++++++++---------------------------- 400-SOURCECODE/AIAHTML5.Web/search-wp.js | 4 +--- 3 files changed, 108 insertions(+), 109 deletions(-) diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index 38fc4f3..3e39bf6 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -56,6 +56,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $scope.previousSelectedTermList = []; $scope.runningWorkers = []; $scope.runningSearchWorkers = []; + $scope.runningBodyViewWorkers =[]; // This variable is used for unhighlight previously highlighted body portion, if multiAnnotation is false. $scope.machedIcolorInBodyRegion = []; @@ -318,6 +319,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo //0.1 var currentBodyViewId = localStorage.getItem("currentBodyViewId"); + + console.log('currentBodyViewId pickjed from localStorage: ' + currentBodyViewId); + var openViews; if ($rootScope.openViews != null || $rootScope.openViews != undefined) { if ($rootScope.openViews.length > 0) { @@ -390,41 +394,18 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $('#daBodyview').css("width", $(window).outerWidth()); - //1. load navigator man first - + //1. load navigator man first $scope.LoadBodyViewNavigatorImage(); - - //2. load bodyRegion data - $rootScope.isLoading = true; - $rootScope.voId = localStorage.getItem("currentBodyViewId"); - var bodyRegionjsonPath = '~/../content/data/json/da/da_dat_brview.json'; - var brViewdata = DataService.getJson(bodyRegionjsonPath) + //2. - var layerJsonPath = null; - - brViewdata.then( - function (result) { + console.log('currentBodyViewId just before sending: ' + currentBodyViewId); + $scope.loadBodyViewData(currentBodyViewId); - $rootScope.BodyRegionData = result; - $scope.isBodyRegionDataLoaded = true; - - //3. - $scope.loadLayerDataForCurrentBodyView(); - - }, - function (error) { - - //1. - console.log('DATA.NOT.LOADED FOR: ' + bodyRegionjsonPath + ' , ERROR:' + error.statusText); - - - //2. - $scope.openBodyView(); - } - ); - - // debugger + //2. load bodyRegion data + $rootScope.isLoading = true; + $rootScope.voId = localStorage.getItem("currentBodyViewId"); + $('#daBodyview').css("height", $(window).outerHeight()); $('#daBodyview').css("width", $(window).outerWidth()); @@ -493,42 +474,41 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo } - $scope.loadLayerDataForCurrentBodyView = function () { - //1. - var bgArtJsonPath = ''; - var CommonViewId = 0; - var currentBodyViewId = localStorage.getItem("currentBodyViewId"); + $scope.loadBodyViewData = function (currentVoid) + { + console.log('caller of worker sending currentVoid: ' + currentVoid); + var bodyViewWorker = new Worker('body-view-wp.js'); - //2. - var layerJsonPath = '~/../content/data/json/da/body-views/' + currentBodyViewId + '/da_dat_layer_' + currentBodyViewId + '.json'; - DataService.getAnotherJson(layerJsonPath) - .then( - function (result) { + //push workers in array to further used the refernece to delete the workers + $scope.runningBodyViewWorkers.push({ 'workerName': bodyViewWorker }) - $rootScope.BodyLayerData = result; - $scope.isBodylayerdataLoaded = true; + bodyViewWorker.postMessage({ - //3. - $scope.LoadDefaultLayerImage(); + 'currentViewId': currentVoid - //4. - $scope.isVisibleTermddl = false; - - }, - function (error) { + }); - //1. - console.log('DATA.NOT.LOADED FOR: ' + layerJsonPath +' , ERROR:' + error.statusText); + bodyViewWorker.onmessage = function (e) + { + console.log('callback in extr'); + + $rootScope.BodyRegionData = e.data.bodyRegionData; + $rootScope.bgartData = e.data.bodyArtData; + $rootScope.BodyLayerData = e.data.bodyLayerData; - //2. - $scope.loadLayerDataForCurrentBodyView(); + $scope.isBodylayerdataLoaded = true; + $scope.LoadDefaultLayerImage(); - } - ); + + } + bodyViewWorker.onerror = function (e) { + alert('Error: Line ' + e.lineno + ' in ' + e.filename + ': ' + e.message); + }; } + //Code for displaying NavigatorImage for BodyView $scope.LoadBodyViewNavigatorImage = function () @@ -634,24 +614,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo else if ($rootScope.voId == 12) { $scope.viewOrientationId = 6; } + + $scope.CalculateImageCordinates($scope.viewOrientationId); - // debugger; - var bgArtJsonPath = ''; - - bgArtJsonPath = '~/../content/data/json/da/da_dat_bgart.json'; - - var bgartdata = DataService.getJson(bgArtJsonPath) - bgartdata.then( - function (result) { - //debugger; - $rootScope.bgartData = result; - $scope.CalculateImageCordinates($scope.viewOrientationId); - - }, - function (error) { - // handle errors here - console.log(' $rootScope.bgartData = ' + error.statusText); - }); + }; @@ -1548,6 +1514,11 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $scope.createDynamicSpeechBubble(evt, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, true); } else { + + $scope.annotationTextArray = []; + + console.log('1. annotationText: ' + annotationText); + if ($('#dot').length > 0) { $('#dot').remove(); @@ -1559,16 +1530,23 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo // $scope.createDynamicSpeechBubble(evt, annotationText, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top); - $scope.annotationTextArray = []; + $scope.annotationTextArray.push(annotationText); + + console.log('2. annotationText: ' + annotationText + ' , length: ' + $scope.annotationTextArray.length); + $scope.createDynamicSpeechBubble(evt, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, true); } else { - // $scope.createDynamicSpeechBubble(evt, annotationText, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top); + + $scope.annotationTextArray = []; $scope.annotationTextArray.push(annotationText); + + console.log('3. annotationText: ' + annotationText + ' , length: ' + $scope.annotationTextArray.length); + $scope.createDynamicSpeechBubble(evt, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, true); } @@ -2406,9 +2384,16 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo + ''; $('#canvasDiv').append(sppechBubbleDotHTML); - for (var i = 0; i <= $scope.annotationTextArray.length - 1; i++) { - var MultipleLanguage = $scope.annotationTextArray[i]; - $("#sppeachBubble").append("

" + MultipleLanguage + "

"); + + if ($scope.annotationTextArray.length > 0) { + for (var i = 0; i <= $scope.annotationTextArray.length - 1; i++) { + var MultipleLanguage = $scope.annotationTextArray[i]; + $("#sppeachBubble").append("

" + MultipleLanguage + "

"); + } + } + else + { + console.log('annotationTextArray.length is :' + $scope.annotationTextArray.length) } if ($scope.longest.length <= 10) { diff --git a/400-SOURCECODE/AIAHTML5.Web/body-view-wp.js b/400-SOURCECODE/AIAHTML5.Web/body-view-wp.js index db88373..25dbcb6 100644 --- a/400-SOURCECODE/AIAHTML5.Web/body-view-wp.js +++ b/400-SOURCECODE/AIAHTML5.Web/body-view-wp.js @@ -1,24 +1,29 @@ - +var bodyRegionData; +var bodyLayerData; +var bodyArtData; + loadBodyViewData = function (currentBodyViewId) { //1. var bodyRegionjsonPath = '~/../content/data/json/da/da_dat_brview.json'; - var bodyRegionData; + + + var req = new XMLHttpRequest(); + req.open("GET", bodyRegionjsonPath, true); + req.setRequestHeader("Content-type", "application/json"); - var AJAX_req = new XMLHttpRequest(); - AJAX_req.open("GET", bodyRegionjsonPath, true); - AJAX_req.setRequestHeader("Content-type", "application/json"); + req.onreadystatechange = function () { + if (req.readyState == 4 && req.status == 200) + { + bodyRegionData = JSON.parse(req.responseText); - AJAX_req.onreadystatechange = function () { - if (AJAX_req.readyState == 4 && AJAX_req.status == 200) { - bodyRegionData = JSON.parse(AJAX_req.responseText); - console.log("data returned: " + bodyRegionData); + console.log("bodyRegionData returned: " + bodyRegionData); loadLayerDataForCurrentBodyView(currentBodyViewId) } } - AJAX_req.send(); + req.send(); } @@ -27,47 +32,58 @@ loadLayerDataForCurrentBodyView = function (currentBodyViewId) { //1. var bgArtJsonPath = ''; var CommonViewId = 0; - var bodyLayerData; + //2. var layerJsonPath = '~/../content/data/json/da/body-views/' + currentBodyViewId + '/da_dat_layer_' + currentBodyViewId + '.json'; - var AJAX_req = new XMLHttpRequest(); - AJAX_req.open("GET", layerJsonPath, true); - AJAX_req.setRequestHeader("Content-type", "application/json"); + var req = new XMLHttpRequest(); + req.open("GET", layerJsonPath, true); + req.setRequestHeader("Content-type", "application/json"); - AJAX_req.onreadystatechange = function () { - if (AJAX_req.readyState == 4 && AJAX_req.status == 200) { - bodyLayerData = JSON.parse(AJAX_req.responseText); + req.onreadystatechange = function () { + if (req.readyState == 4 && req.status == 200) { + bodyLayerData = JSON.parse(req.responseText); console.log("data returned: " + bodyLayerData); loadBodyArtData(); } } - AJAX_req.send(); - + req.send(); } loadBodyArtData = function () { var bgArtJsonPath = ''; - var bodyArtData; - bgArtJsonPath = '~/../content/data/json/da/da_dat_bgart.json'; - var AJAX_req = new XMLHttpRequest(); - AJAX_req.open("GET", bgArtJsonPath, true); - AJAX_req.setRequestHeader("Content-type", "application/json"); + bgArtJsonPath = '~/../content/data/json/da/da_dat_bgart.json'; - AJAX_req.onreadystatechange = function () { - if (AJAX_req.readyState == 4 && AJAX_req.status == 200) { - bodyArtData = JSON.parse(AJAX_req.responseText); + var req = new XMLHttpRequest(); + req.open("GET", bgArtJsonPath, true); + req.setRequestHeader("Content-type", "application/json"); + req.onreadystatechange = function () { + if (req.readyState == 4 && req.status == 200) { + bodyArtData = JSON.parse(req.responseText); console.log("data returned: " + bodyArtData); + + self.postMessage({ + 'bodyRegionData': bodyRegionData, + 'bodyLayerData': bodyLayerData, + 'bodyArtData': bodyArtData + + }); + } } - AJAX_req.send(); + req.send(); }; +self.onmessage = function (e) { + + loadBodyViewData(e.data.currentViewId); + +} \ No newline at end of file diff --git a/400-SOURCECODE/AIAHTML5.Web/search-wp.js b/400-SOURCECODE/AIAHTML5.Web/search-wp.js index 55fbe56..aa85feb 100644 --- a/400-SOURCECODE/AIAHTML5.Web/search-wp.js +++ b/400-SOURCECODE/AIAHTML5.Web/search-wp.js @@ -72,9 +72,7 @@ loadTermTextData = function (TermNumberData) { } AJAX_req.send(); - - //}) - + } -- libgit2 0.21.4