ADAM / AIAHTML5

Commit 6ff550736ed6d96ebf3d6c3964eb0eed7aafe324

Authored by Amrita Vishnoi
2 parents e5b64827 539a13fb

Merge branch 'Develop' into QA

Inline Side-by-side
Showing 15 changed files with 220 additions and 141 deletions
400-SOURCECODE/AIAHTML5.API/Web.config
  View file @6ff5507
... ... @@ -39,7 +39,7 @@
39 39 <add key="EnableSSL" value="false" />
40 40 <add key="Site_Url" value ="http://qa.beta.interactiveanatomy.com/"/>
41 41 <add key ="HostAddress" value="10.100.12.13" />
42   - <add key="isUserAuthenticated" value="false"/>
  42 + <add key="isUserAuthenticated" value="true"/>
43 43 <add key="AdminSupport" value="amrita.vishnoi@ebix.com,nikita.kulshreshtha@ebix.com"/>
44 44 </appSettings>
45 45 <system.web>
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
  View file @6ff5507
... ... @@ -71,6 +71,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
71 71 else {
72 72 $scope.setActiveTab(1);
73 73 $scope.reRunSearchOnLoad();
  74 + $('html, body').animate({ scrollTop: localStorage.getItem('CAGridViewScroll') });
74 75 }
75 76  
76 77  
... ... @@ -449,7 +450,8 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
449 450  
450 451 localStorage.setItem("currentViewTitleFromJson", $rootScope.ViewTitle);
451 452 localStorage.setItem("currentBodyViewId", $event.currentTarget.id);
452   -
  453 + var CAGridViewScrollPosition = $($window).scrollTop();
  454 + localStorage.setItem('CAGridViewScroll', CAGridViewScrollPosition);
453 455 var u = $location.url();
454 456 $location.url('/clinical-animations-detail');
455 457  
... ... @@ -538,7 +540,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
538 540 theme: 'success',
539 541 currentController: 'CAController',
540 542 parentSlug: 'clinical-animations',
541   - content: '<script src="' + $scope.playerScript + '"></script><script>$(document).ready(function(){videojs("#playerinlineVideo").pause();$("#btnTxtOnOff").click(function(){$("#sid").toggle();if($.trim($(this).text()) === "Text Off"){$(this).text("Text On");}else{$(this).text("Text Off");}});});</script><div id="pid" class="row"><div id="divplayerinlineVideo" class="col-sm-12" align="center" width="640" height="480"><video width="640" height="360"' +
  543 + content: '<script src="' + $scope.playerScript + '"></script><script>$(document).ready(function(){videojs("#playerinlineVideo").pause();$("#btnTxtOnOff").click(function(){if($.trim($(this).text()) === "Text Off"){$(this).text("Text On");$("#sid").css("visibility","hidden");}else{$(this).text("Text Off");$("#sid").css("visibility","visible");}});});</script><div id="pid" class="row"><div id="divplayerinlineVideo" class="col-sm-12" align="center" width="640" height="480"><video width="640" height="360"' +
542 544 'class="ADAM_Video video-js vjs-default-skin vjs-big-play-centered" type="$videoType" id="playerinlineVideo"' +
543 545 ' poster="' + $scope.poster + '"' +
544 546 'controls="true" preload="none" allowfullscreen="true" allowscriptaccess="always" ' +
... ... @@ -570,7 +572,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
570 572  
571 573  
572 574 $rootScope.currentSlug = 'clinical-animations-detail';
573   -
  575 + $('html, body').animate({ scrollTop: 0 });
