Commit 6b2b2e64bf7c5bb3f7bdd0100ad9c838e9f80783

Authored by Nikita Kulshreshtha
1 parent 2f15deae

set default transparency to 100

400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -32,7 +32,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -32,7 +32,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
32 $scope.layerNumber; 32 $scope.layerNumber;
33 $scope.daCounter = 1; 33 $scope.daCounter = 1;
34 $scope.bagartDetails; 34 $scope.bagartDetails;
35 - $scope.transNumber = 50; 35 + $scope.transNumber = 100;
36 36
37 $rootScope.modestyCanvasZindex = 12100; 37 $rootScope.modestyCanvasZindex = 12100;
38 $rootScope.isModestyCanvasVisible = false; 38 $rootScope.isModestyCanvasVisible = false;
@@ -430,148 +430,147 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -430,148 +430,147 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
430 $scope.openBodyView = function () { 430 $scope.openBodyView = function () {
431 //Check if browser 'REFRESHED' or 'RELOADED' 431 //Check if browser 'REFRESHED' or 'RELOADED'
432 if ($rootScope.CommonData != null) { 432 if ($rootScope.CommonData != null) {
433 - //0. we will initially append container to load body 433 + //0. we will initially append container to load body
434 434
435 - //check if localstorage has any settings  
436 - var curentEthnicity = localStorage.getItem("globalEthnicity");  
437 - if (typeof (curentEthnicity) !== "undefined" && curentEthnicity !== null) {  
438 - $rootScope.globalSetting.ethnicity = curentEthnicity;  
439 - }  
440 -  
441 - var curentmodesty = localStorage.getItem("globalModesty");  
442 - if (typeof (curentmodesty) !== "undefined" && curentmodesty !== null) {  
443 - $rootScope.globalSetting.modesty = curentmodesty  
444 - }  
445 -  
446 - //0.1  
447 -  
448 - var currentBodyViewId = localStorage.getItem("currentBodyViewId");  
449 - if (currentBodyViewId == null || currentBodyViewId == undefined) {  
450 - // document.location = '/';  
451 - document.location = '/';  
452 - $rootScope.isVisibleLogin = true;  
453 -  
454 - }  
455 - else {  
456 - $rootScope.isVisibleLogin = false;  
457 - $rootScope.loadSearchDataForBodyView();  
458 -  
459 - console.log('currentBodyViewId pickjed from localStorage: ' + currentBodyViewId); 435 + //check if localstorage has any settings
  436 + var curentEthnicity = localStorage.getItem("globalEthnicity");
  437 + if (typeof (curentEthnicity) !== "undefined" && curentEthnicity !== null) {
  438 + $rootScope.globalSetting.ethnicity = curentEthnicity;
  439 + }
460 440
461 - var openViews;  
462 - if ($rootScope.openViews != null || $rootScope.openViews != undefined) {  
463 - if ($rootScope.openViews.length > 0) {  
464 - openViews = new jinqJs()  
465 - .from($rootScope.openViews)  
466 - .where("BodyViewId == " + currentBodyViewId)  
467 - .select();  
468 - } 441 + var curentmodesty = localStorage.getItem("globalModesty");
  442 + if (typeof (curentmodesty) !== "undefined" && curentmodesty !== null) {
  443 + $rootScope.globalSetting.modesty = curentmodesty
469 } 444 }
470 445
471 - // 0.2 getting corresponding body view title  
472 - //var counter = 1;  
473 - var tittle = localStorage.getItem("currentViewTitleFromJson");  
474 - localStorage.setItem("currentViewTitle", tittle); 446 + //0.1
475 447
476 - //WILL BE USED WHEN MULTI VIEWOPEN FUNCTIONALITY IS IMPELMNETD  
477 - //if (openViews != null && openViews != undefined) {  
478 - // angular.forEach(openViews, function (value, key) { 448 + var currentBodyViewId = localStorage.getItem("currentBodyViewId");
  449 + if (currentBodyViewId == null || currentBodyViewId == undefined) {
  450 + // document.location = '/';
  451 + document.location = '/';
  452 + $rootScope.isVisibleLogin = true;
479 453
480 - // if (value.bodyView == tittle) {  
481 - // tittle = localStorage.getItem("currentViewTitleFromJson") + counter++;  
482 - // $rootScope.currentActiveViewTitle = tittle;  
483 - // localStorage.setItem("currentViewTitle", tittle);  
484 - // } 454 + }
  455 + else {
  456 + $rootScope.isVisibleLogin = false;
  457 + $rootScope.loadSearchDataForBodyView();
485 458
486 - // });  
487 - //}  
488 - //else {  
489 - // localStorage.setItem("currentViewTitle", tittle);  
490 - //} 459 + console.log('currentBodyViewId pickjed from localStorage: ' + currentBodyViewId);
491 460
492 - //0.3 461 + var openViews;
  462 + if ($rootScope.openViews != null || $rootScope.openViews != undefined) {
  463 + if ($rootScope.openViews.length > 0) {
  464 + openViews = new jinqJs()
  465 + .from($rootScope.openViews)
  466 + .where("BodyViewId == " + currentBodyViewId)
  467 + .select();
  468 + }
  469 + }
493 470
494 - $.jsPanel({  
495 - id: 'daImagePanel',  
496 - selector: '.daBodyView',  
497 - theme: 'success',  
498 - currentController: 'DAController',  
499 - parentSlug: 'da-view-list',  
500 - ajax: {  
501 - url: 'app/views/da/da-view.html'  
502 - },  
503 - title: localStorage.getItem("currentViewTitle"), 471 + // 0.2 getting corresponding body view title
  472 + //var counter = 1;
  473 + var tittle = localStorage.getItem("currentViewTitleFromJson");
  474 + localStorage.setItem("currentViewTitle", tittle);
  475 +
  476 + //WILL BE USED WHEN MULTI VIEWOPEN FUNCTIONALITY IS IMPELMNETD
  477 + //if (openViews != null && openViews != undefined) {
  478 + // angular.forEach(openViews, function (value, key) {
  479 +
  480 + // if (value.bodyView == tittle) {
  481 + // tittle = localStorage.getItem("currentViewTitleFromJson") + counter++;
  482 + // $rootScope.currentActiveViewTitle = tittle;
  483 + // localStorage.setItem("currentViewTitle", tittle);
  484 + // }
  485 +
  486 + // });
  487 + //}
  488 + //else {
  489 + // localStorage.setItem("currentViewTitle", tittle);
  490 + //}
  491 +
  492 + //0.3
  493 +
  494 + $.jsPanel({
  495 + id: 'daImagePanel',
  496 + selector: '.daBodyView',
  497 + theme: 'success',
  498 + currentController: 'DAController',
  499 + parentSlug: 'da-view-list',
  500 + ajax: {
  501 + url: 'app/views/da/da-view.html'
  502 + },
  503 + title: localStorage.getItem("currentViewTitle"),
504 504
505 - position: {  
506 - top: 70,  
507 - left: 1,  
508 - }, 505 + position: {
  506 + top: 70,
  507 + left: 1,
  508 + },
509 509
510 - size: { width: $(window).outerWidth() - 10, height: $(window).outerHeight() - 110 }, 510 + size: { width: $(window).outerWidth() - 10, height: $(window).outerHeight() - 110 },
511 511
512 - }); 512 + });
513 513
514 - console.log('jsPanel loaded daImagePanel exist= ' + document.getElementById('daImagePanel'))  
515 - //0.1  
516 - $rootScope.currentSlug = 'da-body-view'; 514 + console.log('jsPanel loaded daImagePanel exist= ' + document.getElementById('daImagePanel'))
  515 + //0.1
  516 + $rootScope.currentSlug = 'da-body-view';
517 517
518 - //0.2  
519 - $rootScope.openViews.push(  
520 - {  
521 - "module": $rootScope.currentActiveModuleTitle, "bodyView": tittle, "state": 'max', "BodyViewId": $rootScope.currentBodyViewId,  
522 - "slug": $rootScope.currentSlug  
523 - }  
524 - ); 518 + //0.2
  519 + $rootScope.openViews.push(
  520 + {
  521 + "module": $rootScope.currentActiveModuleTitle, "bodyView": tittle, "state": 'max', "BodyViewId": $rootScope.currentBodyViewId,
  522 + "slug": $rootScope.currentSlug
  523 + }
  524 + );
525 525
526 - //0.3  
527 - var daBodyviewElement = angular.element(document.getElementById("daBodyview")); 526 + //0.3
  527 + var daBodyviewElement = angular.element(document.getElementById("daBodyview"));
528 528
529 - $timeout(function () {  
530 - $compile(daBodyviewElement.contents())($scope); 529 + $timeout(function () {
  530 + $compile(daBodyviewElement.contents())($scope);
531 531
532 - console.log('html is compiled' + document.getElementById('daView'))  
533 - if (document.getElementById('daView') != null) { 532 + console.log('html is compiled' + document.getElementById('daView'))
  533 + if (document.getElementById('daView') != null) {
534 534
535 - //0.4 added some stylesheets  
536 - $('#daBodyview').css("height", $(window).outerHeight()); 535 + //0.4 added some stylesheets
  536 + $('#daBodyview').css("height", $(window).outerHeight());
537 537
538 - $('#daBodyview').css("width", $(window).outerWidth()); 538 + $('#daBodyview').css("width", $(window).outerWidth());
539 539
540 - //1. load navigator man first  
541 - console.log('before LoadBodyViewNavigatorImage call')  
542 - $scope.LoadBodyViewNavigatorImage(); 540 + //1. load navigator man first
  541 + console.log('before LoadBodyViewNavigatorImage call')
  542 + $scope.LoadBodyViewNavigatorImage();
543 543
544 - //$rootScope.loadSearchDataForBodyView(); 544 + //$rootScope.loadSearchDataForBodyView();
545 545
546 - $scope.currentTitleFromJson = localStorage.getItem("currentViewTitle"); 546 + $scope.currentTitleFromJson = localStorage.getItem("currentViewTitle");
547 547
548 - $scope.layerNumber = 0; 548 + $scope.layerNumber = 0;
549 549
550 - //2. 550 + //2.
551 551
552 552
553 - console.log('currentBodyViewId just before sending: ' + currentBodyViewId);  
554 - $scope.loadBodyViewData(currentBodyViewId); 553 + console.log('currentBodyViewId just before sending: ' + currentBodyViewId);
  554 + $scope.loadBodyViewData(currentBodyViewId);
555 555
556 - //2. load bodyRegion data  
557 - $rootScope.isLoading = true;  
558 - $rootScope.voId = localStorage.getItem("currentBodyViewId");  
559 - }  
560 - $('#daBodyview').css("height", $(window).outerHeight()); 556 + //2. load bodyRegion data
  557 + $rootScope.isLoading = true;
  558 + $rootScope.voId = localStorage.getItem("currentBodyViewId");
  559 + }
  560 + $('#daBodyview').css("height", $(window).outerHeight());
561 561
562 - $('#daBodyview').css("width", $(window).outerWidth()); 562 + $('#daBodyview').css("width", $(window).outerWidth());
563 563
564 - if ($('#daImagePanel').offset().top == 0)  
565 - $('#daImagePanel').css("top", '70px'); 564 + if ($('#daImagePanel').offset().top == 0)
  565 + $('#daImagePanel').css("top", '70px');
566 566
567 - if ($('#daImagePanel').offset().left == 0)  
568 - $('#daImagePanel').css("left", '1px'); 567 + if ($('#daImagePanel').offset().left == 0)
  568 + $('#daImagePanel').css("left", '1px');
569 569
570 - }, 350);  
571 - }  
572 - }  
573 - else  
574 - { 570 + }, 350);
  571 + }
  572 + }
  573 + else {
575 //for now we are redirecting user to index page on page refresh because on refresh we lost the rootscope data and some of application 574 //for now we are redirecting user to index page on page refresh because on refresh we lost the rootscope data and some of application
576 //features stopped working which were depenedent of rootscope data like List manager, annotation toolbar, settings, usermodule list, etc. 575 //features stopped working which were depenedent of rootscope data like List manager, annotation toolbar, settings, usermodule list, etc.
577 576
@@ -586,7 +585,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -586,7 +585,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
586 }*/ 585 }*/
587 586
588 587
589 - } 588 + }
590 } 589 }
591 590
592 angular.element(document).ready(function (e) { 591 angular.element(document).ready(function (e) {
@@ -656,11 +655,11 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -656,11 +655,11 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
656 }) 655 })
657 // $rootScope.languageArray = []; 656 // $rootScope.languageArray = [];
658 $rootScope.loadSearchDataForBodyView = function () { 657 $rootScope.loadSearchDataForBodyView = function () {
659 - 658 +
660 var languageArray = []; 659 var languageArray = [];
661 $rootScope.vocabTermDataArray = []; 660 $rootScope.vocabTermDataArray = [];
662 var languageArray = $rootScope.lexiconLanguageArray; 661 var languageArray = $rootScope.lexiconLanguageArray;
663 - 662 +
664 console.log(languageArray.length); 663 console.log(languageArray.length);
665 console.log('loadSearchDataForBodyView'); 664 console.log('loadSearchDataForBodyView');
666 665
@@ -691,14 +690,14 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -691,14 +690,14 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
691 $rootScope.vocabTermDataArray.push({ "language": $scope.vocabLanguage, "VocabTermData": $rootScope.VocabTermData, "vocabTermTxt": $scope.vocabTermTxt }); 690 $rootScope.vocabTermDataArray.push({ "language": $scope.vocabLanguage, "VocabTermData": $rootScope.VocabTermData, "vocabTermTxt": $scope.vocabTermTxt });
692 691
693 for (var i = 0; i <= $rootScope.lexiconLanguageArray.length - 1; i++) { 692 for (var i = 0; i <= $rootScope.lexiconLanguageArray.length - 1; i++) {
694 - 693 +
695 694
696 $rootScope.vocabTermDataArray[i].vocabTermTxt = new jinqJs() 695 $rootScope.vocabTermDataArray[i].vocabTermTxt = new jinqJs()
697 .from($rootScope.vocabTermDataArray[i].vocabTermTxt) 696 .from($rootScope.vocabTermDataArray[i].vocabTermTxt)
698 .distinct('_TermText', '_ActualTermNumber') 697 .distinct('_TermText', '_ActualTermNumber')
699 .orderBy([{ field: '_TermText', sort: 'asc' }]) 698 .orderBy([{ field: '_TermText', sort: 'asc' }])
700 .select('_ActualTermNumber', '_TermText', '_cdId'); 699 .select('_ActualTermNumber', '_TermText', '_cdId');
701 - 700 +
702 console.log("Language= " + $rootScope.lexiconLanguageArray[i].language + ", vocabTermTxt= " + $rootScope.vocabTermDataArray[i].vocabTermTxt[0]._TermText); 701 console.log("Language= " + $rootScope.lexiconLanguageArray[i].language + ", vocabTermTxt= " + $rootScope.vocabTermDataArray[i].vocabTermTxt[0]._TermText);
703 702
704 } 703 }
@@ -1591,7 +1590,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -1591,7 +1590,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1591 if ($rootScope.multiAnnotationIsON == true) { 1590 if ($rootScope.multiAnnotationIsON == true) {
1592 1591
1593 // $scope.createDynamicSpeechBubble(evt, annotationText, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top); 1592 // $scope.createDynamicSpeechBubble(evt, annotationText, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top);
1594 - 1593 +
1595 $scope.MultiLanguageAnnationArray = []; 1594 $scope.MultiLanguageAnnationArray = [];
1596 for (var i = 0; i <= $rootScope.annotationText.length - 1; i++) { 1595 for (var i = 0; i <= $rootScope.annotationText.length - 1; i++) {
1597 1596
@@ -1611,7 +1610,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -1611,7 +1610,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1611 1610
1612 1611
1613 // $scope.createDynamicSpeechBubble(evt, annotationText, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top); 1612 // $scope.createDynamicSpeechBubble(evt, annotationText, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top);
1614 - // alert(annotationText); 1613 + // alert(annotationText);
1615 $scope.MultiLanguageAnnationArray = []; 1614 $scope.MultiLanguageAnnationArray = [];
1616 for (var i = 0; i <= $rootScope.annotationText.length - 1; i++) { 1615 for (var i = 0; i <= $rootScope.annotationText.length - 1; i++) {
1617 1616
@@ -1622,7 +1621,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -1622,7 +1621,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1622 $scope.createDynamicSpeechBubble(evt, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, true); 1621 $scope.createDynamicSpeechBubble(evt, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, true);
1623 } 1622 }
1624 else { 1623 else {
1625 - // alert(annotationText); 1624 + // alert(annotationText);
1626 // $scope.createDynamicSpeechBubble(evt, annotationText, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top); 1625 // $scope.createDynamicSpeechBubble(evt, annotationText, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top);
1627 $scope.MultiLanguageAnnationArray = []; 1626 $scope.MultiLanguageAnnationArray = [];
1628 for (var i = 0; i <= $rootScope.annotationText.length - 1; i++) { 1627 for (var i = 0; i <= $rootScope.annotationText.length - 1; i++) {
@@ -1983,7 +1982,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -1983,7 +1982,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1983 if ($rootScope.multiAnnotationIsON == true) { 1982 if ($rootScope.multiAnnotationIsON == true) {
1984 1983
1985 // $scope.createDynamicSpeechBubble(evt, annotationText, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top); 1984 // $scope.createDynamicSpeechBubble(evt, annotationText, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top);
1986 - // alert(annotationText); 1985 + // alert(annotationText);
1987 $scope.MultiLanguageAnnationArray = []; 1986 $scope.MultiLanguageAnnationArray = [];
1988 for (var i = 0; i <= $rootScope.annotationText.length - 1; i++) { 1987 for (var i = 0; i <= $rootScope.annotationText.length - 1; i++) {
1989 1988
@@ -2010,7 +2009,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -2010,7 +2009,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2010 // $scope.createDynamicSpeechBubble(evt, annotationText, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top); 2009 // $scope.createDynamicSpeechBubble(evt, annotationText, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top);
2011 2010
2012 2011
2013 - 2012 +
2014 for (var i = 0; i <= $rootScope.annotationText.length - 1; i++) { 2013 for (var i = 0; i <= $rootScope.annotationText.length - 1; i++) {
2015 2014
2016 $scope.MultiLanguageAnnationArray.push($rootScope.annotationText[i]); 2015 $scope.MultiLanguageAnnationArray.push($rootScope.annotationText[i]);
@@ -2830,12 +2829,12 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -2830,12 +2829,12 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2830 } 2829 }
2831 } 2830 }
2832 } 2831 }
2833 - 2832 +
2834 return annotation; 2833 return annotation;
2835 } 2834 }
2836 2835
2837 $scope.GetAnnotationBasedOnActualTermNo = function (actualTermNo, language) { 2836 $scope.GetAnnotationBasedOnActualTermNo = function (actualTermNo, language) {
2838 - 2837 +
2839 var Annotation; 2838 var Annotation;
2840 $scope.ActualTermNo = actualTermNo; 2839 $scope.ActualTermNo = actualTermNo;
2841 for (var j = 0; j <= $rootScope.vocabTermDataArray.length - 1; j++) { 2840 for (var j = 0; j <= $rootScope.vocabTermDataArray.length - 1; j++) {
@@ -2852,7 +2851,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -2852,7 +2851,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2852 for (var z = 0; z <= $scope.matchedActualTermData.length; z++) { 2851 for (var z = 0; z <= $scope.matchedActualTermData.length; z++) {
2853 //send actual term no to get the term text. 2852 //send actual term no to get the term text.
2854 Annotation = $scope.matchedActualTermData[0]._TermText; 2853 Annotation = $scope.matchedActualTermData[0]._TermText;
2855 - // alert("Annotation : " + Annotation); 2854 + // alert("Annotation : " + Annotation);
2856 break; 2855 break;
2857 }; 2856 };
2858 } 2857 }
@@ -2943,7 +2942,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -2943,7 +2942,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2943 2942
2944 2943
2945 $.each(BodyRegionDictionary, function (index, value) { 2944 $.each(BodyRegionDictionary, function (index, value) {
2946 - 2945 +
2947 if (value.bodyRegionId == '3') { 2946 if (value.bodyRegionId == '3') {
2948 2947
2949 var BR_SixTBData = new jinqJs() 2948 var BR_SixTBData = new jinqJs()
@@ -2967,7 +2966,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -2967,7 +2966,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2967 // alert(' $.each(BodyRegionDictionary3. bodyRegionRight: ' + bodyRegionRight + ', bodyRegionBottom: ' + bodyRegionBottom) 2966 // alert(' $.each(BodyRegionDictionary3. bodyRegionRight: ' + bodyRegionRight + ', bodyRegionBottom: ' + bodyRegionBottom)
2968 if (TransparencyBoxStartX <= bodyRegionRight && value.X <= transparencyBoxRight && TransparencyBoxStartY <= bodyRegionBottom && value.Y <= transparencyBoxBottom) { 2967 if (TransparencyBoxStartX <= bodyRegionRight && value.X <= transparencyBoxRight && TransparencyBoxStartY <= bodyRegionBottom && value.Y <= transparencyBoxBottom) {
2969 //var transNumber = parseInt(document.getElementById("txtTransparencyChange").value); 2968 //var transNumber = parseInt(document.getElementById("txtTransparencyChange").value);
2970 - 2969 +
2971 $scope.layerNumber = parseInt(txtlayerNumber.value); 2970 $scope.layerNumber = parseInt(txtlayerNumber.value);
2972 2971
2973 if (value.bodyRegionId == '3' && $scope.canThirdBRDrawn == true) { 2972 if (value.bodyRegionId == '3' && $scope.canThirdBRDrawn == true) {
@@ -2993,7 +2992,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -2993,7 +2992,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2993 //draw 3rd BR 2992 //draw 3rd BR
2994 $timeout(function () { 2993 $timeout(function () {
2995 $scope.loadTransparencyImage(value.bodyRegionId, value.Height, value.Width, value.X, value.Y, value.IsMirror, $scope.TransparencyBoxStartX, TransparencyEndX, $scope.TransparencyBoxStartY, TransparencyBoxEndY, $scope, true, false, false); 2994 $scope.loadTransparencyImage(value.bodyRegionId, value.Height, value.Width, value.X, value.Y, value.IsMirror, $scope.TransparencyBoxStartX, TransparencyEndX, $scope.TransparencyBoxStartY, TransparencyBoxEndY, $scope, true, false, false);
2996 - },200); 2995 + }, 200);
2997 2996
2998 } 2997 }
2999 else { 2998 else {
@@ -3582,7 +3581,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -3582,7 +3581,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
3582 + '<div style="position:absolute;border:1px solid #000;display:none;z-index:59000;" id="bord_annotation">' 3581 + '<div style="position:absolute;border:1px solid #000;display:none;z-index:59000;" id="bord_annotation">'
3583 + '</div>'; 3582 + '</div>';
3584 $("#sppeachBubble_annotation").css("height", "auto"); 3583 $("#sppeachBubble_annotation").css("height", "auto");
3585 - // alert($("#sppeachBubble_annotation").css("height")); 3584 + // alert($("#sppeachBubble_annotation").css("height"));
3586 if ($scope.longest_annotationT1.length > $scope.longest_annotationT2.length) { 3585 if ($scope.longest_annotationT1.length > $scope.longest_annotationT2.length) {
3587 $("#sppeachBubble_annotation p").remove(); 3586 $("#sppeachBubble_annotation p").remove();
3588 $('#canvasDiv').append(sppechBubbleDotHTML_annotation); 3587 $('#canvasDiv').append(sppechBubbleDotHTML_annotation);
@@ -4128,7 +4127,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -4128,7 +4127,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
4128 $('#transparencyScale').css('left', $scope.TBDrawStartX + 130) 4127 $('#transparencyScale').css('left', $scope.TBDrawStartX + 130)
4129 $('#transparencyScale').css('visibility', 'visible') 4128 $('#transparencyScale').css('visibility', 'visible')
4130 $('#transparencyScale').css("z-index", "100000") //Dated:16-07-2016 Issue#4962:Transparency box should be on top. 4129 $('#transparencyScale').css("z-index", "100000") //Dated:16-07-2016 Issue#4962:Transparency box should be on top.
4131 - 4130 + $("#tbSlider .ui-slider-range-min").css("width", "100%");
  4131 + $("#tbSlider .ui-slider-handle").css("left", "100%");
4132 } 4132 }
4133 } 4133 }
4134 4134
@@ -4223,7 +4223,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -4223,7 +4223,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
4223 } 4223 }
4224 4224
4225 $scope.loadTransparencyImage = function (bodyRegionId, Height, Width, X, Y, IsMirror, TransparencyBoxStartX, TransparencyEndX, TransparencyBoxStartY, TransparencyBoxEndY, scope, isLayerChanged, isTransparencyChanged, isResized) { 4225 $scope.loadTransparencyImage = function (bodyRegionId, Height, Width, X, Y, IsMirror, TransparencyBoxStartX, TransparencyEndX, TransparencyBoxStartY, TransparencyBoxEndY, scope, isLayerChanged, isTransparencyChanged, isResized) {
4226 - $scope.IncludedBodyRegions.push({ 'BRID': bodyRegionId }); 4226 +
4227 4227
4228 var transparencyCanvas = document.getElementById('transparencyCanvas'); 4228 var transparencyCanvas = document.getElementById('transparencyCanvas');
4229 4229
@@ -4461,7 +4461,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -4461,7 +4461,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
4461 var contxModestyTemp = document.getElementById(modestyTempCanvasId).getContext('2d'); 4461 var contxModestyTemp = document.getElementById(modestyTempCanvasId).getContext('2d');
4462 var tbTempCanvas = document.getElementById(tempCanvasID) 4462 var tbTempCanvas = document.getElementById(tempCanvasID)
4463 contxModestyTemp.drawImage(tbTempCanvas, XforCopyImage, YforCopyImage, WidthforCopyImage, HeightforCopyImage, XforTransImage, YforTransImage, WidthforTransImage, HeightforTransImage); 4463 contxModestyTemp.drawImage(tbTempCanvas, XforCopyImage, YforCopyImage, WidthforCopyImage, HeightforCopyImage, XforTransImage, YforTransImage, WidthforTransImage, HeightforTransImage);
4464 - $scope.transparencyDrawnRegions.push({ 'BRID': bodyRegionId }); 4464 +
4465 } 4465 }
4466 } 4466 }
4467 else { 4467 else {
@@ -4470,13 +4470,12 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -4470,13 +4470,12 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
4470 var contx = document.getElementById('tempCanvas').getContext('2d'); 4470 var contx = document.getElementById('tempCanvas').getContext('2d');
4471 var tbTempCanvas = document.getElementById(tempCanvasID) 4471 var tbTempCanvas = document.getElementById(tempCanvasID)
4472 contx.drawImage(tbTempCanvas, XforCopyImage, YforCopyImage, WidthforCopyImage, HeightforCopyImage, XforTransImage, YforTransImage, WidthforTransImage, HeightforTransImage); 4472 contx.drawImage(tbTempCanvas, XforCopyImage, YforCopyImage, WidthforCopyImage, HeightforCopyImage, XforTransImage, YforTransImage, WidthforTransImage, HeightforTransImage);
4473 - $scope.transparencyDrawnRegions.push({ 'BRID': bodyRegionId });  
4474 4473
4475 } 4474 }
4476 } 4475 }
4477 - if ($scope.transparencyDrawnRegions.length == $scope.IncludedBodyRegions.length) {  
4478 - $scope.DrawOnTBWithSelectedTransparency(tempCanvasID, XforCopyImage, YforCopyImage, WidthforCopyImage, HeightforCopyImage, XforTransImage, YforTransImage, WidthforTransImage, HeightforTransImage, Height, Width, bodyRegionId);  
4479 - } 4476 +
  4477 + $scope.DrawOnTBWithSelectedTransparency(tempCanvasID, XforCopyImage, YforCopyImage, WidthforCopyImage, HeightforCopyImage, XforTransImage, YforTransImage, WidthforTransImage, HeightforTransImage, Height, Width, bodyRegionId, isLayerChanged, isResized);
  4478 +
4480 } 4479 }
4481 4480
4482 4481
@@ -4512,9 +4511,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -4512,9 +4511,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
4512 4511
4513 //set modesty image visiblility true/false as per layer 4512 //set modesty image visiblility true/false as per layer
4514 // if(bodyRegionId.match('modestyImg3')) 4513 // if(bodyRegionId.match('modestyImg3'))
4515 - var BRID='';  
4516 - if (bodyRegionId.match('modestyImg') && document.getElementById('modestyTransCanavs_' + bodyRegionId)!=null) {  
4517 - BRID = bodyRegionId[bodyRegionId.length - 1]; 4514 + var BRID = '';
  4515 + if (bodyRegionId.match('modestyImg') && document.getElementById('modestyTransCanavs_' + bodyRegionId) != null) {
  4516 + BRID = bodyRegionId[bodyRegionId.length - 1];
4518 } 4517 }
4519 else if ((bodyRegionId == '2' || bodyRegionId == '3') && document.getElementById('modestyTransCanavs_modestyImg' + bodyRegionId) != null) { 4518 else if ((bodyRegionId == '2' || bodyRegionId == '3') && document.getElementById('modestyTransCanavs_modestyImg' + bodyRegionId) != null) {
4520 BRID = bodyRegionId; 4519 BRID = bodyRegionId;
@@ -4742,30 +4741,20 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -4742,30 +4741,20 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
4742 } 4741 }
4743 4742
4744 4743
4745 - $scope.DrawOnTBWithSelectedTransparency = function (tempCanvasID, XforCopyImage, YforCopyImage, WidthforCopyImage, HeightforCopyImage, XforTransImage, YforTransImage, WidthforTransImage, HeightforTransImage, Height, Width, bodyRegionId) { 4744 + $scope.DrawOnTBWithSelectedTransparency = function (tempCanvasID, XforCopyImage, YforCopyImage, WidthforCopyImage, HeightforCopyImage, XforTransImage, YforTransImage, WidthforTransImage, HeightforTransImage, Height, Width, bodyRegionId, isLayerChanged, isResized) {
4746 4745
4747 var transNumber = $scope.transNumber;//txtTransparencyChange.value; 4746 var transNumber = $scope.transNumber;//txtTransparencyChange.value;
4748 //this changes the transparency when transparency is already activated and user resizes or chage the layer 4747 //this changes the transparency when transparency is already activated and user resizes or chage the layer
4749 4748
4750 - var tempCtx = document.getElementById('tempCanvas').getContext('2d');  
4751 -  
4752 -  
4753 -  
4754 - var transC = document.getElementById('transparencyCanvas');  
4755 - var ctx = transC.getContext('2d');  
4756 - var height = parseInt(((transC.style.height).toString()).replace('px', ''));  
4757 - var width = parseInt(((transC.style.width).toString()).replace('px', '')); 4749 + var tempCtx = document.getElementById(tempCanvasID).getContext('2d');
4758 4750
4759 - var tempCanavsImageData = tempCtx.getImageData(0, 0, width, height); 4751 + var imageD = tempCtx.getImageData(0, 0, Width, Height);
  4752 + var imageData = imageD.data;
  4753 + var length = imageData.length;
4760 4754
4761 - 4755 + // set every fourth value to the desired number of transparency
4762 4756
4763 - ctx.putImageData(tempCanavsImageData, 0, 0);  
4764 4757
4765 - // set every fourth value to the desired number of transparency  
4766 - var transCanvasImgData = ctx.getImageData(0, 0, width, height);  
4767 - var imageData = transCanvasImgData.data;  
4768 - var length = imageData.length;  
4769 for (var i = 3; i < length; i += 4) { 4758 for (var i = 3; i < length; i += 4) {
4770 if ($scope.voId == "9" || $scope.voId == "11") { 4759 if ($scope.voId == "9" || $scope.voId == "11") {
4771 4760
@@ -4777,75 +4766,75 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -4777,75 +4766,75 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
4777 } 4766 }
4778 } 4767 }
4779 else { 4768 else {
4780 -  
4781 - imageData[i] = ((255) * (parseInt(transNumber))) / 100; 4769 +
  4770 + imageData[i] = ((255) * (parseInt(transNumber))) / 100;
4782 } 4771 }
4783 4772
4784 - 4773 +
4785 } 4774 }
4786 -  
4787 - ctx.putImageData(transCanvasImgData, 0, 0);  
4788 4775
  4776 + tempCtx.putImageData(imageD, 0, 0);
4789 4777
4790 - // $scope.widthOfImage = WidthforTransImage;  
4791 - // $scope.heightOfImage = HeightforTransImage;  
4792 - // $scope.xOfImage = XforTransImage;  
4793 - // $scope.yOfImage = YforTransImage;  
4794 4778
4795 - // var ctx = transparencyCanvas.getContext('2d'); 4779 + $scope.widthOfImage = WidthforTransImage;
  4780 + $scope.heightOfImage = HeightforTransImage;
  4781 + $scope.xOfImage = XforTransImage;
  4782 + $scope.yOfImage = YforTransImage;
4796 4783
  4784 + var ctx = transparencyCanvas.getContext('2d');
4797 4785
4798 - // var tmpCanvasContext = document.getElementById(tempCanvasID);//.getContext('2d');  
4799 4786
  4787 + var tmpCanvasContext = document.getElementById(tempCanvasID);//.getContext('2d');
4800 4788
4801 4789
4802 - // var ctx;  
4803 - // if ($rootScope.isModestyOn == true && (bodyRegionId.match('modestyImg'))) {  
4804 - // var modestyTransCanvasId = 'modestyTransCanavs_' + bodyRegionId  
4805 - // ctx = document.getElementById(modestyTransCanvasId).getContext('2d');  
4806 - // }  
4807 - // else  
4808 - // ctx = transparencyCanvas.getContext('2d');  
4809 4790
4810 - // // var ctx = transparencyCanvas.getContext('2d');  
4811 - // ctx.drawImage(tmpCanvasContext, XforCopyImage, YforCopyImage, WidthforCopyImage, HeightforCopyImage, XforTransImage, YforTransImage, WidthforTransImage, HeightforTransImage) 4791 + var ctx;
  4792 + if ($rootScope.isModestyOn == true && (bodyRegionId.match('modestyImg'))) {
  4793 + var modestyTransCanvasId = 'modestyTransCanavs_' + bodyRegionId
  4794 + ctx = document.getElementById(modestyTransCanvasId).getContext('2d');
  4795 + }
  4796 + else
  4797 + ctx = transparencyCanvas.getContext('2d');
4812 4798
  4799 + // var ctx = transparencyCanvas.getContext('2d');
  4800 + ctx.drawImage(tmpCanvasContext, XforCopyImage, YforCopyImage, WidthforCopyImage, HeightforCopyImage, XforTransImage, YforTransImage, WidthforTransImage, HeightforTransImage)
4813 4801
4814 - // if ($rootScope.isModestyOn == true && (bodyRegionId.match('modestyImg'))) {  
4815 4802
4816 - // var imageD1 = ctx.getImageData(0, 0, Width, Height);  
4817 - // var imageData1 = imageD1.data;  
4818 - // var length1 = imageData1.length; 4803 + if ($rootScope.isModestyOn == true && (bodyRegionId.match('modestyImg'))) {
4819 4804
  4805 + var imageD1 = ctx.getImageData(0, 0, Width, Height);
  4806 + var imageData1 = imageD1.data;
  4807 + var length1 = imageData1.length;
4820 4808
4821 - // // set every fourth value to the desired number of transparency  
4822 - // for (var i = 0; i < imageData1.length; i += 4) {  
4823 - // if (imageData1[i] == imageData1[i + 1] && imageData1[i + 1] == imageData1[i + 2] && imageData1[i + 2] === 0) {  
4824 - // imageData1[i + 3] = 0;  
4825 - // }  
4826 4809
4827 - // }  
4828 - 4810 + // set every fourth value to the desired number of transparency
  4811 + for (var i = 0; i < imageData1.length; i += 4) {
  4812 + if (imageData1[i] == imageData1[i + 1] && imageData1[i + 1] == imageData1[i + 2] && imageData1[i + 2] === 0) {
  4813 + imageData1[i + 3] = 0;
  4814 + }
4829 4815
4830 - // ctx.putImageData(imageD1, 0, 0); 4816 + }
4831 4817
4832 - // } 4818 +
  4819 + ctx.putImageData(imageD1, 0, 0);
  4820 +
  4821 + }
4833 4822
4834 4823
4835 4824
4836 - // // $scope.transparencyDrawnRegions.push(bodyRegionId);  
4837 - //// $scope.transparencyDrawnRegions.push({ 'BRID': bodyRegionId }); 4825 + // $scope.transparencyDrawnRegions.push(bodyRegionId);
  4826 + $scope.transparencyDrawnRegions.push({ 'BRID': bodyRegionId });
4838 4827
4839 - // $rootScope.isLoading = false;  
4840 - // $('#spinner').css('visibility', 'hidden'); 4828 + $rootScope.isLoading = false;
  4829 + $('#spinner').css('visibility', 'hidden');
4841 4830
4842 - // if ($scope.transparencyDrawnRegions.length == $scope.IncludedBodyRegions.length) { 4831 + if ($scope.transparencyDrawnRegions.length == $scope.IncludedBodyRegions.length) {
4843 4832
4844 - // transparencyCanvas.style.visibility = 'visible';  
4845 - // $('.rectangle').remove(); 4833 + transparencyCanvas.style.visibility = 'visible';
  4834 + $('.rectangle').remove();
4846 4835
4847 4836
4848 - // } 4837 + }
4849 } 4838 }
4850 4839
4851 4840
@@ -5018,7 +5007,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -5018,7 +5007,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5018 5007
5019 // var maskCanvasId = "imageCanvas" + $rootScope.BRId + "_mci"; 5008 // var maskCanvasId = "imageCanvas" + $rootScope.BRId + "_mci";
5020 5009
5021 - // alert(annotationText); 5010 + // alert(annotationText);
5022 $scope.MultiLanguageAnnationArray = []; 5011 $scope.MultiLanguageAnnationArray = [];
5023 for (var i = 0; i <= $rootScope.annotationText.length - 1; i++) { 5012 for (var i = 0; i <= $rootScope.annotationText.length - 1; i++) {
5024 5013
@@ -5092,7 +5081,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -5092,7 +5081,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5092 } 5081 }
5093 } 5082 }
5094 5083
5095 - 5084 +
5096 if (tCanvasHeight != $scope.transparencyCanvasHeight || tCanvasWidth != $scope.transparencyCanvasWidth) { 5085 if (tCanvasHeight != $scope.transparencyCanvasHeight || tCanvasWidth != $scope.transparencyCanvasWidth) {
5097 5086
5098 5087
@@ -5119,7 +5108,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -5119,7 +5108,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5119 $scope.transparencyCanvasHeight = tCanvasHeight; 5108 $scope.transparencyCanvasHeight = tCanvasHeight;
5120 $scope.transparencyCanvasWidth = tCanvasWidth; 5109 $scope.transparencyCanvasWidth = tCanvasWidth;
5121 5110
5122 - 5111 +
5123 //create temp cavas to retain the original anavs data for use in transparency change as 5112 //create temp cavas to retain the original anavs data for use in transparency change as
5124 //if u use original canvas data for transprency change then at 0 transparency all data will become transparent and if u increase transparency with this data then the canavs will be blank 5113 //if u use original canvas data for transprency change then at 0 transparency all data will become transparent and if u increase transparency with this data then the canavs will be blank
5125 if (document.getElementById('tempCanvas') != null) { 5114 if (document.getElementById('tempCanvas') != null) {
@@ -5204,7 +5193,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -5204,7 +5193,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5204 //draw 3rd BR 5193 //draw 3rd BR
5205 $timeout(function () { 5194 $timeout(function () {
5206 $scope.loadTransparencyImage(value.bodyRegionId, value.Height, value.Width, value.X, value.Y, value.IsMirror, $scope.TransparencyBoxStartX, $scope.TransparencyEndX, $scope.TransparencyBoxStartY, $scope.TransparencyBoxEndY, $scope, false, false, true); 5195 $scope.loadTransparencyImage(value.bodyRegionId, value.Height, value.Width, value.X, value.Y, value.IsMirror, $scope.TransparencyBoxStartX, $scope.TransparencyEndX, $scope.TransparencyBoxStartY, $scope.TransparencyBoxEndY, $scope, false, false, true);
5207 - },200); 5196 + }, 200);
5208 } 5197 }
5209 else { 5198 else {
5210 //draw mirror arm 5199 //draw mirror arm
@@ -5260,7 +5249,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -5260,7 +5249,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5260 } 5249 }
5261 }) 5250 })
5262 } 5251 }
5263 - 5252 +
5264 } 5253 }
5265 5254
5266 5255
@@ -5440,7 +5429,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -5440,7 +5429,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5440 $scope.annotationTextArrayT2.push($rootScope.annotationTextForTrans2[i]); 5429 $scope.annotationTextArrayT2.push($rootScope.annotationTextForTrans2[i]);
5441 } 5430 }
5442 //$scope.annotationTextArrayT1.push(annotations.annotationT1); 5431 //$scope.annotationTextArrayT1.push(annotations.annotationT1);
5443 - // $scope.annotationTextArrayT2.push(annotations.annotationT2); 5432 + // $scope.annotationTextArrayT2.push(annotations.annotationT2);
5444 5433
5445 $scope.createDynamicSpeechBubble(evt, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, false); 5434 $scope.createDynamicSpeechBubble(evt, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, false);
5446 } 5435 }
@@ -5692,8 +5681,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -5692,8 +5681,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5692 for (var i = 0; i <= $rootScope.annotationText.length - 1; i++) { 5681 for (var i = 0; i <= $rootScope.annotationText.length - 1; i++) {
5693 $rootScope.annotationTextForTrans1.push($rootScope.annotationText[i]); 5682 $rootScope.annotationTextForTrans1.push($rootScope.annotationText[i]);
5694 } 5683 }
5695 -  
5696 - 5684 +
  5685 +
