ADAM / AIAHTML5

Commit 49a5ff48e5878885e7b578f4a6af46ee21f08ee0

Authored by Nikita Kulshreshtha
2 parents a7b44720 7c389eec

Merge branch 'AnnotationToolIdentity' into Develop

Inline Side-by-side
Showing 2 changed files with 41 additions and 9 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @49a5ff4
... ... @@ -7471,6 +7471,22 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
7471 7471 }
7472 7472  
7473 7473  
  7474 + $rootScope.mouseMoveToolTip = function (toolTipTopPosition, toolTipLeftPosition, toolTipWidth, toolTipText) {
  7475 +
  7476 + $("#cursor-block").addClass("custom-tooltip-annotation-toolbar");
  7477 + $(".custom-tooltip-annotation-toolbar").css({ "display": "block", "top": toolTipTopPosition + "px", "width": toolTipWidth + "px", "left": toolTipLeftPosition + "px" });
  7478 + $("#cursor-block").html(toolTipText);
  7479 + }
  7480 +
  7481 + $rootScope.mouseOutToolTip = function () {
  7482 +
  7483 + $(".custom-tooltip-annotation-toolbar").css('display', 'none');
  7484 + $("#cursor-block").removeClass("custom-tooltip-annotation-toolbar");
  7485 + $("#cursor-block").html();
  7486 +
  7487 + }
  7488 +
  7489 +
7474 7490  
7475 7491 }]
7476 7492  
... ...
400-SOURCECODE/AIAHTML5.Web/index.html
  View file @49a5ff4
... ... @@ -136,6 +136,21 @@
136 136 border-radius: 0;
137 137 }
138 138  
  139 + .custom-tooltip-annotation-toolbar {
  140 + background-color: #fff;
  141 + border: 0 none;
  142 + color: #000;
  143 + opacity: 0.9;
  144 + padding: 3px 0;
  145 + position: absolute;
  146 + text-align: center;
  147 + display: none;
  148 + z-index: 10000;
  149 + border: 1px solid #000;
  150 + color: #000;
  151 + border-radius: 0;
  152 + }
  153 +
139 154 </style>
140 155  
141 156  
... ... @@ -491,18 +506,19 @@
491 506 <div class="col-sm-12">
492 507 <h5>Tools</h5>
493 508 <div class="well well-popup">
494   - <div class="" role="" aria-label="...">
  509 + <div class="" aria-label="...">
495 510 <div class="" role="group" align="center">
496   - <button type="button" class="btn btn-black-annotation btn-xs mrgnBtm5 btnCursor" data-toggle="tooltip" data-placement="top" title="Select Shapes(S)" ng-click="Cursor()"><img src="content/images/icon-identity.png" alt="" title=""></button>
497   - <button type="button" class="btn btn-black-annotation btn-xs mrgnBtm5 btn-annotation btn-annotation-pin" data-toggle="tooltip" data-placement="top" title="Draw Pin" ng-click="DrPin($event)"><img src="content/images/draw-pin.png" alt="" title=""></button>
498   - <button type="button" class="btn btn-black-annotation btn-xs mrgnBtm5 btn-annotation btn-annotation-arrow" data-toggle="tooltip" data-placement="top" title="Draw Arrow" ng-click="DrawArrow($event)"><img src="content/images/draw-arrow.png" alt="" title=""></button>
499   - <button type="button" class="btn btn-black-annotation btn-xs mrgnBtm5 btn-annotation btn-annotation-Text" data-toggle="tooltip" data-placement="top" title="Draw Text" ng-click="DrawText($event)"><img src="content/images/draw-text.png" alt="" title=""></button>
  511 + <div id="cursor-block" style="display: none; font-size:13px;"></div>
  512 + <button type="button" class="btn btn-black-annotation btn-xs mrgnBtm5 btnCursor" ng-mouseover="mouseMoveToolTip(75, 60, 120, 'Select Cursor(s)')" ng-mouseleave="mouseOutToolTip()" ng-click="Cursor()"><img src="content/images/icon-identity.png" alt="" title=""></button>
  513 + <button type="button" class="btn btn-black-annotation btn-xs mrgnBtm5 btn-annotation btn-annotation-pin" ng-mouseover="mouseMoveToolTip(75, 100, 120, 'Draw Pin')" ng-mouseleave="mouseOutToolTip()" ng-click="DrPin($event)"><img src="content/images/draw-pin.png" alt="" title=""></button>
  514 + <button type="button" class="btn btn-black-annotation btn-xs mrgnBtm5 btn-annotation btn-annotation-arrow" ng-mouseover="mouseMoveToolTip(75, 120, 120, 'Draw Arrow')" ng-mouseleave="mouseOutToolTip()" ng-click="DrawArrow($event)"><img src="content/images/draw-arrow.png" alt="" title=""></button>
  515 + <button type="button" class="btn btn-black-annotation btn-xs mrgnBtm5 btn-annotation btn-annotation-Text" ng-mouseover="mouseMoveToolTip(75, 140, 120, 'Draw Text')" ng-mouseleave="mouseOutToolTip()" ng-click="DrawText($event)"><img src="content/images/draw-text.png" alt="" title=""></button>