574 576 $rootScope.openViews.push(
575 577 {
576 578 "module": $rootScope.currentActiveModuleTitle, "bodyView": tittle, "state": 'max', "BodyViewId": $rootScope.currentBodyViewId,
... ... @@ -644,8 +646,15 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
644 646  
645 647 var curCAListViewScroll = localStorage.getItem("CAListViewScroll");
646 648 if (typeof (curCAListViewScroll) !== "undefined" && curCAListViewScroll !== null && curCAListViewScroll !== '') {
647   -
648   - $('#ListViewDiv').scrollTop(localStorage.getItem("CAListViewScroll"));
  649 + if (typeof InstallTrigger !== 'undefined') {
  650 +
  651 + $('#ListViewDiv').animate({ scrollTop: localStorage.getItem("CAListViewScroll") });
  652 +
  653 + }
  654 + else
  655 + {
  656 + $('#ListViewDiv').scrollTop(localStorage.getItem("CAListViewScroll"));
  657 + }
649 658 }
650 659 //else {
651 660 // $('#ListViewDiv').scrollTop(0);
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
  View file @6ff5507
... ... @@ -175,7 +175,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
175 175  
176 176  
177 177 $('#grid-view').empty();
178   - var $e1 = $('<ul><li ng-repeat="value in selectedCIListViewData" class="col-sm-3 col-md-2"><div id="{{value._id}}" title = "{{value._Title}}" data-ng-click="openView($event)">'
  178 + var $e1 = $('<ul><li ng-repeat="value in selectedCIListViewData" class="col-sm-3 col-md-2"><div id="{{value._id}}" title = "{{value._Title}}" class="GridViewDataDivHeight" data-ng-click="openView($event)">'
179 179 + '<div class="thumbnail" >'
180 180 + '<img id="{{value._Title}}" ng-src="~/../content/images/ci/thumbnails/{{value._ThumbnailImage}}" >'//alt="{{value._Title}}" >'
181 181 + '<div class="caption"><p> {{value._Title}}</p></div></a></div></div></li></ul>').appendTo('#grid-view');
... ... @@ -603,7 +603,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
603 603 '<div class="col-sm-12 img-thumbnail" align="center">' +
604 604 '<img src="' + $scope.clickedCIImage + '" alt="" title="" class="img-responsive "><div class="col-sm-12 well img-subtitle">' +
605 605 '<div align="left" id="sid"><p>' + $scope.clickedCISummary + '</p></div><button id="btnTxtOnOff" class="btn btn-primary pull-right">Text Off</button>' +
606   - '<script>$(document).ready(function(){$("#btnTxtOnOff").click(function(){$("#sid").toggle();if($.trim($(this).text()) === "Text Off"){$(this).text("Text On");}else{$(this).text("Text Off");}});});</script></div>' +
  606 + '<script>$(document).ready(function(){$("#btnTxtOnOff").click(function(){if($.trim($(this).text()) === "Text Off"){$(this).text("Text On");$("#sid").css("visibility","hidden");}else{$(this).text("Text Off");$("#sid").css("visibility","visible");}});});</script></div>' +
607 607 '</div></div>',
608 608 //ajax: {
609 609 // url: 'app/views/ci/ci-view-detail.html'
... ... @@ -693,9 +693,18 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
693 693  
694 694 var curCIListViewScroll = localStorage.getItem("CIListViewScroll");
695 695 if (typeof (curCIListViewScroll) !== "undefined" && curCIListViewScroll !== null && curCIListViewScroll !== '') {
696   -
  696 + if (typeof InstallTrigger !== 'undefined')
  697 + {
  698 +
  699 + $('#ListViewDiv').animate({ scrollTop: localStorage.getItem("CIListViewScroll") });
  700 + }
  701 + else
  702 + {
  703 +
697 704 $('#ListViewDiv').scrollTop(localStorage.getItem("CIListViewScroll"));
698 705 }
  706 +
  707 + }
699 708 //else {
700 709 // $('#ListViewDiv').scrollTop(0);
701 710 //}
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @6ff5507
... ... @@ -4242,7 +4242,14 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
4242 4242 $rootScope.switchToTransparencycanvas();
4243 4243 }
4244 4244 }
  4245 + else
  4246 + {
4245 4247  
  4248 + $rootScope.UIWrapperZIndex = 12000;
  4249 +
  4250 + $(".ui-wrapper").css("z-index", $rootScope.UIWrapperZIndex);
  4251 +
  4252 + }
4246 4253 //hide the speechbubble
4247 4254  
4248 4255  
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @6ff5507
... ... @@ -357,6 +357,95 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
357 357  
358 358 // var ajaxResult = [];
359 359 // var ajaxResult1 = [];
  360 +
  361 + function onBrushSizeChange() {
  362 + $('.btnCursor').addClass('activebtncolor');
  363 + $(".btn-annotation").removeClass("activebtncolor");
  364 + $(".btn-annotation-erase").removeClass("activebtncolor");
  365 + $(".btn-annotation-erase").removeClass("activebtncolor");
  366 + $(".annotationpaintbrushsize").removeClass("activebtncolor");
  367 + var x = $('#canvasPaint').css("z-index");
  368 +
  369 + var y = $('#canvas').css("z-index");
  370 + if (x > y) {
  371 + y = parseInt(x) + 1;
  372 + } else {
  373 + y = parseInt(y) + 1;
  374 + }
  375 + $('#canvas').css("z-index", y);
  376 + }
  377 +
  378 + $("#slider-range-min-2").slider({
  379 + range: "min",
  380 + min: 1,
  381 + max: 60,
  382 + value: 1,
  383 + slide: function (event, ui) {
  384 +
  385 + onBrushSizeChange();
  386 + console.log("sliding");
  387 + $("#btnBrushSize").val(ui.value);
  388 +
  389 + },
  390 + stop: function (event, ui) {
  391 +
  392 + $("#paintLine").attr("data-size", ui.value);
  393 +
  394 + }
  395 +
  396 + });
  397 +
  398 +
  399 + $("#btnBrushSize").keydown(function () {
  400 + onBrushSizeChange();
  401 + var brushSizevalue = this.value;
  402 + $("#slider-range-min-2").slider("value", parseInt(brushSizevalue));
  403 + });
  404 + $("#btnBrushSize").keyup(function () {
  405 + onBrushSizeChange();
  406 + var brushSizevalue = this.value;
  407 + $("#slider-range-min-2").slider("value", parseInt(brushSizevalue));
  408 + });
  409 + $("#btnBrushSizeIncrement").click(function () {
  410 + onBrushSizeChange();
  411 + var brushIncrementVar = $("#btnBrushSize").val();
  412 + if (brushIncrementVar >= 60) {
  413 + $("#slider-range-min-2").slider("value", 60);
  414 + }
  415 + else if (brushIncrementVar == "") {
  416 + var brushIncrementedValue = 1;
  417 + $("#btnBrushSize").val(brushIncrementedValue);
  418 + $("#slider-range-min-2").slider("value", parseInt(brushIncrementedValue));
  419 + }
  420 + else {
  421 + var brushIncrementedValue = parseInt(brushIncrementVar) + 1;
  422 + $("#btnBrushSize").val(brushIncrementedValue);
  423 + $("#slider-range-min-2").slider("value", parseInt(brushIncrementedValue));
  424 + }
  425 + });
  426 + $("#btnBrushSizeDecrease").click(function () {
  427 + onBrushSizeChange();
  428 + var brushDecreaseVar = $("#btnBrushSize").val();
  429 + if (brushDecreaseVar == "") {
  430 + var brushDecrementedValue = 1;
  431 + $("#btnBrushSize").val(brushDecrementedValue);
  432 + $("#slider-range-min-2").slider("value", parseInt(brushDecrementedValue));
  433 + }
  434 + else if (brushDecreaseVar <= 1) {
  435 + $("#slider-range-min-2").slider("value", 1);
  436 + }
  437 + else {
  438 + var brushDecrementedValue = parseInt(brushDecreaseVar) - 1;
  439 + $("#btnBrushSize").val(brushDecrementedValue);
  440 + $("#slider-range-min-2").slider("value", parseInt(brushDecrementedValue));
  441 + }
  442 + });
  443 +
  444 + $("#btnBrushSize").val($("#slider-range-min-2").slider("value"));
  445 +
  446 +
  447 + // annotation slider ends
  448 +
360 449 $rootScope.isLexiconTabClicked = true;
361 450 $rootScope.lexiconData = function () {
362 451 if ($rootScope.isLexiconTabClicked == true) {
... ... @@ -515,6 +604,9 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
515 604 return moduleUrl === currentRoute ? 'active' : '';
516 605 }
517 606 $("#annotationToolBarOptions").removeClass("disableMenuoption");
  607 + $("#optionsListManagerTab").removeClass("disableMenuoption");
  608 +
  609 +
518 610 if (($location.url() == "/da-body-view")) {
519 611 $rootScope.disableMenuannotation = " ";
520 612 $rootScope.disableMenuoption = " ";
... ... @@ -526,17 +618,28 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
526 618 $rootScope.disableMenuoption = " ";
527 619 $rootScope.disableSubMenu = "disableSubMenu";
528 620 $("#annotationToolBarOptions").removeClass("disableSubMenu");
  621 + $("#optionsListManagerTab").addClass("disableSubMenu");
529 622 $rootScope.disableFileMenu = " ";
530 623 }
  624 + else if ($location.url() == "/module-item-view") {
  625 + $rootScope.disableMenuannotation = " ";
  626 + $rootScope.disableMenuoption = " ";
  627 + $rootScope.disableSubMenu = "disableSubMenu";
  628 + $("#annotationToolBarOptions").removeClass("disableSubMenu");
  629 + $rootScope.disableFileMenu = " ";
  630 + }
  631 +
531 632 else if ($location.url() == "/clinical-animations-detail") {
532 633 $rootScope.disableMenuannotation = "disableMenuannotation";
533 634 $rootScope.disableMenuoption = " ";
534 635 $rootScope.disableSubMenu = "disableSubMenu";
535 636 $("#annotationToolBarOptions").addClass("disableSubMenu");
  637 + $("#optionsListManagerTab").addClass("disableSubMenu");
536 638 $rootScope.disableFileMenu = "disableFileMenu";
537 639 }
538 640 else {
539 641 $("#annotationToolBarOptions").removeClass("disableSubMenu");
  642 + $("#optionsListManagerTab").removeClass("disableSubMenu");
540 643 $rootScope.disableMenuannotation = "disableMenuannotation";
541 644 $rootScope.disableMenuoption = "disableMenuoption";
542 645 $rootScope.disableSubMenu = "";
... ... @@ -1403,9 +1506,20 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
1403 1506 $("#borderWidthCanvasElement").css({ "pointer-events": "none" });
1404 1507 $("#outlineColor").css({ "pointer-events": "none" });
1405 1508 }
  1509 + if ((isfilloptionChecked == false) && (isOutlineOptionChecked == false)) {
  1510 + $(".setEnableDisableForEditShapeStyle").css({ "opacity": "1" });
  1511 + $("#borderWidthCanvasElement").css({ "pointer-events": "auto" });
  1512 + $("#outlineColor").css({ "pointer-events": "auto" });
  1513 + $(".enableDisableOpacity label").css({ "cursor": "pointer" });
  1514 + $(".enableDisableOpacity").css({ "opacity": "1" });
  1515 + $("#edit-slider-3").css({ "pointer-events": "auto" });
  1516 + $("#edit-slider-4").css({ "pointer-events": "auto" });
  1517 + $("#editstylebackgroundcolor").css({ "pointer-events": "auto" });
  1518 + document.getElementById("editStyleForm").reset();
  1519 + }
1406 1520 var previewBgColor = $("#shapeStyleDiv").css('background-color');
1407   - var previewBorderColor = $('#previewBorder').css('border-color');
1408   - var previewBorderWidth = $('#previewBorder').css('border-width');
  1521 + var previewBorderColor = $('#previewBorder').css('border-top-color');
  1522 + var previewBorderWidth = $('#previewBorder').css('border-top-width');
1409 1523 var previewOpacity = $('#previewBorder').css('opacity');
1410 1524 $('#editstylebackgroundcolor .minicolors >.minicolors-swatch > .minicolors-swatch-color').css("background-color", previewBgColor);
1411 1525 $("#imgOpacity").css("background-color", previewBgColor);
... ... @@ -3427,10 +3541,11 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
3427 3541 };
3428 3542  
3429 3543 $rootScope.ShowPrintPreviewWindow = function (event) { // Print Preview
3430   -
  3544 + $rootScope.CloseListManager();
3431 3545 $rootScope.CloseAnnotationTool();
3432 3546 $("#annotationButton").parent().addClass("disableMenuannotation");
3433 3547 $("#annotationToolBarOptions").addClass("disableMenuoption");
  3548 + $("#optionsListManagerTab").addClass("disableMenuoption");
3434 3549 $('#dvPrintPreview').css('display', 'block');
3435 3550 html2canvas($("#canvasDiv"), {
3436 3551 onrendered: function (canvas) {
... ... @@ -3512,6 +3627,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
3512 3627 top: 70,
3513 3628 left: 1,
3514 3629 },
  3630 + controls: { buttons: 'closeonly'},
3515 3631 size: { width: $(window).outerWidth(), height: $(window).outerHeight() + 60 },
3516 3632 //size: { width: $(window).outerWidth() - 10, height: $(window).outerHeight() - 110 },
3517 3633 });
... ... @@ -3611,6 +3727,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
3611 3727 $("#ciImagePanel").css({ "pointer-events": "auto", "opacity": "1" });
3612 3728 $("#annotationButton").parent().removeClass("disableMenuannotation");
3613 3729 $("#annotationToolBarOptions").removeClass("disableMenuoption");
  3730 + $("#optionsListManagerTab").removeClass("disableMenuoption");
3614 3731 $('#fileMenuAnchor').removeClass('disableMenuannotation');
3615 3732 if ($('#jsPanel-1').length > 0)
3616 3733 $('#jsPanel-1').remove();
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
  View file @6ff5507
... ... @@ -155,7 +155,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
155 155 canvas.style.top = '0px';
156 156 canvas.style.position = "absolute";
157 157  
158   - $("#imageDiv").append(canvas);
  158 + $("#canvasDiv").append(canvas);
159 159 $scope.context = canvas.getContext("2d")
160 160  
161 161 //6. Show all pins on AA opened item
... ... @@ -197,8 +197,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
197 197  
198 198 angular.element(document).ready(function (e) {
199 199 $("#ImagePanel").resize(function () {
200   - $("#imageDiv").scrollLeft($rootScope.CanvasDivLeftPosition);
201   - $("#imageDiv").scrollTop($rootScope.CanvasDivTopPosition);
  200 + $("#canvasDiv").scrollLeft($rootScope.CanvasDivLeftPosition);
  201 + $("#canvasDiv").scrollTop($rootScope.CanvasDivTopPosition);
202 202 });
203 203  
204 204 })
... ... @@ -610,7 +610,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
610 610 $("#dot").css("visibility", "hidden");
611 611 var verticalScrollPosition = canvasDiv.scrollTop;
612 612 var horizontlScrollPosition = canvasDiv.scrollLeft;
613   - $scope.angle(x, y, evt.pageX + horizontlScrollPosition - $('#imageDiv').offset().left, evt.pageY + verticalScrollPosition - $('#imageDiv').offset().top, true);
  613 + $scope.angle(x, y, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, true);
614 614 },
615 615 });
616 616  
... ... @@ -634,7 +634,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
634 634 if (MultipleLanguage == undefined) {
635 635 console.log("No text is found");
636 636 } else {
637   - $('#imageDiv').append(speechBubbleHTML);
  637 + $('#canvasDiv').append(speechBubbleHTML);
638 638  
639 639 if ($scope.MultiLanguageAnnationArray.length > 0) {
640 640 for (var i = 0; i <= $scope.MultiLanguageAnnationArray.length - 1; i++) {
... ... @@ -709,8 +709,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
709 709  
710 710 drag: function (evt) {
711 711  
712   - var verticalScrollPosition = document.getElementById('imageDiv').scrollTop;
713   - var horizontlScrollPosition = document.getElementById('imageDiv').scrollLeft;
  712 + var verticalScrollPosition = document.getElementById('canvasDiv').scrollTop;
  713 + var horizontlScrollPosition = document.getElementById('canvasDiv').scrollLeft;
714 714 var clickedSpeechBubbleId = $(this).attr("id");
715 715  
716 716 var clickedPinId = clickedSpeechBubbleId.substring(12, clickedSpeechBubbleId.length);
... ... @@ -720,7 +720,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
720 720  
721 721 for (var i = 0; i <= $rootScope.speechBubbleDimaensions.length - 1; i++) {
722 722 if ($rootScope.speechBubbleDimaensions[i].id == clickedPinId) {
723   - $scope.angle(clickedPinId, $rootScope.speechBubbleDimaensions[i].currentX, $rootScope.speechBubbleDimaensions[i].currentY, evt.pageX + horizontlScrollPosition - $('#imageDiv').offset().left, evt.pageY + verticalScrollPosition - $('#imageDiv').offset().top, true);
  723 + $scope.angle(clickedPinId, $rootScope.speechBubbleDimaensions[i].currentX, $rootScope.speechBubbleDimaensions[i].currentY, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, true);
724 724 }
725 725 }
726 726  
... ... @@ -879,6 +879,18 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
879 879  
880 880 $scope.removeSpeechBubble();
881 881 }
  882 +
  883 + $rootScope.$on('annotationToolEvent', function (event, data) {
  884 + $('#editstylebackgroundcolor .minicolors >.minicolors-swatch > .minicolors-swatch-color').css("background-color", "rgb(255,255,255)")
  885 + $('#editstylebackgroundcolor .minicolors >.minicolors-panel > .minicolors-grid >.minicolors-picker').css({ "top": "145px", "left": "4px" });
  886 + $('#outlineColor .minicolors >.minicolors-swatch > .minicolors-swatch-color').css("background-color", "rgb(0,0,0)")
  887 + $('#outlineColor .minicolors >.minicolors-panel > .minicolors-grid >.minicolors-picker').css({ "top": "145px", "left": "4px" });
  888 +
  889 + $("#canvas").css("display", "block");
  890 + $("#canvasPaint").css("display", "block");
  891 + $rootScope.onDrawingCanvasClick();
  892 + $rootScope.FreeStylePaint();
  893 + });
882 894 }]);
883 895  
884 896 function showSelectedSystemPins(event) {
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/aa/atlas-anatomy-detail.html
  View file @6ff5507
1   -๏ปฟ
  1 +๏ปฟ<style>
  2 + .canvas-annotationStyle {
  3 + display: none;
  4 + background-color: transparent;
  5 + z-index: 12000;
  6 + position: absolute;
  7 + left: 0;
  8 + right: 0;
  9 + }
  10 +
  11 + .canvas-annotationStyle1 {
  12 + display: none;
  13 + background-color: transparent;
  14 + z-index: 12000;
  15 + position: absolute;
  16 + left: 0;
  17 + right: 0;
  18 + }
  19 +</style>
2 20 <div id="aaDetailPageDiv" class="bodyWrap row" ng-controller="TileViewListController">
3 21  
4 22 <!--<div class="col-sm-12 pageHeading">
... ... @@ -89,9 +107,13 @@
89 107 <div class="container-fluid">
90 108 <div class="row">
91 109  
92   - <div class=" col-sm-12 img-thumbnail" id="imageDiv" style="height: 478px; overflow: scroll;">
  110 + <div class=" col-sm-12 img-thumbnail" id="canvasDiv" style="height: 478px; overflow: scroll;">
  111 + <canvas id="canvasPaint" ng-click="FreeStylePaint($event)" width="2277" height="3248" class="canvas-annotationStyle1"></canvas>
  112 + <canvas id="canvas" ng-click="onDrawingCanvasClick($event)" width="2277" height="3248" class="canvas-annotationStyle"></canvas>
  113 +
93 114 <img id="modItemImage" alt="" title="" style="left:0px;top:0px;position:absolute">
94 115 <!--<div class="clearfix">
  116 +
95 117 <img id="modItemImage" ng-init="alert('hi')" alt="" title="" class="img-responsive">
96 118 </div>
97 119 <!--<div class="col-sm-1 img-thumbnail pull-right" align="center"><img src="../../content/images/1000x600.jpg" alt="" title="" class="img-responsive"></div>
... ... @@ -111,21 +133,6 @@
111 133 $(".stickey-area").sticky();
112 134 });
113 135 </script>
114   -<script>
115   - $(function () {
116   - $("#slider-range-min-2").slider({
117   - range: "min",
118   - min: 1,
119   - max: 60,
120   - value: 10,
121   - slide: function (event, ui) {
122   - $("#amount-2").val(ui.value);
123   - }
124   - });
125   - $("#amount-2").val($("#slider-vertical-2").slider("value"));
126   -
127   - });
128   -</script>
129 136  
130 137 <script>
131 138 $(document).ready(function () {
... ...
400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html
  View file @6ff5507
... ... @@ -23,7 +23,7 @@
23 23 </ul>
24 24 </li>
25 25 <!--#7904-->
26   - <li class="navbarItem" ng-class=" disablemenuannotation"><a href="#" data-toggle="modal" id="annotationButton" data-target=".bs-example-modal-sm" ng-click="ShowAnnotationWindow()">Annotation</a></li>
  26 + <li class="navbarItem" ng-class=" disableMenuannotation"><a href="#" data-toggle="modal" id="annotationButton" data-target=".bs-example-modal-sm" ng-click="ShowAnnotationWindow()">Annotation</a></li>
27 27  
28 28 <li class="dropdown navbarDropdownItem" ng-class="disableMenuoption">
29 29 <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Options<span class="caret"></span></a>
... ...
400-SOURCECODE/AIAHTML5.Web/content/images/da/75/body-views/3/layers/0/1/L/2303.jpg deleted
View file @e5b6482

89.6 KB
400-SOURCECODE/AIAHTML5.Web/content/images/da/ethnicity/body-views/11/L/thumbnails/da_tni_3345_LY.jpg deleted
View file @e5b6482

5.97 KB
400-SOURCECODE/AIAHTML5.Web/content/images/da/ethnicity/body-views/6/A/thumbnails/da_tni_3340_AN.jpg deleted
View file @e5b6482

4.35 KB
400-SOURCECODE/AIAHTML5.Web/content/images/da/ethnicity/body-views/7/B/thumbnails/da_tni_3341_BY.jpg deleted
View file @e5b6482

5.33 KB
400-SOURCECODE/AIAHTML5.Web/index.html
  View file @6ff5507
... ... @@ -1451,109 +1451,11 @@
1451 1451 </script>-->
1452 1452  
1453 1453 <script>
1454   - function onBrushSizeChange() {
1455   - $('.btnCursor').addClass('activebtncolor');
1456   - $(".btn-annotation").removeClass("activebtncolor");
1457   - $(".btn-annotation-erase").removeClass("activebtncolor");
1458   - $(".btn-annotation-erase").removeClass("activebtncolor");
1459   - $(".annotationpaintbrushsize").removeClass("activebtncolor");
1460   - var x = $('#canvasPaint').css("z-index");
1461   -
1462   - var y = $('#canvas').css("z-index");
1463   - if (x > y) {
1464   - y = parseInt(x) + 1;
1465   - } else {
1466   - y = parseInt(y) + 1;
1467   - }
1468   - $('#canvas').css("z-index", y);
1469   - }
1470   - $(function () {
1471   - $("#slider-range-min-2").slider({
1472   - range: "min",
1473   - min: 1,
1474   - max: 60,
1475   - value: 1,
1476   - slide: function (event, ui) {
1477   - onBrushSizeChange();
1478   - $("#btnBrushSize").val(ui.value);
1479   -
1480   - },
1481   - stop: function (event, ui) {
1482   -
1483   - $("#paintLine").attr("data-size", ui.value);
1484   -
1485   - }
1486   -
1487   - });
1488   -
1489   -
1490   - $("#btnBrushSize").keydown(function () {
1491   - onBrushSizeChange();
1492   - var brushSizevalue = this.value;
1493   - $("#slider-range-min-2").slider("value", parseInt(brushSizevalue));
1494   - });
1495   - $("#btnBrushSize").keyup(function () {
1496   - onBrushSizeChange();
1497   - var brushSizevalue = this.value;
1498   - $("#slider-range-min-2").slider("value", parseInt(brushSizevalue));
1499   - });
1500   - $("#btnBrushSizeIncrement").click(function () {
1501   - onBrushSizeChange();
1502   - var brushIncrementVar = $("#btnBrushSize").val();
1503   - if (brushIncrementVar >= 60) {
1504   - $("#slider-range-min-2").slider("value", 60);
1505   - }
1506   - else if (brushIncrementVar == "") {
1507   - var brushIncrementedValue = 1;
1508   - $("#btnBrushSize").val(brushIncrementedValue);
1509   - $("#slider-range-min-2").slider("value", parseInt(brushIncrementedValue));
1510   - }
1511   - else {
1512   - var brushIncrementedValue = parseInt(brushIncrementVar) + 1;
1513   - $("#btnBrushSize").val(brushIncrementedValue);
1514   - $("#slider-range-min-2").slider("value", parseInt(brushIncrementedValue));
1515   - }
1516   - });
1517   - $("#btnBrushSizeDecrease").click(function () {
1518   - onBrushSizeChange();
1519   - var brushDecreaseVar = $("#btnBrushSize").val();
1520   - if (brushDecreaseVar == "") {
1521   - var brushDecrementedValue = 1;
1522   - $("#btnBrushSize").val(brushDecrementedValue);
1523   - $("#slider-range-min-2").slider("value", parseInt(brushDecrementedValue));
1524   - }
1525   - else if (brushDecreaseVar <= 1) {
1526   - $("#slider-range-min-2").slider("value", 1);
1527   - }
1528   - else {
1529   - var brushDecrementedValue = parseInt(brushDecreaseVar) - 1;
1530   - $("#btnBrushSize").val(brushDecrementedValue);
1531   - $("#slider-range-min-2").slider("value", parseInt(brushDecrementedValue));
1532   - }
1533   - });
1534   -
1535   - $("#btnBrushSize").val($("#slider-range-min-2").slider("value"));
1536   -
1537   -
1538   -
1539   -
1540   -
1541   - //$("#slider-range-min-2").on("slidestart", function (event, ui) {
1542   -
1543   - // $('.btnCursor').trigger('click');
1544   - // $(".btn-annotation").removeClass("activebtncolor");
1545   - // $('.btnCursor').addClass('activebtncolor');
1546   - // // ctx.clearRect(0, 0, canvasPaint.width, canvasPaint.height);
1547   -
1548   -
1549   - //});
1550   - // $("#slider-range-min-2").on("slidechange", function (event, ui) { alert("ssasa"); });
1551   -
1552 1454  
1553 1455 $(function () {
1554 1456 $('[data-toggle="tooltip"]').tooltip();
1555 1457 })
1556   - });
  1458 +
1557 1459 </script>
1558 1460 <script>
1559 1461 (function ($) {
... ...
400-SOURCECODE/AIAHTML5.Web/libs/html2canvas.js
  View file @6ff5507
... ... @@ -2855,8 +2855,16 @@ _html2canvas.Renderer.Canvas = function(options) {
2855 2855 newCanvas.width = Math.ceil(bounds.width);
2856 2856 newCanvas.height = Math.ceil(bounds.height);
2857 2857 ctx = newCanvas.getContext("2d");
2858   -
2859   - ctx.drawImage(canvas, bounds.left, bounds.top, bounds.width, bounds.height, 0, 0, bounds.width, bounds.height);
  2858 + if (/*@cc_on!@*/false || !!document.documentMode) {
  2859 +
  2860 + var imgData = canvas.getContext("2d").getImageData(bounds.left, bounds.top, bounds.width, bounds.height);
  2861 + ctx.putImageData(imgData, 50, 0);
  2862 + }
  2863 + else {
  2864 +
  2865 + ctx.drawImage(canvas, bounds.left, bounds.top, bounds.width, bounds.height, 0, 0, bounds.width, bounds.height);
  2866 + }
  2867 +
2860 2868 canvas = null;
2861 2869 return newCanvas;
2862 2870 }
... ...
400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
  View file @6ff5507
... ... @@ -1008,10 +1008,18 @@ background-size:cover;
1008 1008 {
1009 1009 z-index:11111;
1010 1010 }
1011   - .tinyImg {
  1011 +
  1012 + .tinyImg {
1012 1013 display: block;
1013 1014 max-width: 230px;
1014 1015 /*max-height: 95px;*/
1015 1016 width: auto;
1016 1017 height: 95px !important;
1017   -}
1018 1018 \ No newline at end of file
  1019 +}
  1020 +
  1021 +
  1022 + .GridViewDataDivHeight
  1023 + {
  1024 + height:175px;
  1025 + }
  1026 +
... ...