5697 //get annotation for trans canavs 5686 //get annotation for trans canavs
5698 var RedTrans; 5687 var RedTrans;
5699 var GreenTrans; 5688 var GreenTrans;
@@ -5728,7 +5717,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -5728,7 +5717,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5728 for (var i = 0; i <= $rootScope.annotationText.length - 1; i++) { 5717 for (var i = 0; i <= $rootScope.annotationText.length - 1; i++) {
5729 $rootScope.annotationTextForTrans2.push($rootScope.annotationText[i]); 5718 $rootScope.annotationTextForTrans2.push($rootScope.annotationText[i]);
5730 } 5719 }
5731 - 5720 +
5732 return { 5721 return {
5733 annotationT1: annotationText1, 5722 annotationT1: annotationText1,
5734 annotationT2: annotationText2 5723 annotationT2: annotationText2
@@ -5895,8 +5884,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -5895,8 +5884,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5895 //$("canvas[name*='transparencyTempCanvas']").nextUntil($("canvas[name*='transparencyTempCanvas']")) 5884 //$("canvas[name*='transparencyTempCanvas']").nextUntil($("canvas[name*='transparencyTempCanvas']"))
5896 //.remove(); 5885 //.remove();
5897 $scope.layerNumber = $scope.currentLayerNumber; 5886 $scope.layerNumber = $scope.currentLayerNumber;
5898 - $scope.transNumber = 50;  
5899 - $(".slider").slider({ value: 50 }) 5887 + $scope.transNumber = 100;
  5888 + $(".slider").slider({ value: 100 })
5900 } 5889 }
5901 5890
5902 5891
@@ -8731,4 +8720,3 @@ function onListManagerTermSelection(id, isTermListOptionClicked) { @@ -8731,4 +8720,3 @@ function onListManagerTermSelection(id, isTermListOptionClicked) {
8731 8720
8732 } 8721 }
8733 8722
8734 -  
400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
@@ -368,7 +368,7 @@ @@ -368,7 +368,7 @@
368 <div class="col-sm-12"> 368 <div class="col-sm-12">
369 <div class="padded25"> 369 <div class="padded25">
370 <!--<div class="slider" id="sliderScale"></div>--> 370 <!--<div class="slider" id="sliderScale"></div>-->
371 - <div class="slider"></div> 371 + <div class="slider" id="tbSlider"></div>
372 </div> 372 </div>
373 </div> 373 </div>
374 </div> 374 </div>
@@ -385,11 +385,12 @@ @@ -385,11 +385,12 @@
385 <script> 385 <script>
386 $(window).load(function () { 386 $(window).load(function () {
387 $(".stickey-area").sticky(); 387 $(".stickey-area").sticky();
  388 +
  389 +
388 });</script> 390 });</script>
389 <script> 391 <script>
390 $(function () { 392 $(function () {
391 393
392 -  
393 var regExp = /[0-9\.\,]/; 394 var regExp = /[0-9\.\,]/;
394 $('#txtlayerNumber').on('keydown keyup', function (e) { 395 $('#txtlayerNumber').on('keydown keyup', function (e) {
395 var value = String.fromCharCode(e.which) || e.key; 396 var value = String.fromCharCode(e.which) || e.key;