ADAM / AIAHTML5

Commit eac09189d9cfa57b6e47043edf2efc2d8e669e39

Authored by Nikita Kulshreshtha
2 parents 66c73b5b 5fadfdd4

Merge branch 'TransparencyResizeDefect' into Develop

Inline Side-by-side
Showing 2 changed files with 46 additions and 11 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @eac0918
... ... @@ -3907,6 +3907,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
3907 3907 // console.log("extract button is active");
3908 3908  
3909 3909 }
  3910 +
  3911 +
3910 3912 //in case of annotation toolbar is open below code will be executed to draw Tbox
3911 3913 if ($rootScope.isAnnotationWindowOpen == true) {
3912 3914 if ($rootScope.isAnnotaionToolBarDrawingModeActive == true) {
... ... @@ -5649,15 +5651,23 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5649 5651  
5650 5652 //for enabling annoataions.
5651 5653 //Now everything si done on canavases uswed in annotation toolbar.
5652   -
5653   - if (parseInt($("#canvasPaint").css("z-index")) > parseInt($("#canvas").css("z-index")))
5654   - {
5655   - $rootScope.switchCanvasToPaintCanvas();
  5654 +
  5655 + $rootScope.switchCanvas();
  5656 + if ($rootScope.isAnnotaionToolBarDrawingModeActive == true) {
  5657 +
  5658 + $("#OnIdentify").removeClass('annotationtoolbartab');
  5659 + $("#DrawMode").addClass('annotationtoolbartab');
  5660 + //$('.btnCursor').trigger('click');
  5661 + $("#annotationpaintbrushsize").removeClass("activebtncolor");
  5662 + $('.btnCursor').addClass('activebtncolor');
  5663 +
5656 5664 }
5657   - else
5658   - {
5659   - $rootScope.switchCanvas();
  5665 + else {
  5666 +
  5667 + $("#OnIdentify").addClass('annotationtoolbartab');
  5668 + $("#DrawMode").removeClass('annotationtoolbartab');
5660 5669 }
  5670 +
5661 5671 // $rootScope.switchCanvas();
5662 5672 //To enable extract button
5663 5673 $scope.isTransparencyActivated = false;
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @eac0918
... ... @@ -667,8 +667,9 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
667 667 $('.btnCursor').removeClass('activebtncolor');
668 668 $(".btn-annotation").removeClass("activebtncolor");
669 669 $(".btn-annotation-line").addClass("activebtncolor");
670   -
671   -
  670 + $("#OnIdentify").removeClass('annotationtoolbartab');
  671 + $("#DrawMode").addClass('annotationtoolbartab');
  672 + $rootScope.isAnnotaionToolBarDrawingModeActive = true;
672 673 }
673 674  
674 675  
... ... @@ -684,6 +685,9 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
684 685 $('.btnCursor').removeClass('activebtncolor');
685 686 $(".btn-annotation").removeClass("activebtncolor");
686 687 $(".btn-annotation-pin").addClass("activebtncolor");
  688 + $("#OnIdentify").removeClass('annotationtoolbartab');
  689 + $("#DrawMode").addClass('annotationtoolbartab');
  690 + $rootScope.isAnnotaionToolBarDrawingModeActive = true;
687 691 }
688 692  
689 693 $rootScope.Cursor = function () {
... ... @@ -693,6 +697,9 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
693 697 $(".btn-annotation").removeClass("activebtncolor");
694 698 // $("#" + e.currentTarget.id).removeClass("activebtncolor");
695 699 $('.btnCursor').addClass('activebtncolor');
  700 + $("#OnIdentify").removeClass('annotationtoolbartab');
  701 + $("#DrawMode").addClass('annotationtoolbartab');
  702 + $rootScope.isAnnotaionToolBarDrawingModeActive = true;
696 703 }
697 704  
698 705  
... ... @@ -705,10 +712,13 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
705 712 $('.btnCursor').removeClass('activebtncolor');
706 713 $(".btn-annotation").removeClass("activebtncolor");
707 714 $(".btn-annotation-rectangle").addClass("activebtncolor");
  715 + $("#OnIdentify").removeClass('annotationtoolbartab');
  716 + $("#DrawMode").addClass('annotationtoolbartab');
  717 + $rootScope.isAnnotaionToolBarDrawingModeActive = true;
708 718 }
709 719  
710 720 $rootScope.paintBrush = function () {
711   - $rootScope.isAnnotaionToolBarDrawingModeActive = false;
  721 + $rootScope.isAnnotaionToolBarDrawingModeActive = true;
712 722 if ($rootScope.disableAnnotationtoolOnListManager == true) {
713 723 $rootScope.switchCanvas();
714 724 var canvasPaintZindex = $('#canvasPaint').css("z-index"); //x
... ... @@ -761,7 +771,8 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
761 771 $('.btnCursor').removeClass('activebtncolor');
762 772 $(".btn-annotation").removeClass("activebtncolor");
763 773 $(".btn-annotation-brush").addClass("activebtncolor");
764   -
  774 + $("#OnIdentify").removeClass('annotationtoolbartab');
  775 + $("#DrawMode").addClass('annotationtoolbartab');
765 776 }
766 777  
767 778 $rootScope.switchCanvasToPaintCanvas = function (e) {
... ... @@ -786,6 +797,9 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
786 797 $('.btnCursor').removeClass('activebtncolor');
787 798 $(".btn-annotation").removeClass("activebtncolor");
788 799 $(".btn-annotation-circle").addClass("activebtncolor");
  800 + $("#OnIdentify").removeClass('annotationtoolbartab');
  801 + $("#DrawMode").addClass('annotationtoolbartab');
  802 + $rootScope.isAnnotaionToolBarDrawingModeActive = true;
789 803 }
790 804  
791 805 $rootScope.DrawArrow = function (e) {
... ... @@ -797,6 +811,9 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
797 811 $('.btnCursor').removeClass('activebtncolor');
798 812 $(".btn-annotation").removeClass("activebtncolor");
799 813 $(".btn-annotation-arrow").addClass("activebtncolor");
  814 + $("#OnIdentify").removeClass('annotationtoolbartab');
  815 + $("#DrawMode").addClass('annotationtoolbartab');
  816 + $rootScope.isAnnotaionToolBarDrawingModeActive = true;
800 817 }
801 818 $rootScope.DrawText = function () {
802 819  
... ... @@ -809,6 +826,9 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
809 826 $('.btnCursor').removeClass('activebtncolor');
810 827 $(".btn-annotation").removeClass("activebtncolor");
811 828 $(".btn-annotation-Text").addClass("activebtncolor");
  829 + $("#OnIdentify").removeClass('annotationtoolbartab');
  830 + $("#DrawMode").addClass('annotationtoolbartab');
  831 + $rootScope.isAnnotaionToolBarDrawingModeActive = true;
812 832 }
813 833  
814 834 $rootScope.DrawPolygon = function () {
... ... @@ -816,6 +836,9 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
816 836 $("#canvasPaint").css("display", "block");
817 837 $("#canvas").css("display", "block");
818 838 $rootScope.shapeType = "DrawPolygon";
  839 + $("#OnIdentify").removeClass('annotationtoolbartab');
  840 + $("#DrawMode").addClass('annotationtoolbartab');
  841 + $rootScope.isAnnotaionToolBarDrawingModeActive = true;
819 842 }
820 843  
821 844  
... ... @@ -838,6 +861,8 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
838 861 $('.btnCursor').removeClass('activebtncolor');
839 862 $(".btn-annotation").removeClass("activebtncolor");
840 863 $(".btn-annotation-erase").addClass("activebtncolor");
  864 + $("#OnIdentify").removeClass('annotationtoolbartab');
  865 + $("#DrawMode").addClass('annotationtoolbartab');
841 866  
842 867 }
843 868  
... ...