Commit 222f5c84ede3aa5784c68f56609204be1419627c
1 parent
61ad7ab1
resize, modesty issues resolved.
issue in annoataions; on modesty region annotations are always skin,skin
Showing
1 changed file
with
28 additions
and
20 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
| @@ -4511,38 +4511,46 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -4511,38 +4511,46 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
| 4511 | 4511 | ||
| 4512 | //set modesty image visiblility true/false as per layer | 4512 | //set modesty image visiblility true/false as per layer |
| 4513 | // if(bodyRegionId.match('modestyImg3')) | 4513 | // if(bodyRegionId.match('modestyImg3')) |
| 4514 | + var BRID=''; | ||
| 4515 | + if (bodyRegionId.match('modestyImg') && document.getElementById('modestyTransCanavs_' + bodyRegionId)!=null) { | ||
| 4516 | + BRID = bodyRegionId[bodyRegionId.length - 1]; | ||
| 4517 | + } | ||
| 4518 | + else if ((bodyRegionId == '2' || bodyRegionId == '3') && document.getElementById('modestyTransCanavs_modestyImg' + bodyRegionId) != null) { | ||
| 4519 | + BRID = bodyRegionId; | ||
| 4520 | + } | ||
| 4521 | + if (BRID != '') { | ||
| 4522 | + var layerInfo = new jinqJs() | ||
| 4523 | + .from($scope.layerInfoForModesty) | ||
| 4524 | + .where('bodyRegionId == ' + BRID) | ||
| 4525 | + .select(); | ||
| 4526 | + if (layerInfo != undefined && layerInfo.length > 0) { | ||
| 4527 | + var lowerlayerNumberForModesty = layerInfo[0].lowerlayerNumberForModesty; | ||
| 4528 | + var HigherlayerNumberForModesty = layerInfo[0].HigherlayerNumberForModesty; | ||
| 4514 | 4529 | ||
| 4515 | - var layerInfo = new jinqJs() | ||
| 4516 | - .from($scope.layerInfoForModesty) | ||
| 4517 | - .where('bodyRegionId == ' + bodyRegionId) | ||
| 4518 | - .select(); | ||
| 4519 | - if (layerInfo != undefined && layerInfo.length > 0) { | ||
| 4520 | - var lowerlayerNumberForModesty = layerInfo[0].lowerlayerNumberForModesty; | ||
| 4521 | - var HigherlayerNumberForModesty = layerInfo[0].HigherlayerNumberForModesty; | ||
| 4522 | - | ||
| 4523 | - var modestyTransCanvases = $("canvas[id*='modestyTransCanavs']"); | 4530 | + var modestyTransCanvases = $("canvas[id*='modestyTransCanavs']"); |
| 4524 | 4531 | ||
| 4525 | - if (modestyTransCanvases != null || modestyTransCanvases != undefined && modestyTransCanvases.length > 0) { | ||
| 4526 | - for (var j = 0; j < modestyTransCanvases.length; j++) { | 4532 | + if (modestyTransCanvases != null || modestyTransCanvases != undefined && modestyTransCanvases.length > 0) { |
| 4533 | + for (var j = 0; j < modestyTransCanvases.length; j++) { | ||
| 4527 | 4534 | ||
| 4528 | - if (modestyTransCanvases[j].id.match(bodyRegionId)) { | 4535 | + if (modestyTransCanvases[j].id.match(bodyRegionId)) { |
| 4529 | 4536 | ||
| 4530 | - var modestyCanavs = document.getElementById(modestyTransCanvases[j].id); | 4537 | + var modestyCanavs = document.getElementById(modestyTransCanvases[j].id); |
| 4531 | 4538 | ||
| 4532 | - if ((parseInt(lowerlayerNumberForModesty) <= parseInt($scope.layerNumber)) && (HigherlayerNumberForModesty) > parseInt($scope.layerNumber)) { | 4539 | + if ((parseInt(lowerlayerNumberForModesty) <= parseInt($scope.layerNumber)) && (HigherlayerNumberForModesty) > parseInt($scope.layerNumber)) { |
| 4533 | 4540 | ||
| 4534 | - modestyCanavs.style.visibility = 'visible'; | ||
| 4535 | - } | ||
| 4536 | - else { | 4541 | + modestyCanavs.style.visibility = 'visible'; |
| 4542 | + } | ||
| 4543 | + else { | ||
| 4537 | 4544 | ||
| 4538 | - modestyCanavs.style.visibility = 'hidden'; | 4545 | + modestyCanavs.style.visibility = 'hidden'; |
| 4539 | 4546 | ||
| 4547 | + } | ||
| 4540 | } | 4548 | } |
| 4541 | - } | ||
| 4542 | 4549 | ||
| 4550 | + } | ||
| 4543 | } | 4551 | } |
| 4544 | - } | ||
| 4545 | 4552 | ||
| 4553 | + } | ||
| 4546 | } | 4554 | } |
| 4547 | 4555 | ||
| 4548 | } | 4556 | } |