ADAM / AIAHTML5

Commit ac503277424e62fc6257e0272924adc7c0731d25

Authored by unknown
1 parent 00de6fce

DA > Annotation search from Search List is not highlight in the List manager.

Inline Side-by-side
Showing 3 changed files with 117 additions and 94 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @ac50327
@@ -6820,6 +6820,13 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -6820,6 +6820,13 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
6820 6820
6821 $scope.jumpToTerm = function (event) { 6821 $scope.jumpToTerm = function (event) {
6822 6822
  6823 + $rootScope.searchSelectedText = $('#'+ event.currentTarget.id).text();
  6824 + $('#termList option[selected="selected"]').prop("selected", false);
  6825 + $('#termList option[value="' + $rootScope.searchSelectedText + '"]').prop("selected", true);
  6826 + $("#termList").find("option").css({ "background-color": "#ffffff", "color": "#000000" });
  6827 + $('#termList option[value="' + $rootScope.searchSelectedText + '"]').css({ "background-color": "#3399FF", "color": "#ffffff" });
  6828 +
  6829 +
6823 $rootScope.isLoading = true; 6830 $rootScope.isLoading = true;
6824 6831
6825 $('#spinner').css('visibility', 'visible'); 6832 $('#spinner').css('visibility', 'visible');
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @ac50327
@@ -816,108 +816,117 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", @@ -816,108 +816,117 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
816 } 816 }
817 817
818 $rootScope.PinFn = function (canvasId, PinNumber, offsetX1, offsetY1, x, y, PinArcNumber) { 818 $rootScope.PinFn = function (canvasId, PinNumber, offsetX1, offsetY1, x, y, PinArcNumber) {
819 - var radial = $('#canvas').createGradient({  
820 - x1: 50, y1: 50,  
821 - x2: 50, y2: 50,  
822 - r1: 10, r2: 30,  
823 - c1: 'rgba(100, 50, 0,0)',  
824 - c2: 'grey'  
825 - });  
826 - $(canvasId).drawLine({  
827 - draggable: true,  
828 - layer: true,  
829 - name: "Pin_" + PinNumber,  
830 - groups: ["Pin_" + PinNumber],  
831 - dragGroups: ["Pin_" + PinNumber],  
832 - strokeStyle: 'black',  
833 - strokeWidth: 2,  
834 - x1: offsetX1, y1: offsetY1,  
835 - x2: x, y2: y,  
836 -  
837 - click: function (layer) {  
838 -  
839 - $rootScope.shapeTypePin = "Pin";  
840 - $rootScope.canvasLayerNameCollection = [];  
841 - var pinLine_layer = layer.name;  
842 - var pinLine_layer_split = pinLine_layer.split("_");  
843 - var pinArcName = "ArcPin_";  
844 - var pinResult = pinArcName.concat(pinLine_layer_split[1]);  
845 -  
846 - $rootScope.canvasLayerNameCollection.push({ pinName: layer.name, ArcName: pinResult });  
847 -  
848 - $(canvasId).setLayer(layer.name, {  
849 - handle: {  
850 - type: 'arc',  
851 - fillStyle: '#fff',  
852 - strokeStyle: '#c33',  
853 - strokeWidth: 2,  
854 - // width: 5, height: 5,  
855 - radius: 3  
856 - }  
857 - }).drawLayers();  
858 -  
859 -  
860 - },  
861 - mouseout: function (layer) {  
862 -  
863 - $rootScope.canvasLayerNameCollection = [];  
864 - $(canvasId).setLayer(layer.name, {  
865 - handle: {  
866 - type: 'arc',  
867 - fillStyle: '#fff',  
868 - strokeStyle: '#c33',  
869 - strokeWidth: 0,  
870 - // width: 0, height: 0,  
871 - radius: 0  
872 - }  
873 819
874 - }).drawLayers(); 820 + var xAxisPinDiff = offsetX1 - x;
  821 + var yAxisPinDiff = offsetY1 - y;
  822 + if (xAxisPinDiff != 0 && yAxisPinDiff != 0) {
875 823
876 - },  
877 - mouseover: function (layer) {  
878 824
  825 + var radial = $('#canvas').createGradient({
  826 + x1: 50, y1: 50,
  827 + x2: 50, y2: 50,
  828 + r1: 10, r2: 30,
  829 + c1: 'rgba(100, 50, 0,0)',
  830 + c2: 'grey'
  831 + });
  832 + $(canvasId).drawLine({
  833 + draggable: true,
  834 + layer: true,
  835 + name: "Pin_" + PinNumber,
  836 + groups: ["Pin_" + PinNumber],
  837 + dragGroups: ["Pin_" + PinNumber],
  838 + strokeStyle: 'black',
  839 + strokeWidth: 2,
  840 + x1: offsetX1, y1: offsetY1,
  841 + x2: x, y2: y,
  842 +
  843 + click: function (layer) {
  844 +
  845 + $rootScope.shapeTypePin = "Pin";
  846 + $rootScope.canvasLayerNameCollection = [];
  847 + var pinLine_layer = layer.name;
  848 + var pinLine_layer_split = pinLine_layer.split("_");
  849 + var pinArcName = "ArcPin_";
  850 + var pinResult = pinArcName.concat(pinLine_layer_split[1]);
  851 +
  852 + $rootScope.canvasLayerNameCollection.push({ pinName: layer.name, ArcName: pinResult });
  853 +
  854 + $(canvasId).setLayer(layer.name, {
  855 + handle: {
  856 + type: 'arc',
  857 + fillStyle: '#fff',
  858 + strokeStyle: '#c33',
  859 + strokeWidth: 2,
  860 + // width: 5, height: 5,
  861 + radius: 3
  862 + }
  863 + }).drawLayers();
  864 +
  865 +
  866 + },
  867 + mouseout: function (layer) {
  868 +
  869 + $rootScope.canvasLayerNameCollection = [];
  870 + $(canvasId).setLayer(layer.name, {
  871 + handle: {
  872 + type: 'arc',
  873 + fillStyle: '#fff',
  874 + strokeStyle: '#c33',
  875 + strokeWidth: 0,
  876 + // width: 0, height: 0,
  877 + radius: 0
  878 + }
  879 +
  880 + }).drawLayers();
  881 +
  882 + },
  883 + mouseover: function (layer) {
  884 +
  885 +
  886 + $(canvasId).setLayer(layer.name, {
  887 + handle: {
  888 + type: 'arc',
  889 + fillStyle: '#fff',
  890 + strokeStyle: '#c33',
  891 + strokeWidth: 2,
  892 + // width: 5, height: 5,
  893 + radius: 3
  894 + }
  895 + }).drawLayers();
879 896
880 - $(canvasId).setLayer(layer.name, {  
881 - handle: {  
882 - type: 'arc',  
883 - fillStyle: '#fff',  
884 - strokeStyle: '#c33',  
885 - strokeWidth: 2,  
886 - // width: 5, height: 5,  
887 - radius: 3  
888 - }  
889 - }).drawLayers(); 897 + }
  898 + }).drawArc({
  899 + draggable: true,
  900 + name: "ArcPin_" + PinArcNumber,
  901 + // name: "Pin_" + $rootScope.resetPin,
  902 + layer: true,
  903 + groups: ["Pin_" + PinNumber],
  904 + dragGroups: ["Pin_" + PinNumber],
  905 + strokeStyle: 'grey',
  906 + strokeWidth: 2,
  907 + fillStyle: radial,
  908 + x: offsetX1, y: offsetY1,
  909 + radius: 5,
  910 + //handle: {
  911 + // type: 'arc',
  912 + // fillStyle: '#fff',
  913 + // strokeStyle: '#c33',
  914 + // strokeWidth: 2,
  915 + // radius: 3
  916 + //},
890 917
891 - }  
892 - }).drawArc({  
893 - draggable: true,  
894 - name: "ArcPin_" + PinArcNumber,  
895 - // name: "Pin_" + $rootScope.resetPin,  
896 - layer: true,  
897 - groups: ["Pin_" + PinNumber],  
898 - dragGroups: ["Pin_" + PinNumber],  
899 - strokeStyle: 'grey',  
900 - strokeWidth: 2,  
901 - fillStyle: radial,  
902 - x: offsetX1, y: offsetY1,  
903 - radius: 5,  
904 - //handle: {  
905 - // type: 'arc',  
906 - // fillStyle: '#fff',  
907 - // strokeStyle: '#c33',  
908 - // strokeWidth: 2,  
909 - // radius: 3  
910 - //}, 918 + add: function (layer) {
911 919
912 - add: function (layer) { 920 + $rootScope.PinArcNumber = layer.name;
  921 + // $scope.arr = [];
913 922
914 - $rootScope.PinArcNumber = layer.name;  
915 - // $scope.arr = [];  
916 923
  924 + },
917 925
918 - }, 926 + }).drawLayers();
919 927
920 - }).drawLayers(); 928 + }
  929 +
921 $('.btnCursor').trigger('click'); 930 $('.btnCursor').trigger('click');
922 $(".btn-annotation").removeClass("activebtncolor"); 931 $(".btn-annotation").removeClass("activebtncolor");
923 $('.btnCursor').addClass('activebtncolor'); 932 $('.btnCursor').addClass('activebtncolor');
@@ -1895,6 +1904,13 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", @@ -1895,6 +1904,13 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
1895 $rootScope.islistManagerEventAlredayDispachted = true; 1904 $rootScope.islistManagerEventAlredayDispachted = true;
1896 1905
1897 $rootScope.$broadcast('listManagerEvent', true); 1906 $rootScope.$broadcast('listManagerEvent', true);
  1907 +
  1908 + $('#termList option[selected="selected"]').prop("selected", false);
  1909 + $('#termList option[value="' + $rootScope.searchSelectedText + '"]').prop("selected", true);
  1910 + $("#termList").find("option").css({ "background-color": "#ffffff", "color": "#000000" });
  1911 + $('#termList option[value="' + $rootScope.searchSelectedText + '"]').css({ "background-color": "#3399FF", "color": "#ffffff" });
  1912 +
  1913 +
1898 } 1914 }
1899 1915
1900 $rootScope.CloseListManager = function () { 1916 $rootScope.CloseListManager = function () {
400-SOURCECODE/AIAHTML5.Web/index.html
  View file @ac50327
@@ -49,8 +49,8 @@ @@ -49,8 +49,8 @@
49 49
50 50
51 #termList option:hover { 51 #termList option:hover {
52 - background-color: #3399FF;  
53 - color:#fff; 52 + background-color: #3399FF !important;
  53 + color: #fff !important;
54 } 54 }
55 55
56 56