ADAM / AIAHTML5

Commit 449197a56c1ad903359e91d0dce6057005a82900

Authored by Nikita Kulshreshtha
1 parent 955e53d4

annotaion toolbar shapes are maintained on mode change and now the annotations a… 

…re higlighted colored also multi annotation.
On layer change when annotation toolbar was on, also highligtted body part is maintained.
Inline Side-by-side
Showing 1 changed file with 29 additions and 11 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @449197a
... ... @@ -2034,7 +2034,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
2034 2034 $('#transparencyScale_' + windowviewid).css('visibility', 'visible');
2035 2035 }
2036 2036 else {
2037   - canDiv.innerHTML = '';
  2037 + // canDiv.innerHTML = '';COMMENTED TO MAINTAIN ANNOTATION TOOLBAR HISTORY ON HIGHLIGHT TO NORMAL MODE(Bug #22561)
  2038 + $scope.flushCanvas(windowviewid);
2038 2039 //remove transparency scale
2039 2040 $('#transparencyScale_' + windowviewid).css('visibility', 'hidden');
2040 2041 }
... ... @@ -3898,19 +3899,24 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
3898 3899 if ($scope.GetwindowStoreData(windowviewid,'multiAnnotationIsON') == true) {
3899 3900 //on layer change we need the fresh data not the updated one
3900 3901 if ($scope.isLayerChange == true) {
3901   - if (grayImageMRDataList[bodyRegionId] != null || grayImageMRDataList[bodyRegionId] != undefined) {
  3902 + if ($rootScope.isAnnotatiomToolBarPopupActive == true && (updatedGrayDataList[bodyRegionId - 1] != null || updatedGrayDataList[bodyRegionId - 1] != undefined)) {
  3903 +
  3904 + grayImageDataVar = updatedGrayDataList[bodyRegionId - 1];
  3905 + }
  3906 +
  3907 + else if (grayImageMRDataList[bodyRegionId] != null || grayImageMRDataList[bodyRegionId] != undefined) {
3902 3908 grayImageDataVar = grayImageMRDataList[bodyRegionId];
3903 3909 }
3904 3910 }
3905 3911 else {
3906 3912 if (updatedGrayDataList[bodyRegionId - 1] == null || updatedGrayDataList[bodyRegionId - 1] == undefined) {
3907 3913  
3908   - if (grayImageMRDataList[bodyRegionId] != null || grayImageMRDataList[bodyRegionId] != undefined) {
  3914 + if (grayImageMRDataList[bodyRegionId] != null || grayImageMRDataList[bodyRegionId] != undefined) {
3909 3915 grayImageDataVar = grayImageMRDataList[bodyRegionId];
3910 3916 }
3911 3917 }
3912 3918 else {
3913   - if (updatedGrayMRDataList[bodyRegionId] != null || updatedGrayMRDataList[bodyRegionId] != undefined) {
  3919 + if (updatedGrayMRDataList[bodyRegionId] != null || updatedGrayMRDataList[bodyRegionId] != undefined) {
3914 3920 grayImageDataVar = updatedGrayMRDataList[bodyRegionId]
3915 3921 }
3916 3922 }
... ... @@ -3930,23 +3936,28 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
3930 3936  
3931 3937 //on layer change we need the fresh data not the updated one
3932 3938 if ($scope.isLayerChange == true) {
3933   - if (grayImageDataList[bodyRegionId - 1] != null || grayImageDataList[bodyRegionId - 1] != undefined) {
3934   - grayImageDataVar = grayImageDataList[bodyRegionId - 1];
  3939 + if ($rootScope.isAnnotatiomToolBarPopupActive == true && (updatedGrayDataList[bodyRegionId - 1] != null || updatedGrayDataList[bodyRegionId - 1] != undefined)) {
  3940 +
  3941 + grayImageDataVar = updatedGrayDataList[bodyRegionId - 1];
  3942 + }
  3943 +
  3944 + else if (grayImageDataList[bodyRegionId - 1] != null || grayImageDataList[bodyRegionId - 1] != undefined) {
  3945 + grayImageDataVar = grayImageDataList[bodyRegionId - 1];
3935 3946  
3936 3947 }
3937 3948  
3938 3949 } else {
3939 3950 // this code is for the case where user first click on normal mode then extract then again highlight then we need to call highlight body in gray mode
3940 3951 //and then highlight the previously selected body regions at the time of normal mode.
3941   - if (updatedGrayDataList[bodyRegionId - 1] == null || updatedGrayDataList[bodyRegionId - 1] == undefined) {
3942   -
3943   - if (grayImageDataList[bodyRegionId - 1] != null || grayImageDataList[bodyRegionId - 1] != undefined) {
  3952 + if (updatedGrayDataList[bodyRegionId - 1] == null || updatedGrayDataList[bodyRegionId - 1] == undefined)
  3953 + {
  3954 + if (grayImageDataList[bodyRegionId - 1] != null || grayImageDataList[bodyRegionId - 1] != undefined) {
3944 3955 grayImageDataVar = grayImageDataList[bodyRegionId - 1];
3945 3956 }
3946 3957  
3947 3958 }
3948 3959 else {
3949   - if (updatedGrayDataList[bodyRegionId - 1] != null || updatedGrayDataList[bodyRegionId - 1] != undefined) {
  3960 + if (updatedGrayDataList[bodyRegionId - 1] != null || updatedGrayDataList[bodyRegionId - 1] != undefined) {
3950 3961 // for normal case means without interdepency button case.
3951 3962 grayImageDataVar = updatedGrayDataList[bodyRegionId - 1];
3952 3963 }
... ... @@ -6739,7 +6750,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
6739 6750 // History Maintained Issue//
6740 6751  
6741 6752 $rootScope.getAnnotationTextBasedOnSelectedBodyRegion = function (event) {
6742   -
  6753 + if (event.ctrlKey) {
  6754 + $scope.SetwindowStoreData(windowviewid, 'multiAnnotationIsON')
  6755 + }
6743 6756 var len= (event.currentTarget.id).split("_").length;
6744 6757 var windowviewid = (event.currentTarget.id).split("_")[len-1];
6745 6758  
... ... @@ -6819,6 +6832,11 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
6819 6832 if (TermAnnotationText.length>0) {
6820 6833 $scope.createDynamicSpeechBubble(event, event.pageX + horizontlScrollPosition - $('#canvasDivDA_' + windowviewid).offset().left, event.pageY + verticalScrollPosition - $('#canvasDivDA_' + windowviewid).offset().top, true, 0, 0,windowviewid)
6821 6834 }
  6835 + var previousHighlightList = $scope.GetwindowStoreData(windowviewid, 'previousHighlightList');
  6836 +
  6837 + previousHighlightList.push(RGBColor);
  6838 + // $scope.GetwindowStoreData(windowviewid, 'previousHighlightList', previousHighlightList);
  6839 +
6822 6840 $scope.highLightBodyBasedOnIcolor(RGBColor, windowviewid)
6823 6841 }
6824 6842  
... ...