ADAM / AIAHTML5

Commit 4006fee47f384bff44d4e1a74df53db91f71bfb9

Authored by unknown
2 parents 7299676f c81a594f

Merge branch 'Develop' of http://52.6.196.163/ADAM/AIAHTML5 into Bugs_v5

Inline Side-by-side
Showing 2 changed files with 123 additions and 90 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @4006fee
... ... @@ -440,23 +440,25 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
440 440 }
441 441  
442 442 // 0.2 getting corresponding body view title
443   - var counter = 1;
  443 + //var counter = 1;
444 444 var tittle = localStorage.getItem("currentViewTitleFromJson");
  445 + localStorage.setItem("currentViewTitle", tittle);
445 446  
446   - if (openViews != null && openViews != undefined) {
447   - angular.forEach(openViews, function (value, key) {
  447 + //WILL BE USED WHEN MULTI VIEWOPEN FUNCTIONALITY IS IMPELMNETD
  448 + //if (openViews != null && openViews != undefined) {
  449 + // angular.forEach(openViews, function (value, key) {
448 450  
449   - if (value.bodyView == tittle) {
450   - tittle = localStorage.getItem("currentViewTitleFromJson") + counter++;
451   - $rootScope.currentActiveViewTitle = tittle;
452   - localStorage.setItem("currentViewTitle", tittle);
453   - }
  451 + // if (value.bodyView == tittle) {
  452 + // tittle = localStorage.getItem("currentViewTitleFromJson") + counter++;
  453 + // $rootScope.currentActiveViewTitle = tittle;
  454 + // localStorage.setItem("currentViewTitle", tittle);
  455 + // }
454 456  
455   - });
456   - }
457   - else {
458   - localStorage.setItem("currentViewTitle", tittle);
459   - }
  457 + // });
  458 + //}
  459 + //else {
  460 + // localStorage.setItem("currentViewTitle", tittle);
  461 + //}
460 462  
461 463 //0.3
462 464  
... ... @@ -470,6 +472,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
470 472 url: 'app/views/da/da-view.html'
471 473 },
472 474 title: localStorage.getItem("currentViewTitle"),
  475 +
473 476 position: {
474 477 top: 70,
475 478 left: 1,
... ... @@ -737,6 +740,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
737 740 //calculate coordinates for body region images
738 741 $scope.CalculateImageCordinates = function (viewOrientationId) {
739 742  
  743 + $rootScope.isLoading = true;
  744 + $('#spinner').css('visibility', 'visible');
  745 +
740 746 // annotation toolbar canvas
741 747 if ($("#canvasDiv").find("canvas[id='canvasPaint']").length == 0) {
742 748  
... ... @@ -746,6 +752,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
746 752  
747 753 }
748 754  
  755 +
  756 +
749 757 $scope.terminateCurrentlyRunningWPs();
750 758  
751 759 var drawnBodyRegionCount = [];
... ... @@ -950,8 +958,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
950 958  
951 959 });
952 960  
953   - $rootScope.isLoading = false;
954   - $('#spinner').css('visibility', 'hidden');
  961 + //$rootScope.isLoading = false;
  962 + //$('#spinner').css('visibility', 'hidden');