500 516 </div>
501 517 <div class="" role="group" align="center">
502   - <button type="button" class="btn btn-black-annotation btn-xs btn-annotation btn-annotation-line" data-toggle="tooltip" data-placement="top" title="Draw Line" ng-click="DrLine($event)"><img src="content/images/draw-line.png" alt="" title=""></button>
503   - <button type="button" class="btn btn-black-annotation btn-xs btn-annotation btn-annotation-rectangle" data-toggle="tooltip" data-placement="top" title="Draw Rectangle" ng-click="DrawRectangle($event)"><img src="content/images/draw-rec.png" alt="" title=""></button>
504   - <button type="button" class="btn btn-black-annotation btn-xs btn-annotation btn-annotation-circle" data-toggle="tooltip" data-placement="top" title="Draw Circle" ng-click="DrawCircle($event)"><img src="content/images/draw-cir.png" alt="" title=""></button>
505   - <button type="button" class="btn btn-black-annotation btn-xs btn-annotation" data-toggle="tooltip" data-placement="top" title="Draw Polygon" ng-click="DrawPolygon($event)"><img src="content/images/draw-poly.png" alt="" title=""></button>
  518 + <button type="button" class="btn btn-black-annotation btn-xs btn-annotation btn-annotation-line" ng-mouseover="mouseMoveToolTip(95, 60, 120, 'Draw Line')" ng-mouseleave="mouseOutToolTip()" ng-click="DrLine($event)"><img src="content/images/draw-line.png" alt="" title=""></button>
  519 + <button type="button" class="btn btn-black-annotation btn-xs btn-annotation btn-annotation-rectangle" ng-mouseover="mouseMoveToolTip(95, 100, 120, 'Draw Rectangle')" ng-mouseleave="mouseOutToolTip()" ng-click="DrawRectangle($event)"><img src="content/images/draw-rec.png" alt="" title=""></button>
  520 + <button type="button" class="btn btn-black-annotation btn-xs btn-annotation btn-annotation-circle" ng-mouseover="mouseMoveToolTip(95, 120, 120, 'Draw Circle')" ng-mouseleave="mouseOutToolTip()" ng-click="DrawCircle($event)"><img src="content/images/draw-cir.png" alt="" title=""></button>
  521 + <button type="button" class="btn btn-black-annotation btn-xs btn-annotation" ng-mouseover="mouseMoveToolTip(95, 140, 120, 'Draw Polygon')" ng-mouseleave="mouseOutToolTip()" ng-click="DrawPolygon($event)"><img src="content/images/draw-poly.png" alt="" title=""></button>
506 522 </div>
507 523 </div>
508 524 </div>
... ...