ADAM / AIAHTML5

Commit 499636be8b4fafd29d0662133bf3675af6f2dc7c

Authored by Nikita Kulshreshtha
2 parents b11818b4 eac09189

Merge branch 'Develop' of http://52.6.196.163/ADAM/AIAHTML5 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 @499636b
... ... @@ -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 @499636b
... ... @@ -670,8 +670,9 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
670 670 $('.btnCursor').removeClass('activebtncolor');
671 671 $(".btn-annotation").removeClass("activebtncolor");
672 672 $(".btn-annotation-line").addClass("activebtncolor");
673   -
674   -
  673 + $("#OnIdentify").removeClass('annotationtoolbartab');
  674 + $("#DrawMode").addClass('annotationtoolbartab');
  675 + $rootScope.isAnnotaionToolBarDrawingModeActive = true;
675 676 }
676 677  
677 678  
... ... @@ -687,6 +688,9 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
687 688 $('.btnCursor').removeClass('activebtncolor');
688 689 $(".btn-annotation").removeClass("activebtncolor");
689 690 $(".btn-annotation-pin").addClass("activebtncolor");
  691 + $("#OnIdentify").removeClass('annotationtoolbartab');
  692 + $("#DrawMode").addClass('annotationtoolbartab');
  693 + $rootScope.isAnnotaionToolBarDrawingModeActive = true;
690 694 }
691 695  
692 696 $rootScope.Cursor = function () {
... ... @@ -696,6 +700,9 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
696 700 $(".btn-annotation").removeClass("activebtncolor");
697 701 // $("#" + e.currentTarget.id).removeClass("activebtncolor");
698 702 $('.btnCursor').addClass('activebtncolor');
  703 + $("#OnIdentify").removeClass('annotationtoolbartab');
  704 + $("#DrawMode").addClass('annotationtoolbartab');
  705 + $rootScope.isAnnotaionToolBarDrawingModeActive = true;
699 706 }
700 707  
701 708  
... ... @@ -708,10 +715,13 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
708 715 $('.btnCursor').removeClass('activebtncolor');
709 716 $(".btn-annotation").removeClass("activebtncolor");
710 717 $(".btn-annotation-rectangle").addClass("activebtncolor");
  718 + $("#OnIdentify").removeClass('annotationtoolbartab');
  719 + $("#DrawMode").addClass('annotationtoolbartab');
  720 + $rootScope.isAnnotaionToolBarDrawingModeActive = true;
711 721 }
712 722  
713 723 $rootScope.paintBrush = function () {
714   - $rootScope.isAnnotaionToolBarDrawingModeActive = false;
  724 + $rootScope.isAnnotaionToolBarDrawingModeActive = true;
715 725 if ($rootScope.disableAnnotationtoolOnListManager == true) {
716 726 $rootScope.switchCanvas();
717 727 var canvasPaintZindex = $('#canvasPaint').css("z-index"); //x
... ... @@ -764,7 +774,8 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
764 774 $('.btnCursor').removeClass('activebtncolor');
765 775 $(".btn-annotation").removeClass("activebtncolor");
766 776 $(".btn-annotation-brush").addClass("activebtncolor");
767   -
  777 + $("#OnIdentify").removeClass('annotationtoolbartab');
  778 + $("#DrawMode").addClass('annotationtoolbartab');
768 779 }
769 780  
770 781 $rootScope.switchCanvasToPaintCanvas = function (e) {
... ... @@ -789,6 +800,9 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
789 800 $('.btnCursor').removeClass('activebtncolor');
790 801 $(".btn-annotation").removeClass("activebtncolor");
791 802 $(".btn-annotation-circle").addClass("activebtncolor");
  803 + $("#OnIdentify").removeClass('annotationtoolbartab');
  804 + $("#DrawMode").addClass('annotationtoolbartab');
  805 + $rootScope.isAnnotaionToolBarDrawingModeActive = true;
792 806 }
793 807  
794 808 $rootScope.DrawArrow = function (e) {
... ... @@ -800,6 +814,9 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
800 814 $('.btnCursor').removeClass('activebtncolor');
801 815 $(".btn-annotation").removeClass("activebtncolor");
802 816 $(".btn-annotation-arrow").addClass("activebtncolor");
  817 + $("#OnIdentify").removeClass('annotationtoolbartab');
  818 + $("#DrawMode").addClass('annotationtoolbartab');
  819 + $rootScope.isAnnotaionToolBarDrawingModeActive = true;
803 820 }
804 821 $rootScope.DrawText = function () {
805 822  
... ... @@ -812,6 +829,9 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
812 829 $('.btnCursor').removeClass('activebtncolor');
813 830 $(".btn-annotation").removeClass("activebtncolor");
814 831 $(".btn-annotation-Text").addClass("activebtncolor");
  832 + $("#OnIdentify").removeClass('annotationtoolbartab');
  833 + $("#DrawMode").addClass('annotationtoolbartab');
  834 + $rootScope.isAnnotaionToolBarDrawingModeActive = true;
815 835 }
816 836  
817 837 $rootScope.DrawPolygon = function () {
... ... @@ -819,6 +839,9 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
819 839 $("#canvasPaint").css("display", "block");
820 840 $("#canvas").css("display", "block");
821 841 $rootScope.shapeType = "DrawPolygon";
  842 + $("#OnIdentify").removeClass('annotationtoolbartab');
  843 + $("#DrawMode").addClass('annotationtoolbartab');
  844 + $rootScope.isAnnotaionToolBarDrawingModeActive = true;
822 845 }
823 846  
824 847  
... ... @@ -841,6 +864,8 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
841 864 $('.btnCursor').removeClass('activebtncolor');
842 865 $(".btn-annotation").removeClass("activebtncolor");
843 866 $(".btn-annotation-erase").addClass("activebtncolor");
  867 + $("#OnIdentify").removeClass('annotationtoolbartab');
  868 + $("#DrawMode").addClass('annotationtoolbartab');
844 869  
845 870 }
846 871  
... ...