ADAM / AIAHTML5

Commit 7ee514de6daafeb266fd70edd81b8fd60d58ef20

Authored by Nikita Kulshreshtha
2 parents 14286c9c 29c622f5

Merge branch 'bugs' into Develop

Inline Side-by-side
Showing 3 changed files with 65 additions and 5 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @7ee514d
@@ -120,13 +120,16 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", @@ -120,13 +120,16 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
120 $rootScope.isAnnotationWindowOpen = true; 120 $rootScope.isAnnotationWindowOpen = true;
121 $(".annotationTollbar").css("display", "block"); 121 $(".annotationTollbar").css("display", "block");
122 $rootScope.$broadcast('annotationToolEvent', true); 122 $rootScope.$broadcast('annotationToolEvent', true);
123 - 123 + $("#canvasPaint").css("display", "none");
  124 + $("#canvas").css("display", "none");
124 } 125 }
125 126
126 $rootScope.CloseAnnotationTool = function () { 127 $rootScope.CloseAnnotationTool = function () {
127 console.log('close') 128 console.log('close')
128 $(".annotationTollbar").css("display", "none"); 129 $(".annotationTollbar").css("display", "none");
129 $rootScope.isAnnotationWindowClose = true; 130 $rootScope.isAnnotationWindowClose = true;
  131 + $("#canvasPaint").css("display", "none");
  132 + $("#canvas").css("display", "none");
130 } 133 }
131 134
132 $rootScope.OnIdentifyClick = function () { 135 $rootScope.OnIdentifyClick = function () {
@@ -188,6 +191,8 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", @@ -188,6 +191,8 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
188 } 191 }
189 192
190 $rootScope.DrawRectangle = function (e) { 193 $rootScope.DrawRectangle = function (e) {
  194 + $("#canvasPaint").css("display", "block");
  195 + $("#canvas").css("display", "block");
191 $rootScope.switchCanvas(); 196 $rootScope.switchCanvas();
192 $rootScope.shapeType = "Rectangle"; 197 $rootScope.shapeType = "Rectangle";
193 $('.btnCursor').removeClass('activebtncolor'); 198 $('.btnCursor').removeClass('activebtncolor');
@@ -197,6 +202,8 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", @@ -197,6 +202,8 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
197 $rootScope.paintBrush = function () { 202 $rootScope.paintBrush = function () {
198 // debugger; 203 // debugger;
199 // $('.btnCursor').addClass('activebtncolor'); 204 // $('.btnCursor').addClass('activebtncolor');
  205 + $("#canvasPaint").css("display", "block");
  206 + $("#canvas").css("display", "block");
200 $rootScope.switchCanvasToPaintCanvas(); 207 $rootScope.switchCanvasToPaintCanvas();
201 $rootScope.shapeType = "FreeStylePaint"; 208 $rootScope.shapeType = "FreeStylePaint";
202 var a = $("#amount-2").val(); 209 var a = $("#amount-2").val();
@@ -230,6 +237,8 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", @@ -230,6 +237,8 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
230 } 237 }
231 238
232 $rootScope.DrawCircle = function (e) { 239 $rootScope.DrawCircle = function (e) {
  240 + $("#canvasPaint").css("display", "block");
  241 + $("#canvas").css("display", "block");
233 $rootScope.switchCanvas(); 242 $rootScope.switchCanvas();
234 $rootScope.shapeType = "Circle"; 243 $rootScope.shapeType = "Circle";
235 $('.btnCursor').removeClass('activebtncolor'); 244 $('.btnCursor').removeClass('activebtncolor');
@@ -238,6 +247,8 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", @@ -238,6 +247,8 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
238 } 247 }
239 248
240 $rootScope.DrawArrow = function (e) { 249 $rootScope.DrawArrow = function (e) {
  250 + $("#canvasPaint").css("display", "block");
  251 + $("#canvas").css("display", "block");
241 $rootScope.switchCanvas(); 252 $rootScope.switchCanvas();
242 $rootScope.shapeType = "Arrow"; 253 $rootScope.shapeType = "Arrow";
243 $('.btnCursor').removeClass('activebtncolor'); 254 $('.btnCursor').removeClass('activebtncolor');
@@ -245,6 +256,8 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", @@ -245,6 +256,8 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
245 $(".btn-annotation-arrow").addClass("activebtncolor"); 256 $(".btn-annotation-arrow").addClass("activebtncolor");
246 } 257 }
247 $rootScope.DrawText = function () { 258 $rootScope.DrawText = function () {
  259 + $("#canvasPaint").css("display", "block");
  260 + $("#canvas").css("display", "block");
248 $rootScope.switchCanvas(); 261 $rootScope.switchCanvas();
249 262
250 $rootScope.shapeType = "TextArea"; 263 $rootScope.shapeType = "TextArea";
@@ -256,6 +269,8 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", @@ -256,6 +269,8 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
256 } 269 }
257 270
258 $rootScope.DrawPolygon = function () { 271 $rootScope.DrawPolygon = function () {
  272 + $("#canvasPaint").css("display", "block");
  273 + $("#canvas").css("display", "block");
259 $rootScope.shapeType = "DrawPolygon"; 274 $rootScope.shapeType = "DrawPolygon";
260 275
261 } 276 }
400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html
  View file @7ee514d
@@ -29,7 +29,7 @@ @@ -29,7 +29,7 @@
29 <!--<li><a href="#" ng-click="ShowListManager()">List Manager</a></li>--> 29 <!--<li><a href="#" ng-click="ShowListManager()">List Manager</a></li>-->
30 30
31 <li><a href="#" ng-click="ShowListManager()">List Manager</a></li> 31 <li><a href="#" ng-click="ShowListManager()">List Manager</a></li>
32 - <li><a href="#">Annotation Toolbar</a></li> 32 + <li><a href="#" ng-click="ShowAnnotationWindow()">Annotation Toolbar</a></li>
33 <li><a href="#">Add to Existing Curriculum</a></li> 33 <li><a href="#">Add to Existing Curriculum</a></li>
34 <li><a data-toggle="modal" data-target="#modal-settings" class="cursor-pointer">Settings</a></li> 34 <li><a data-toggle="modal" data-target="#modal-settings" class="cursor-pointer">Settings</a></li>
35 <li role="separator" class="divider"></li> 35 <li role="separator" class="divider"></li>
400-SOURCECODE/AIAHTML5.Web/index.html
  View file @7ee514d
@@ -56,6 +56,24 @@ @@ -56,6 +56,24 @@
56 border-color: #1B92D0 !important; 56 border-color: #1B92D0 !important;
57 color: #ffffff !important; 57 color: #ffffff !important;
58 }*/ 58 }*/
  59 +
  60 + .custom-tooltip-annotation {
  61 + background-color: #fff;
  62 + border: 0 none;
  63 + color: #000;
  64 + left: -52px;
  65 + opacity: 0.9;
  66 + padding: 3px 0;
  67 + position: absolute;
  68 + text-align: center;
  69 + top: 41px;
  70 + width: 120px;
  71 + display: none;
  72 + z-index: 10000;
  73 + border: 1px solid #000;
  74 + color: #000;
  75 + border-radius: 0;
  76 + }
