ADAM / AIAHTML5

Commit e8d6391d9044b15c03d93c37589d03956405193c

Authored by unknown
2 parents 7603f8a3 a6aad71e

Merge branch 'Develop' of http://52.6.196.163/ADAM/AIAHTML5 into Bug_CI_annotation

Inline Side-by-side
Showing 4 changed files with 135 additions and 47 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @e8d6391
... ... @@ -1380,6 +1380,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1380 1380 // $scope.createDynamicSpeechBubble(evt, annotationText, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top);
1381 1381 $scope.MultiLanguageAnnationArray = [];
1382 1382 $scope.MultiLanguageAnnationArray.push(annotationText);
  1383 +
1383 1384 $scope.createDynamicSpeechBubble(evt, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, true);
1384 1385 }
1385 1386 else {
... ... @@ -1395,6 +1396,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1395 1396 // $scope.createDynamicSpeechBubble(evt, annotationText, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top);
1396 1397 $scope.MultiLanguageAnnationArray = [];
1397 1398 $scope.MultiLanguageAnnationArray.push(annotationText);
  1399 +
  1400 +
1398 1401 $scope.createDynamicSpeechBubble(evt, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, true);
1399 1402 }
1400 1403 else {
... ... @@ -1402,6 +1405,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1402 1405 // $scope.createDynamicSpeechBubble(evt, annotationText, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top);
1403 1406 $scope.MultiLanguageAnnationArray = [];
1404 1407 $scope.MultiLanguageAnnationArray.push(annotationText);
  1408 +
  1409 +
1405 1410 $scope.createDynamicSpeechBubble(evt, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, true);
1406 1411 }
1407 1412  
... ... @@ -1461,6 +1466,22 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1461 1466 }
1462 1467 );
1463 1468  
  1469 + //-NIKI-for solving extarct issue 8286
  1470 +
  1471 + var imageCanvas = document.getElementById('imageCanvas' + bodyRegionId + '_MR');
  1472 +
  1473 + var width = imageCanvas.width;
  1474 + var ht = imageCanvas.height;
  1475 +
  1476 + var coloredCanvasContext = imageCanvas.getContext("2d");
  1477 + var coloredImageData = coloredCanvasContext.getImageData(0, 0, width, ht);
  1478 + var coloredImageDataVar = coloredImageData;
  1479 +
  1480 + $rootScope.coloredImageMRCanvasList[parseInt(bodyRegionId)] = coloredImageDataVar;
  1481 +
  1482 +
  1483 +
  1484 + //
1464 1485  
1465 1486 // console.log('$rootScope.isListManagerSelected= ' + $rootScope.isListManagerSelected + ' length= ' + $scope.ColoredImageSRC.length)
1466 1487  
... ... @@ -1717,6 +1738,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1717 1738 // $scope.createDynamicSpeechBubble(evt, annotationText, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top);
1718 1739 $scope.MultiLanguageAnnationArray = [];
1719 1740 $scope.MultiLanguageAnnationArray.push(annotationText);
  1741 +
1720 1742 $scope.createDynamicSpeechBubble(evt, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, true);
1721 1743 }
1722 1744 else {
... ... @@ -1752,6 +1774,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1752 1774 $scope.MultiLanguageAnnationArray.push(annotationText);
1753 1775  
1754 1776 console.log('3. annotationText: ' + annotationText + ' , length: ' + $scope.MultiLanguageAnnationArray.length);
  1777 +
1755 1778 $scope.createDynamicSpeechBubble(evt, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, true);
1756 1779 }
1757 1780  
... ... @@ -1797,6 +1820,21 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1797 1820 );
1798 1821  
1799 1822  
  1823 + //-NIKI-for solving extarct issue 8286
  1824 +
  1825 + var imageCanvas = document.getElementById('imageCanvas' + bodyRegionId);
  1826 +
  1827 + var width = imageCanvas.width;
  1828 + var ht = imageCanvas.height;
  1829 +
  1830 + var coloredCanvasContext = imageCanvas.getContext("2d");
  1831 + var coloredImageData = coloredCanvasContext.getImageData(0, 0, width, ht);
  1832 + var coloredImageDataVar = coloredImageData;
  1833 +
  1834 +
  1835 + $rootScope.coloredImageCanvasList[parseInt(bodyRegionId - 1)] = coloredImageDataVar;
  1836 + //
  1837 +