955 963 }
956 964  
957 965 if (($rootScope.globalSetting.modesty == 'Y')) {
... ... @@ -1207,6 +1215,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1207 1215  
1208 1216 $scope.DrawMirroredImage = function (h, w, x, y, src, bodyRegionId, isMaskImage) {
1209 1217  
  1218 + $rootScope.isLoading = true;
  1219 + $('#spinner').css('visibility', 'visible');
  1220 +
1210 1221 var FlipedImgCanvas = document.createElement('canvas');
1211 1222 FlipedImgCanvas.height = h;
1212 1223 FlipedImgCanvas.width = w;
... ... @@ -1518,7 +1529,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1518 1529 $('#spinner').css('visibility', 'visible');
1519 1530 $scope.highLightBody();
1520 1531 }
1521   - else if ($rootScope.isHighLight == true || ($rootScope.isListManagerSelected == true) || (($rootScope.isGenderChnage == true) && ($rootScope.isHighLight == true)) || (($rootScope.isViewChange == true) && ($rootScope.isHighLight == true)) || $rootScope.isHighlightBodyByBodySystem == true) {
  1532 + else if ($rootScope.isHighLight == true || ($rootScope.isListManagerSelected == true) || (($rootScope.isGenderChnage == true) && ($rootScope.isHighLight == true))
  1533 + || (($rootScope.isViewChange == true) && ($rootScope.isHighLight == true)) || $rootScope.isHighlightBodyByBodySystem == true) {
1522 1534  
1523 1535 console.log('1. $rootScope.isHighLight= ' + $rootScope.isHighLight)
1524 1536  
... ... @@ -1533,6 +1545,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1533 1545 //}, 500);
1534 1546 }
1535 1547 }
  1548 + else {
  1549 + $rootScope.isLoading = false;
  1550 + $('#spinner').css('visibility', 'hidden');
  1551 + }
1536 1552 }
1537 1553  
1538 1554 // console.log('ColoredImageSRC. pushed and length: ' + $scope.ColoredImageSRC.length);
... ... @@ -1565,6 +1581,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1565 1581  
1566 1582 $scope.DrawImage = function (h, w, x, y, src, bodyRegionId, isMaskImage) {
1567 1583  
  1584 + $rootScope.isLoading = true;
  1585 + $('#spinner').css('visibility', 'visible');
  1586 +
1568 1587 var imgCanvas = document.createElement('canvas');
1569 1588  
1570 1589 imgCanvas.height = h;
... ... @@ -1877,7 +1896,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1877 1896 $('#spinner').css('visibility', 'visible');
1878 1897 $scope.highLightBody();
1879 1898 }
1880   - else if ($rootScope.isHighLight == true || ($rootScope.isListManagerSelected == true) || (($rootScope.isGenderChnage == true) && ($rootScope.isHighLight == true)) || (($rootScope.isViewChange == true) && ($rootScope.isHighLight == true)) || $scope.isExtract == true || $rootScope.isHighlightBodyByBodySystem == true) {
  1899 + else if ($rootScope.isHighLight == true || ($rootScope.isListManagerSelected == true) || (($rootScope.isGenderChnage == true) && ($rootScope.isHighLight == true))
  1900 + || (($rootScope.isViewChange == true) && ($rootScope.isHighLight == true)) || $scope.isExtract == true || $rootScope.isHighlightBodyByBodySystem == true) {
1881 1901  
1882 1902 console.log('2. $rootScope.isHighLight= ' + $rootScope.isHighLight)
1883 1903  
... ... @@ -1895,6 +1915,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1895 1915  
1896 1916 }
1897 1917 }
  1918 + else {
  1919 + $rootScope.isLoading = false;
  1920 + $('#spinner').css('visibility', 'hidden');
  1921 + }
1898 1922 }
1899 1923  
1900 1924 console.log('ColoredImageSRC. pushed and length: ' + $scope.ColoredImageSRC.length);
... ... @@ -1969,6 +1993,26 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1969 1993 var CallBackBodyRegion = [];
1970 1994 var selectedAnnotation;
1971 1995  
  1996 + if (($rootScope.previousHighlightList != null || $rootScope.previousHighlightList != undefined) && ($rootScope.previousHighlightList.length > 0) && $rootScope.isListManagerSelected) {
  1997 +
  1998 + multiTermList = $scope.AllTerms;
  1999 + angular.forEach($rootScope.previousHighlightList, function (value, key) {
  2000 +
  2001 + var ActualTermNo = $scope.getActualTermNumber(value);
  2002 + selectedAnnotation = ActualTermNo;
  2003 + if (ActualTermNo != null) {
  2004 + var TermList = $scope.getTermNumberList(ActualTermNo);
  2005 + if (TermList != null) {
  2006 + for (var i = 0; i < TermList.length; i++) {
  2007 + multiTermList.push(TermList[i]);
  2008 + }
  2009 + }
  2010 + }
  2011 +
  2012 + // to do
  2013 + });
  2014 + }
  2015 +