59 </style> 77 </style>
60 78
61 79
@@ -396,11 +414,13 @@ @@ -396,11 +414,13 @@
396 <h5>Mode</h5> 414 <h5>Mode</h5>
397 415
398 <div class="btn-group btn-group-justified" role="group" aria-label="..."> 416 <div class="btn-group btn-group-justified" role="group" aria-label="...">
399 - <div class="btn-group" role="group">  
400 - <button type="button" class="btn btn-sm btn-success" ng-click="OnIdentifyClick()">Identify</button> 417 + <div class="btn-group" role="group" tooltip>
  418 + <div id="identify-block" style="display: none; font-size:13px;">Identify Mode</div>
  419 + <button id="OnIdentify" type="button" class="btn btn-sm btn-success" ng-click="OnIdentifyClick()">Identify</button>
401 </div> 420 </div>
402 <div class="btn-group" role="group"> 421 <div class="btn-group" role="group">
403 - <button type="button" class="btn btn-sm btn-success" ng-click="DrawingMode()">Draw</button> 422 + <div id="draw-block" style="display: none; font-size: 13px;">Draw Mode</div>
  423 + <button id="DrawMode" type="button" ng-click="DrawingMode()" class="btn btn-sm btn-success">Draw</button>
404 </div> 424 </div>
405 </div> 425 </div>
406 426
@@ -1326,7 +1346,32 @@ @@ -1326,7 +1346,32 @@
1326 1346
1327 1347
1328 1348
  1349 + <script>
  1350 + $(function () {
  1351 +
  1352 +
  1353 + $("#OnIdentify").on('mouseover', function () {
  1354 + $("#identify-block").addClass("custom-tooltip-annotation");
  1355 + $(".custom-tooltip-annotation").css('display', 'block');
  1356 + }).on('mouseout', function () {
  1357 + // $("#identify-block").removeClass("custom-tooltip-annotation");
  1358 + $(".custom-tooltip-annotation").css('display', 'none');
  1359 + $("#identify-block").removeClass("custom-tooltip-annotation");
  1360 + });
  1361 +
  1362 +
  1363 + $("#DrawMode").on('mouseover', function () {
  1364 + $("#draw-block").addClass("custom-tooltip-annotation");
  1365 + $(".custom-tooltip-annotation").css('display', 'block');
  1366 +
  1367 + }).on('mouseout', function () {
  1368 +
  1369 + $(".custom-tooltip-annotation").css('display', 'none');
  1370 + $("#draw-block").removeClass("custom-tooltip-annotation");
  1371 + });
1329 1372
  1373 + });
  1374 + </script>
1330 1375
1331 1376
1332 1377