ADAM / AIAHTML5

Commit 29c622f5961e95e37d4475b58d2eff6d9d2b0d34

Authored by unknown
1 parent 768e53e6

Commit changes for Issue 

Issue #7184:User is unable to select any annotation from an image
Inline Side-by-side
Showing 2 changed files with 17 additions and 2 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @29c622f
... ... @@ -120,13 +120,16 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
120 120 $rootScope.isAnnotationWindowOpen = true;
121 121 $(".annotationTollbar").css("display", "block");
122 122 $rootScope.$broadcast('annotationToolEvent', true);
123   -
  123 + $("#canvasPaint").css("display", "none");
  124 + $("#canvas").css("display", "none");
124 125 }
125 126  
126 127 $rootScope.CloseAnnotationTool = function () {
127 128 console.log('close')
128 129 $(".annotationTollbar").css("display", "none");
129 130 $rootScope.isAnnotationWindowClose = true;
  131 + $("#canvasPaint").css("display", "none");
  132 + $("#canvas").css("display", "none");
130 133 }
131 134  
132 135 $rootScope.OnIdentifyClick = function () {
... ... @@ -188,6 +191,8 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
188 191 }
189 192  
190 193 $rootScope.DrawRectangle = function (e) {
  194 + $("#canvasPaint").css("display", "block");
  195 + $("#canvas").css("display", "block");
191 196 $rootScope.switchCanvas();
192 197 $rootScope.shapeType = "Rectangle";
193 198 $('.btnCursor').removeClass('activebtncolor');
... ... @@ -197,6 +202,8 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
197 202 $rootScope.paintBrush = function () {
198 203 // debugger;
199 204 // $('.btnCursor').addClass('activebtncolor');
  205 + $("#canvasPaint").css("display", "block");
  206 + $("#canvas").css("display", "block");
200 207 $rootScope.switchCanvasToPaintCanvas();
201 208 $rootScope.shapeType = "FreeStylePaint";
202 209 var a = $("#amount-2").val();
... ... @@ -230,6 +237,8 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
230 237 }
231 238  
232 239 $rootScope.DrawCircle = function (e) {
  240 + $("#canvasPaint").css("display", "block");
  241 + $("#canvas").css("display", "block");
233 242 $rootScope.switchCanvas();
234 243 $rootScope.shapeType = "Circle";
235 244 $('.btnCursor').removeClass('activebtncolor');
... ... @@ -238,6 +247,8 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
238 247 }
239 248  
240 249 $rootScope.DrawArrow = function (e) {
  250 + $("#canvasPaint").css("display", "block");
  251 + $("#canvas").css("display", "block");
241 252 $rootScope.switchCanvas();
242 253 $rootScope.shapeType = "Arrow";
243 254 $('.btnCursor').removeClass('activebtncolor');
... ... @@ -245,6 +256,8 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
245 256 $(".btn-annotation-arrow").addClass("activebtncolor");
246 257 }
247 258 $rootScope.DrawText = function () {
  259 + $("#canvasPaint").css("display", "block");
  260 + $("#canvas").css("display", "block");
248 261 $rootScope.switchCanvas();
249 262  
250 263 $rootScope.shapeType = "TextArea";
... ... @@ -256,6 +269,8 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
256 269 }
257 270  
258 271 $rootScope.DrawPolygon = function () {
  272 + $("#canvasPaint").css("display", "block");
  273 + $("#canvas").css("display", "block");
259 274 $rootScope.shapeType = "DrawPolygon";
260 275  
261 276 }
... ...
400-SOURCECODE/AIAHTML5.Web/index.html
  View file @29c622f
... ... @@ -419,7 +419,7 @@
419 419 </div>
420 420 <div class="btn-group" role="group">
421 421 <div id="draw-block" style="display: none; font-size: 13px;">Draw Mode</div>
422   - <button id="DrawMode" type="button" class="btn btn-sm btn-success">Draw</button>
  422 + <button id="DrawMode" type="button" ng-click="DrawingMode()" class="btn btn-sm btn-success">Draw</button>
423 423 </div>
424 424 </div>
425 425  
... ...