1800 1838 if (($scope.ColoredImageSRC != null || $scope.ColoredImageSRC != undefined)) {
1801 1839  
1802 1840 if ((($rootScope.viewOrientationId == '1') || ($rootScope.viewOrientationId == '4')) && ($scope.ColoredImageSRC.length == 9)) {
... ... @@ -2016,8 +2054,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2016 2054  
2017 2055  
2018 2056 grayCanvasContext.putImageData(updatedData, 0, 0);
2019   -
2020   -
  2057 +
  2058 +
2021 2059 //to resolve lateral arm black issue in highlight mode
2022 2060  
2023 2061 if ($rootScope.viewOrientationId == 5 && (bodyRegionId == 6 || bodyRegionId == 4)) {
... ... @@ -2748,7 +2786,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2748 2786  
2749 2787  
2750 2788 $('.dynCross').on('click', function (evt) {
2751   - $(this).parent().parent().parent().css('display', 'none');
  2789 + //$(this).parent().parent().parent().css('display', 'none');
  2790 + $(this).parent().parent().parent().remove();
2752 2791  
2753 2792 });
2754 2793  
... ... @@ -2757,9 +2796,12 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2757 2796  
2758 2797 else {
2759 2798 $scope.multiAnnotationIsON = false;
  2799 +
  2800 + //$(".com").css("display", "none");
  2801 + //$("#bord").css({ "width": "0px", "display": "none" });
  2802 + $(".com").remove();
  2803 + $("#bord").remove();
2760 2804  
2761   - $(".com").css("display", "none");
2762   - $("#bord").css({ "width": "0px", "display": "none" });
2763 2805 var sppechBubbleDotHTML = '<div id="dot" style="position:absolute;height:15px;width:35px;display:none;z-index:10000;border-top:2px solid #000;transform:rotate(40deg);-moz-transform:rotate(40deg);-o-transform:rotate(40deg);-ms-transform:rotate(40deg);-webkit-transform:rotate(40deg);"></div>'
2764 2806 + '<div id="sppeachBubble" style="height:auto!important;z-index:10000;margin-left:25px;border:1px solid #000;display:none;padding:5px 10px;position:absolute;color:#fff;text-align:left;font-size:12px;background-color:#19100e;border-radius:5px;-moz-border-radius:5px;-webkit-border-radius:5px;-o-border-radius:5px;-ms-border-radius:5px;font-weight:bold;">'
2765 2807 + '<span style="position:absolute;right:0px;top:0px;color:#ffffff;cursor:pointer;">'
... ... @@ -2863,7 +2905,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2863 2905 {
2864 2906 drag: function (evt) {
2865 2907  
2866   - $("#dot").css("display", "none");
  2908 + //$("#dot").css("display", "none");
  2909 + $("#dot").css("visibility", "hidden");
2867 2910 var verticalScrollPosition = canvasDiv.scrollTop;
2868 2911 var horizontlScrollPosition = canvasDiv.scrollLeft;
2869 2912 $scope.angle(x, y, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, true);
... ... @@ -2874,11 +2917,14 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2874 2917  
2875 2918  
2876 2919 $('.crossDiv_temp').on('click', function (evt) {
2877   - $('#sppeachBubble').css('display', 'none');
  2920 + //$('#sppeachBubble').css('display', 'none');
2878 2921  
2879   - $("#bord").css("display", "none");
2880   - $("#dot").css("display", "none");
  2922 + //$("#bord").css("display", "none");
  2923 + //$("#dot").css("display", "none");
  2924 + $('#sppeachBubble').remove();
2881 2925  
  2926 + $("#bord").remove();
  2927 + $("#dot").remove();
2882 2928  
2883 2929 });
2884 2930  
... ... @@ -3109,8 +3155,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
3109 3155  
3110 3156  
3111 3157 $('.dynCross_anno').on('click', function (evt) {
3112   - $(this).parent().parent().parent().css('display', 'none');
3113   -
  3158 + //$(this).parent().parent().parent().css('display', 'none');
  3159 + $(this).parent().parent().parent().remove();
3114 3160 // $("#bord").css("display", "none");
3115 3161 // $("#dot").css("display", "none");
3116 3162  
... ... @@ -3122,12 +3168,12 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
3122 3168 }
3123 3169  
3124 3170 else {
3125   -
  3171 +
3126 3172 $scope.multiAnnotationIsON = false;
3127 3173  
3128 3174 $(".com_annotation").css("display", "none");
3129 3175 $("#bord_annotation").css({ "width": "0px", "display": "none" });
3130   -
  3176 + $('.dynCross_anno').parent().parent().parent().remove();
3131 3177 var sppechBubbleDotHTML_annotation = '<div id="dot_annotation" style="position:absolute;height:15px;width:35px;display:none;z-index:10000;border-top:2px solid #000;transform:rotate(40deg);-moz-transform:rotate(40deg);-o-transform:rotate(40deg);-ms-transform:rotate(40deg);-webkit-transform:rotate(40deg);"></div>'
3132 3178 + '<div id="sppeachBubble_annotation" style="height:auto!important;z-index:10000;margin-left:25px;border:1px solid #000;display:none;padding:5px 10px;position:absolute;color:#fff;text-align:left;font-size:12px;background-color:#19100e;font-weight:bold;border-radius:5px;-moz-border-radius:5px;-webkit-border-radius:5px;-o-border-radius:5px;-ms-border-radius:5px;font-weight:bold;">'
3133 3179 + '<span style="position:absolute;right:0px;top:0px;color:#ffffff;cursor:pointer;">'
... ... @@ -3304,7 +3350,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
3304 3350 {
3305 3351 drag: function (evt) {
3306 3352  
3307   - $("#dot_annotation").css("display", "none");
  3353 + //$("#dot_annotation").css("display", "none");
  3354 + $("#dot_annotation").remove();
  3355 +
3308 3356 var verticalScrollPosition = canvasDiv.scrollTop;
3309 3357 var horizontlScrollPosition = canvasDiv.scrollLeft;
3310 3358 $scope.angle(x, y, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, false);
... ... @@ -3315,11 +3363,16 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
3315 3363  
3316 3364  
3317 3365 $('.crossDiv_temp_annotation').on('click', function (evt) {
3318   - $('#sppeachBubble_annotation').css('display', 'none');
  3366 + //$('#sppeachBubble_annotation').css('display', 'none');
  3367 +
  3368 + //$("#bord_annotation").css("display", "none");
  3369 + //$("#dot_annotation").css("display", "none");
  3370 +
3319 3371  
3320   - $("#bord_annotation").css("display", "none");
3321   - $("#dot_annotation").css("display", "none");
  3372 + $('#sppeachBubble_annotation').remove();
3322 3373  
  3374 + $("#bord_annotation").remove();
  3375 + $("#dot_annotation").remove();
3323 3376  
3324 3377 });
3325 3378 }
... ... @@ -3600,6 +3653,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
3600 3653  
3601 3654 //alert('mouse up');
3602 3655 console.log('MOUSE UP');
  3656 + $(".com").remove();
  3657 + $('#dot').remove();
  3658 + $('#bord').remove();
  3659 + $('#sppeachBubble').remove();
3603 3660  
3604 3661 $scope.currentLayerNumber = parseInt($('#txtlayerNumber').val());
3605 3662 $('.rectangle').remove();
... ... @@ -4404,7 +4461,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
4404 4461 $scope.annotationTextArrayT2 = [];
4405 4462 $scope.annotationTextArrayT1.push(annotations.annotationT1);
4406 4463 $scope.annotationTextArrayT2.push(annotations.annotationT2);
4407   -
  4464 +
4408 4465 $scope.createDynamicSpeechBubble(evt, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, false);
4409 4466 }
4410 4467 tempMaskImg.src = "http://localhost/AIAHtml/" + tranparencyMaskImgSrc;
... ... @@ -4442,6 +4499,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
4442 4499 $scope.annotationTextArrayT1.push(annotations.annotationT1);
4443 4500 $scope.annotationTextArrayT2.push(annotations.annotationT2);
4444 4501  
  4502 +
4445 4503 $scope.createDynamicSpeechBubble(evt, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, false);
4446 4504 }
4447 4505 else
... ... @@ -4453,6 +4511,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
4453 4511 $scope.annotationTextArrayT1.push(annotations.annotationT1);
4454 4512 $scope.annotationTextArrayT2.push(annotations.annotationT2);
4455 4513  
  4514 +
4456 4515 $scope.createDynamicSpeechBubble(evt, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, false);
4457 4516  
4458 4517  
... ... @@ -4616,11 +4675,18 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
4616 4675 $scope.isTransparencyActivated = false;
4617 4676 $("#btnExtract").removeClass("disabled");
4618 4677  
4619   - $('.com_anno').css('display', 'none');
  4678 + //$('.com_anno').css('display', 'none');
  4679 +
  4680 + //$('#sppeachBubble_annotation').css('display', 'none');
  4681 + //$('#dot_annotation').css('display', 'none');
  4682 + //$('#bord_annotation').css('display', 'none');
  4683 +
4620 4684  
4621   - $('#sppeachBubble_annotation').css('display', 'none');
4622   - $('#dot_annotation').css('display', 'none');
4623   - $('#bord_annotation').css('display', 'none');
  4685 + $('.com_anno').remove();
  4686 +
  4687 + $('#sppeachBubble_annotation').remove();
  4688 + $('#dot_annotation').remove();
  4689 + $('#bord_annotation').remove();
4624 4690  
4625 4691 var tBox = document.getElementById('transparencyCanvas');
4626 4692  
... ... @@ -4865,21 +4931,26 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
4865 4931 // }
4866 4932 // }
4867 4933 //}
4868   - var loopLength = 0;
  4934 + var endIndex = 0;
  4935 + var startIndex = 0;
4869 4936 if (($rootScope.viewOrientationId == '1') || ($rootScope.viewOrientationId == '4')) {
4870   - loopLength = 7;
  4937 + endIndex = 6;
  4938 + startIndex = 1;
4871 4939 }
4872   - else if (($rootScope.viewOrientationId == '2') || ($rootScope.viewOrientationId == '3')){
4873   - loopLength = 5;
  4940 + else if (($rootScope.viewOrientationId == '2') || ($rootScope.viewOrientationId == '3')) {
  4941 + endIndex = 5;
  4942 + startIndex = 1;
4874 4943 }
4875 4944 else if (($rootScope.viewOrientationId == '5')) {
4876   - loopLength = 4;
  4945 + endIndex = 6;
  4946 + startIndex = 2;
4877 4947 }
4878   - else if (($rootScope.viewOrientationId == '6')) {
4879   - loopLength = 1;
  4948 + else if (($rootScope.viewOrientationId == '6')) {
  4949 + endIndex = 6;
  4950 + startIndex = 6;
4880 4951 }
4881 4952  
4882   - for (var i = 1; i < loopLength; i++) {
  4953 + for (var i = startIndex; i <= endIndex; i++) {
4883 4954  
4884 4955 var id;
4885 4956 var maskId;
... ... @@ -4895,7 +4966,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
4895 4966 if (maskcanvas != null || maskcanvas != undefined)
4896 4967 document.getElementById('canvasDiv').removeChild(maskcanvas);
4897 4968  
4898   - if (loopLength == 7) {
  4969 + if (endIndex == 6) {
4899 4970  
4900 4971 if (i == 4 || i == 5 || i == 6) {
4901 4972 id = 'imageCanvas' + i + '_MR';
... ... @@ -4922,7 +4993,6 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
4922 4993  
4923 4994  
4924 4995 }
4925   -
4926 4996 $scope.terminateCurrentlyRunningWPs = function () {
4927 4997 if ($scope.runningWorkers != null || $scope.runningWorkers != undefined) {
4928 4998 var workerCount = $scope.runningWorkers.length;
... ... @@ -5213,7 +5283,13 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5213 5283  
5214 5284 $(".com").toggle();
5215 5285 $('#dot').toggle();
  5286 + $('#bord').toggle();
5216 5287 $('#sppeachBubble').toggle();
  5288 + $('#sppeachBubble_annotation').toggle();
  5289 +
  5290 + $("#bord_annotation").toggle();
  5291 + $("#dot_annotation").toggle();
  5292 + $(".dynCross_anno").parent().parent().parent().toggle();
5217 5293  
5218 5294 }
5219 5295  
... ... @@ -5275,15 +5351,15 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5275 5351 var coloredImageDataVar = coloredImageData;
5276 5352  
5277 5353  
5278   - if (value.haveMirror == 'true') {
5279   - $rootScope.coloredImageMRCanvasList[parseInt(value.bodyRegionId)] = coloredImageDataVar;
5280   - }
5281   - else {
  5354 + //if (value.haveMirror == 'true') {
  5355 + // $rootScope.coloredImageMRCanvasList[parseInt(value.bodyRegionId)] = coloredImageDataVar;
  5356 + //}
  5357 + //else {
5282 5358  
5283 5359  
5284   - $rootScope.coloredImageCanvasList[parseInt(value.bodyRegionId - 1)] = coloredImageDataVar;
  5360 + // $rootScope.coloredImageCanvasList[parseInt(value.bodyRegionId - 1)] = coloredImageDataVar;
5285 5361  
5286   - }
  5362 + //}
5287 5363  
5288 5364  
5289 5365 var context_gray = imageCanvas.getContext('2d');
... ... @@ -5482,14 +5558,14 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5482 5558 var coloredImageDataVar = coloredImageData;
5483 5559  
5484 5560  
5485   - if (value.haveMirror == 'true') {
5486   - $rootScope.coloredImageMRCanvasList[parseInt(value.bodyRegionId)] = coloredImageDataVar;
5487   - }
5488   - else {
  5561 + //if (value.haveMirror == 'true') {
  5562 + // $rootScope.coloredImageMRCanvasList[parseInt(value.bodyRegionId)] = coloredImageDataVar;
  5563 + //}
  5564 + //else {
5489 5565  
5490   - $rootScope.coloredImageCanvasList[parseInt(value.bodyRegionId - 1)] = coloredImageDataVar;
  5566 + // $rootScope.coloredImageCanvasList[parseInt(value.bodyRegionId - 1)] = coloredImageDataVar;
5491 5567  
5492   - }
  5568 + //}
5493 5569  
5494 5570  
5495 5571 var context = imageCanvas.getContext('2d');
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @e8d6391
... ... @@ -171,6 +171,18 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;,
171 171  
172 172 }
173 173  
  174 + // Dissectible Anatomy > Settings should be disable if Annotation is Open.
  175 + $rootScope.ShowSettingWindow = function () {
  176 + if ($(".annotationTollbar").css("display") == "block") {
  177 + // alert("already open");
  178 + }
  179 + else {
  180 + $('#modal-settings').modal('toggle');
  181 + }
  182 +
  183 +
  184 + }
  185 +
174 186  
175 187  
176 188 //----Annotation Toolbar: Jcanvas-----
... ...
400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html
  View file @e8d6391
... ... @@ -35,7 +35,7 @@
35 35 <li><a href="#" id="annotationToolBarOptions" ng-click="ShowAnnotationWindow()">Annotation Toolbar</a></li>
36 36  
37 37 <li><a href="#">Add to Existing Curriculum</a></li>
38   - <li><a data-toggle="modal" data-target="#modal-settings" class="cursor-pointer">Settings</a></li>
  38 + <li><a ng-click="ShowSettingWindow()" class="cursor-pointer">Settings</a></li>
39 39 <li role="separator" class="divider"></li>
40 40 <li><a href="#">Lab Exercises PDF</a></li>
41 41 </ul>
... ...
400-SOURCECODE/AIAHTML5.Web/index.html
  View file @e8d6391
... ... @@ -506,8 +506,8 @@
506 506 <div>
507 507 <button type="button" class="btn btn-primary btn-xs pull-left btn-annotation" id="paintLine" data-toggle="tooltip" data-placement="top" title="Paint" style="margin-right:1%;" ng-click="paintBrush()"><i class="fa fa-paint-brush"></i></button>
508 508 <button type="button" class="btn btn-primary btn-xs pull-left btn-annotation" data-toggle="tooltip" data-placement="top" title="Erase" ng-click="EraseDrawing()"><i class="fa fa-eraser"></i></button>&nbsp;
509   - <div class="marginL2 pull-left"><input type="number" id="amount-2" step="1" style="width:60px;" min="1" max="60" oninput="Brushsize(this)"></div>&nbsp;
510   - <div class="pull-left" style="width:45%; margin-left:2%;">
  509 + <div class="marginL2 pull-left"><input type="number" id="amount-2" step="1" style="width:60px;height:21px;" min="1" max="60" oninput="Brushsize(this)"></div>&nbsp;
  510 + <div class="pull-left" style="width:45%; margin-left:2%;margin-top:5px;">
511 511 <div id="slider-range-min-2"></div>
512 512 </div>
513 513 <div class="clearfix"></div>
... ...