1972 2016 if ($rootScope.isListManagerSelected) {
1973 2017  
1974 2018 multiTermList = $scope.AllTerms;
... ... @@ -2165,7 +2209,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2165 2209 $scope.aligneCanvasWithTerm()
2166 2210 }
2167 2211  
2168   - $timeout(function () { $scope.DisableProgressBar() }, 1000);
  2212 + // $timeout(function () { $scope.DisableProgressBar() }, 1000);
2169 2213  
2170 2214  
2171 2215  
... ... @@ -2399,16 +2443,19 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2399 2443  
2400 2444 if ($scope.doAligneCanvasWithTerm == true) {
2401 2445  
2402   - if ($rootScope.isHighlightBodyByBodySystem == true || $rootScope.isListManagerSelected == true)
  2446 + if ($rootScope.isListManagerSelected == true)
  2447 + $scope.aligneCanvasWithTerm();
  2448 +
  2449 + else if ($rootScope.isHighlightBodyByBodySystem == true || $rootScope.isListManagerSelected == true) {
2403 2450  
2404 2451 $rootScope.isLoading = false;
2405 2452  
2406   - $('#spinner').css('visibility', 'hidden');
  2453 + $('#spinner').css('visibility', 'hidden');
  2454 + }
2407 2455  
2408 2456 // $rootScope.isHighlightBodyByBodySystem = false;
2409 2457  
2410   - if ($rootScope.isListManagerSelected == true)
2411   - $scope.aligneCanvasWithTerm();
  2458 +
2412 2459 }
2413 2460 }
2414 2461 //
... ... @@ -5018,56 +5065,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5018 5065  
5019 5066 $scope.flushCanvas = function () {
5020 5067  
5021   - //if ($scope.ColoredImageSRC != null || $scope.ColoredImageSRC != undefined) {
5022   - // angular.forEach($scope.ColoredImageSRC, function (value, key) {
5023   -
5024   - // var id;
5025   - // var maskId;
5026   - // if (value.haveMirror == 'true') {
5027   - // id = 'imageCanvas' + value.bodyRegionId + '_MR';
5028   - // maskId = 'imageCanvas' + value.bodyRegionId + '_MR_mci'
5029   - // }
5030   - // else {
5031   - // id = 'imageCanvas' + value.bodyRegionId;
5032   - // maskId = 'imageCanvas' + value.bodyRegionId + '_mci';
5033   - // }
5034   -
5035   - // var canvas = document.getElementById(id);
5036   - // if (canvas != null || canvas != undefined) {
5037   - // document.getElementById('canvasDiv').removeChild(canvas);
5038   - // }
5039   -
5040   - // var maskcanvas = document.getElementById(maskId);
5041   - // if (maskcanvas != null || maskcanvas != undefined) {
5042   - // document.getElementById('canvasDiv').removeChild(maskcanvas);
5043 5068  
5044   - // }
5045   - // if (i == 4 || i == 5 || i == 6) {
5046   - // id = 'imageCanvas' + i + '_MR';
5047   - // maskId = 'imageCanvas' + i + '_MR_mci';
5048   -
5049   - // var canvas = document.getElementById(id);
5050   - // if (canvas != null || canvas != undefined)
5051   - // document.getElementById('canvasDiv').removeChild(canvas);
5052   -
5053   - // var maskcanvas = document.getElementById(maskId);
5054   - // if (maskcanvas != null || maskcanvas != undefined)
5055   - // document.getElementById('canvasDiv').removeChild(maskcanvas);
5056   - // }
  5069 + $rootScope.isLoading = true;
  5070 + $('#spinner').css('visibility', 'visible');
5057 5071  
5058   - // var modestyCanvases = $("canvas[id*='imageCanvasmodestyImg']");
5059   - // for (var i = 0; i < modestyCanvases.length; i++) {
5060   - // modestyCanvases[i].remove();
5061   - // }
5062   - // });
5063   - // //remove modesty canavs
5064   - // var modestyCanvases = $("canvas[id*='imageCanvasmodestyImg']");
5065   - // if (modestyCanvases != null || modestyCanvases != undefined && modestyCanvases.length > 0) {
5066   - // for (var j = 0; j < modestyCanvases.length; j++) {
5067   - // modestyCanvases[j].remove();
5068   - // }
5069   - // }
5070   - //}
5071 5072 var endIndex = 0;
5072 5073 var startIndex = 0;
5073 5074 if (($rootScope.viewOrientationId == '1') || ($rootScope.viewOrientationId == '4')) {
... ... @@ -5123,7 +5124,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5123 5124 var modestyCanvases = $("canvas[id*='imageCanvasmodestyImg']");
5124 5125 if (modestyCanvases != null || modestyCanvases != undefined && modestyCanvases.length > 0) {
5125 5126 for (var j = 0; j < modestyCanvases.length; j++) {
5126   - modestyCanvases[j].remove();
  5127 +
  5128 + modestyCanvases[j].parentNode.removeChild(modestyCanvases[j]);
5127 5129 }
5128 5130 }
5129 5131 }
... ... @@ -5259,7 +5261,11 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5259 5261 $rootScope.isZoomed = false;
5260 5262  
5261 5263 //6.
5262   - $rootScope.isListManagerSelected = false;
  5264 + // $rootScope.isListManagerSelected = false;
  5265 + if ($rootScope.actualTermNumber != null && $rootScope.actualTermNumber!=undefined && $rootScope.isListManagerSelected == true) {
  5266 + $rootScope.isListManagerSelected = false;
  5267 + $rootScope.isListManagerAlreadySelected = true;
  5268 + }
5263 5269  
5264 5270 //7.
5265 5271  
... ... @@ -5621,9 +5627,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5621 5627 if ($scope.isEligibleForHighlightBodyByTermList == true) {
5622 5628 //DISABLE PROGERSS BAR FOR GENDER OR VIEW CHANGE
5623 5629 // if ($rootScope.isGenderChnage == true || $rootScope.isViewChange == true) {
5624   - $scope.isLoading = false;
  5630 + //$scope.isLoading = false;
5625 5631  
5626   - $('#spinner').css('visibility', 'hidden');
  5632 + //$('#spinner').css('visibility', 'hidden');
5627 5633 //}
5628 5634  
5629 5635 if (($rootScope.isHighlightBodyByBodySystem == true) && ($scope.systemMatchedTermList != null || $scope.systemMatchedTermList != undefined)) {
... ... @@ -5634,7 +5640,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5634 5640 $('#spinner').css('visibility', 'visible');
5635 5641 $timeout(function () { $scope.HighlightBodyByTermList($scope.systemMatchedTermList) }, 100);
5636 5642 }
5637   - else if (($rootScope.isListManagerSelected == true) || ($rootScope.previousHighlightList != null && $rootScope.previousHighlightList.length > 0) && ($rootScope.isGenderChnage==true || $rootScope.isViewChange==true)) {
  5643 + else if (($rootScope.isListManagerSelected == true) || ($rootScope.previousHighlightList != null && $rootScope.previousHighlightList.length > 0) && ($rootScope.isGenderChnage==true || $rootScope.isViewChange==true) || $rootScope.isListManagerAlreadySelected==true) {
5638 5644  
5639 5645 // console.log('$scope.grayedBR.length is ' + $scope.grayedBR.length);
5640 5646 $timeout(function () {
... ... @@ -5914,11 +5920,18 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5914 5920  
5915 5921 $rootScope.isGenderChnage = true;
5916 5922  
  5923 +
  5924 + if ($rootScope.isExtract == true) {
  5925 + $rootScope.isExtract = false;
  5926 + $rootScope.isHighLight = true;
  5927 + }
  5928 +
  5929 +
5917 5930 var viewname = localStorage.getItem("currentViewTitle")
5918 5931 var currentBodyViewId = $scope.correspondingBodyViewIds[$rootScope.voId];
5919 5932  
5920 5933  
5921   - if ((event.currentTarget.attributes[1].value == 'Male') && (localStorage.getItem("genderId") == 'Female')) {
  5934 + if ((event.currentTarget.title == 'Male') && (localStorage.getItem("genderId") == 'Female')) {
5922 5935  
5923 5936 //1.
5924 5937 localStorage.setItem("genderId", 'Male');
... ... @@ -5950,7 +5963,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5950 5963  
5951 5964 }
5952 5965  
5953   - else if ((event.currentTarget.attributes[1].value == 'Female') && (localStorage.getItem("genderId") == 'Male')) {
  5966 + else if ((event.currentTarget.title == 'Female') && (localStorage.getItem("genderId") == 'Male')) {
5954 5967  
5955 5968 //1.
5956 5969 localStorage.setItem("genderId", 'Female');
... ... @@ -6126,9 +6139,17 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
6126 6139 }
6127 6140  
6128 6141 $rootScope.isViewChange = true;
  6142 +
  6143 + if ($rootScope.isExtract == true) {
  6144 + $rootScope.isExtract = false;
  6145 + $rootScope.isHighLight = true;
  6146 + }
  6147 +
6129 6148 $scope.layerNumber = 0;
6130 6149 // debugger;
6131   - var selectedViewId = $scope.bodyViews[event.currentTarget.attributes[1].value];
  6150 + //var selectedViewId = $scope.bodyViews[event.currentTarget.attributes[1].value];
  6151 + var selectedViewId = $scope.bodyViews[event.currentTarget.title];
  6152 +
6132 6153 $rootScope.viewOrientationId = selectedViewId;
6133 6154 if (localStorage.getItem("genderId") == 'Male') {
6134 6155 if ($rootScope.voId != selectedViewId) {
... ... @@ -6193,8 +6214,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
6193 6214 // $('#daImagePanel')[0].childNodes[0].childNodes[0].innerHTML = localStorage.getItem("genderId") + " " + $scope.bodyViews[event.currentTarget.attributes[1].value;
6194 6215  
6195 6216 }
6196   - $('#daImagePanel')[0].childNodes[0].childNodes[0].innerHTML = localStorage.getItem("genderId") + " " + event.currentTarget.attributes[1].value;
6197   - localStorage.setItem("currentViewTitle", localStorage.getItem("genderId") + " " + event.currentTarget.attributes[1].value);
  6217 + $('#daImagePanel')[0].childNodes[0].childNodes[0].innerHTML = localStorage.getItem("genderId") + " " + event.currentTarget.title;
  6218 + localStorage.setItem("currentViewTitle", localStorage.getItem("genderId") + " " + event.currentTarget.title);
6198 6219  
6199 6220  
6200 6221 $rootScope.openViews.push(
... ... @@ -6962,7 +6983,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
6962 6983  
6963 6984  
6964 6985 for (var j = 0; j < $scope.VocabTermTxt.length; j++) {
6965   - var $el = $('<option ng-click=HighlightBodyOnListManagerSelection($event) id=' + $scope.VocabTermTxt[j]._ActualTermNumber + '>' + $scope.VocabTermTxt[j]._TermText + '</option>').appendTo('#termList')
  6986 + var $el = $('<option title ="'+ $scope.VocabTermTxt[j]._TermText+ '" ng-click=HighlightBodyOnListManagerSelection($event) id=' + $scope.VocabTermTxt[j]._ActualTermNumber + '>' + $scope.VocabTermTxt[j]._TermText + '</option>').appendTo('#termList')
6966 6987 $compile($el)($scope);
6967 6988  
6968 6989 }
... ... @@ -6988,6 +7009,12 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
6988 7009 $('#spinner').css('visibility', 'hidden');
6989 7010 }
6990 7011 else {
  7012 +
  7013 + $rootScope.isLoading = true;
  7014 +
  7015 + $('#spinner').css('visibility', 'visible');
  7016 +
  7017 +
6991 7018 $rootScope.prevId = event.currentTarget.id;
6992 7019 $("#termList").find("option").attr('selected', false);
6993 7020 $("#termList").find("option").css({ "background-color": "#ffffff", "color": "#000000" });
... ... @@ -7010,10 +7037,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
7010 7037 }
7011 7038 }
7012 7039 //---
7013   - $rootScope.isLoading = true;
7014   -
7015   - $('#spinner').css('visibility', 'visible');
7016   -
  7040 +
7017 7041 $rootScope.isHighlightBodyByBodySystem = false;
7018 7042  
7019 7043 //1.
... ... @@ -7119,8 +7143,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
7119 7143  
7120 7144 //8.remove current layer canavses
7121 7145 $scope.flushCanvas();
7122   -
7123   -
  7146 +
7124 7147  
7125 7148 //9.
7126 7149 $timeout(function () {
... ... @@ -7135,6 +7158,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
7135 7158 //DA > Annotation's Line should not displayed.
7136 7159 $("#bord").css("display", "none");
7137 7160  
  7161 + $rootScope.isLoading = true;
  7162 + $('#spinner').css('visibility', 'visible');
  7163 +
7138 7164 //redraw body of respective layer
7139 7165 $scope.CalculateImageCordinates($rootScope.viewOrientationId)
7140 7166 }, 500);
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @4006fee
... ... @@ -964,6 +964,8 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;,
964 964  
965 965 $rootScope.TextAreaRectID = layer.name;
966 966 $rootScope.rectDimension.push({ width: layer.width, height: layer.height, x: layer.x, y: layer.y });
  967 + $rootScope.CurrentWidth = layer.width;
  968 + $rootScope.CurrentHeight = layer.height;
967 969  
968 970 },
969 971 click: function (layer) {
... ... @@ -1045,9 +1047,14 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;,
1045 1047  
1046 1048 }
1047 1049 });
1048   -
  1050 + // Annotation: Edit Text option is missing.
  1051 + // alert($rootScope.CurrentWidth);
  1052 + // alert($rootScope.CurrentHeight);
1049 1053 $("#annotationTextModal").css("padding-right", "0px");
1050   - $("#annotationTextModal").modal("toggle");
  1054 + if (($rootScope.CurrentWidth > 0 && $rootScope.CurrentHeight > 0) || ($rootScope.CurrentWidth > 0 && $rootScope.CurrentHeight <= 0) || ($rootScope.CurrentWidth <= 0 && $rootScope.CurrentHeight > 0)) {
  1055 + $("#annotationTextModal").modal("toggle");
  1056 + document.getElementById('modelbackground').style.display = "block";
  1057 + }
1051 1058 $('.btnCursor').trigger('click');
1052 1059 $("#font-color .minicolors .minicolors-swatch .minicolors-swatch-color").css({ "background-color": "#000000" });
1053 1060  
... ... @@ -1182,7 +1189,7 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;,
1182 1189  
1183 1190 break;
1184 1191 case "TextArea":
1185   - document.getElementById('modelbackground').style.display = "block";
  1192 +
1186 1193 $rootScope.IsTextAlreadySave = false;
1187 1194 $("#text_area").val('');
1188 1195 // Draw text
... ...