ADAM / AIAHTML5

Commit 9665ab9c18c28f76de9a68517a66fe30cc8a3505

Authored by Nikita Kulshreshtha
1 parent 21836e5d

Refs# 4225 

set z-index to fixed the joining issue in male, female anterior,posterior.
Inline Side-by-side
Showing 1 changed file with 11 additions and 11 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @9665ab9
... ... @@ -402,7 +402,6 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
402 402 // debugger;
403 403 var bgArtJsonPath = '';
404 404  
405   - // if ($scope.voId == 9 || $scope.voId == 11) {
406 405 bgArtJsonPath = '~/../content/data/json/da/da_dat_bgart.json';
407 406  
408 407 var bgartdata = DataService.getJson(bgArtJsonPath)
... ... @@ -417,10 +416,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
417 416 // handle errors here
418 417 console.log(' $scope.bgartData = ' + error.statusText);
419 418 });
420   - //}
421   - //else
422   - //$scope.CalculateImageCordinates($scope.viewOrientationId);
423   - };
  419 + };
424 420  
425 421  
426 422 //calculate coordinates for body region images
... ... @@ -510,10 +506,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
510 506 else {
511 507 //Draw body region which don't have mirror image
512 508  
513   - //debugger;
514   -
515   -
516   -
  509 +
517 510 //0.Scaling as per default zoom
518 511 var rectangle = scaleRectangle(value._X, value._Y, value._Height, value._Width, value._MirrorValue);
519 512  
... ... @@ -944,6 +937,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
944 937 imgCanvas.style.position = "absolute";
945 938 imgCanvas.style.left = x + "px";
946 939 imgCanvas.style.top = y + "px";
  940 +
947 941 if (isMaskImage == 'Y') {
948 942 imgCanvas.style.visibility = 'hidden'
949 943 imgCanvas.id = 'imageCanvas' + bodyRegionId + '_mci';
... ... @@ -955,10 +949,16 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
955 949 imgCanvas.id = 'imageCanvas' + bodyRegionId;
956 950 imgCanvas.style.visibility = 'visible'
957 951  
  952 + if (bodyRegionId == 3) {
  953 + //set z index of hip canavs to fix the issue caused by overlapping of arm canavs on hip canavs.
  954 + imgCanvas.style.zIndex = "1000";
  955 + }
958 956 if (bodyRegionId.match('modestyImg')) {
959 957 //added class to further access this canavs to show and hide leaf as per modesty seting
960 958 imgCanvas.className = 'modestyImg'
961 959 imgCanvas.style.visibility = 'hidden'
  960 + //set z index to make leaf canvas on top of hip canavs
  961 + imgCanvas.style.zIndex = "2000";
962 962 }
963 963 }
964 964 imgCanvas.addEventListener('click', function (evt) {
... ... @@ -1243,9 +1243,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1243 1243  
1244 1244  
1245 1245 $scope.createSpeechBubble = function (event, text, x, y) {
1246   -
  1246 + //set z index to make annoation speech buble on top others
1247 1247 $('#canvasDiv').css('cursor', 'pointer');
1248   - $('<div id="speechBubble" class="BubbleDiv" style="display:visible; top:' + y + 'px; left:' + x + 'px;"> <div class="">'
  1248 + $('<div id="speechBubble" class="BubbleDiv" style="display:visible; top:' + y + 'px; left:' + x + 'px; z-index:3000"> <div class="">'
1249 1249 + '<div class="Bubble">'
1250 1250 + '<div class="BubbleCloseBtn"></div><div class="BubbleContent">' + text + '</div><div class="bottomLeftArrow"></div>'
1251 1251 //+'<div class="bottomRightArrow"></div><div class="topLeftArrow"></div><div class="topRightArrow"></div>
... ...