ADAM / AIAHTML5

Commit 021c221b5292b5fd8fbfac6d0f60645103dc9e13

Authored by unknown
1 parent 19781da7

Comitt Changes after changing variable name

Inline Side-by-side
Showing 1 changed file with 23 additions and 18 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @021c221
... ... @@ -48,6 +48,22 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
48 48 $rootScope.menuLabExer;
49 49 $rootScope.menuLabExer = 0;
50 50  
  51 +
  52 + $rootScope.fontSizes;
  53 + $rootScope.fontWeight;
  54 + $rootScope.fontStyle;
  55 + $rootScope.textAlignmt;
  56 + $rootScope.fontColor;
  57 + $rootScope.underlineText;
  58 + $rootScope.textArea;
  59 + $rootScope.fontFamily;
  60 + $rootScope.TextPropertyArray = [];
  61 + $rootScope.modifySavedText = [];
  62 + $rootScope.TextRectangleArr = [];
  63 + $rootScope.rectDimension = [];
  64 +
  65 +
  66 +
51 67 $rootScope.$on("$locationChangeSuccess", function () {
52 68  
53 69 if (($location.url() == "/da-body-view") || ($location.url() == "/clinical-illustrations-detail") || ($location.url() == "/clinical-animations-detail")) {
... ... @@ -950,8 +966,8 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
950 966  
951 967 var RectNameArray = (layer.name).split("_");
952 968  
953   - var TextAreaRectName1 = "TextArea_";
954   - var TextAreaRectNameConcat = TextAreaRectName1.concat(RectNameArray[1]);
  969 + var TextAreaRectangleName = "TextArea_";
  970 + var TextAreaRectNameConcat = TextAreaRectangleName.concat(RectNameArray[1]);
955 971 $rootScope.TextAreaRectID = layer.name;
956 972 $rootScope.TextID = TextAreaRectNameConcat;
957 973  
... ... @@ -1071,8 +1087,8 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
1071 1087 $rootScope.PinNumber = 0;
1072 1088 $rootScope.PinArcNumber = 0;
1073 1089 $rootScope.ObjectIndex = 0;
1074   - $rootScope.Object1Index = 0;
1075   - $rootScope.Object2Index = 0;
  1090 + $rootScope.ArcObjectIndex = 0;
  1091 + $rootScope.PinObjectIndex = 0;
1076 1092 $rootScope.TextNumber = 0;
1077 1093 $rootScope.resetTextSave = 0;
1078 1094 $rootScope.ObjectIndexSave = 0;
... ... @@ -1137,8 +1153,8 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
1137 1153 // $scope.resetRect += 1;
1138 1154 break;
1139 1155 case "Pin":
1140   - $rootScope.PinNumber = $rootScope.Object2Index++;
1141   - $rootScope.PinArcNumber = $rootScope.Object1Index++;
  1156 + $rootScope.PinNumber = $rootScope.PinObjectIndex++;
  1157 + $rootScope.PinArcNumber = $rootScope.ArcObjectIndex++;
1142 1158 $rootScope.PinFn('#canvas', $rootScope.PinNumber, $rootScope.offsetX1, $rootScope.offsetY1, $rootScope.x, $rootScope.y, $rootScope.PinArcNumber);
1143 1159  
1144 1160 break;
... ... @@ -1161,18 +1177,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
1161 1177 }
1162 1178  
1163 1179  
1164   - $rootScope.fontSizes;
1165   - $rootScope.fontWeight;
1166   - $rootScope.fontStyle;
1167   - $rootScope.textAlignmt;
1168   - $rootScope.fontColor;
1169   - $rootScope.underlineText;
1170   - $rootScope.textArea;
1171   - $rootScope.fontFamily;
1172   - $rootScope.TextPropertyArray = [];
1173   - $rootScope.modifySavedText = [];
1174   - $rootScope.TextRectangleArr = [];
1175   - $rootScope.rectDimension = [];
  1180 +
1176 1181  
1177 1182  
1178 1183  
... ...