diff --git a/400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj b/400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj
index 0334159..c6a625d 100644
--- a/400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj
+++ b/400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj
@@ -329,6 +329,7 @@
+
@@ -43220,6 +43221,10 @@
+
+
+
+
@@ -43304,6 +43309,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Web.config
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
index 6e52182..ad560e5 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
@@ -1,5 +1,5 @@
-AIA.controller("CAController", ["$scope", "$window", "$rootScope", "$compile", "$http", "$log", "$location", "pages", "BodyRegions", "BodySystems", "MedicalSpecialties", "DataService",
-function ($scope, $window, $rootScope, $compile, $http, log, $location, pages, BodyRegions, BodySystems, MedicalSpecialties, DataService) {
+AIA.controller("CAController", ["$scope", "$window", "$rootScope", "$compile", "$http", "$log", "$location", "$timeout", "pages", "BodyRegions", "BodySystems", "MedicalSpecialties", "DataService",
+function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout, pages, BodyRegions, BodySystems, MedicalSpecialties, DataService) {
$rootScope.currentActiveModuleTitle = pages[4].name;
$scope.showme = true;
$scope.AnimationData;
@@ -12,6 +12,8 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, pages, B
$scope.SelectedCAImage = [];
$scope.SelectedCASummary = [];
$scope.filterstring = false;
+ $scope.hostedServer = "http://aia5.adam.com/graphics/Multimedia/en/";
+ $scope.hostedFolderId;
$scope.query = {
selectedbodyregion: '',
selectedbodysystem: '',
@@ -45,7 +47,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, pages, B
}
var curBodyRegion = localStorage.getItem("CACurBodyRegion");
- if (typeof (curBodyRegion) !== "undefined" && curBodyRegion !== null && curBodyRegion !=='') {
+ if (typeof (curBodyRegion) !== "undefined" && curBodyRegion !== null && curBodyRegion !== '') {
$scope.query.selectedbodyregion = curBodyRegion;
}
else {
@@ -53,7 +55,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, pages, B
}
var curBodySystem = localStorage.getItem("CACurBodySystem");
- if (typeof (curBodySystem) !== "undefined" && curBodySystem !== null && curBodySystem !=='') {
+ if (typeof (curBodySystem) !== "undefined" && curBodySystem !== null && curBodySystem !== '') {
$scope.query.selectedbodysystem = curBodySystem;
}
else {
@@ -69,7 +71,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, pages, B
}
- if ($scope.query.selectedbodyregion == "" && $scope.query.selectedbodysystem == "" && $scope.query.selectedspecialty == "") {
+ if ($scope.query.selectedbodyregion == "" && $scope.query.selectedbodysystem == "" && $scope.query.selectedspecialty == "") {
$scope.loadAllCA();
}
else {
@@ -206,7 +208,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, pages, B
while ($scope.searchCAListViewData.length) {
$scope.searchCAListViewData.pop();
}
-
+
$scope.loadAllCA();
}
@@ -268,7 +270,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, pages, B
var count = 0;
- if (typeof (query.selectedbodyregion) !== "undefined" && query.selectedbodyregion !== null && query.selectedbodyregion !== "") {
+ if (typeof (query.selectedbodyregion) !== "undefined" && query.selectedbodyregion !== null && query.selectedbodyregion !== "") {
var posbodyregion = value._BodyRegion.indexOf((query.selectedbodyregion.trim()));
if (posbodyregion > -1) {
selectimg = true;
@@ -282,7 +284,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, pages, B
}
- if (typeof (query.selectedbodysystem) !== "undefined" && query.selectedbodysystem !== null && query.selectedbodysystem !=="") {
+ if (typeof (query.selectedbodysystem) !== "undefined" && query.selectedbodysystem !== null && query.selectedbodysystem !== "") {
var posbodysystem = value._BodySystem.indexOf(query.selectedbodysystem);
if (posbodysystem > -1) {
count = count + 1;
@@ -293,7 +295,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, pages, B
}
}
- if (typeof (query.selectedspecialty) !== "undefined" && query.selectedspecialty !== null && query.selectedspecialty !=="") {
+ if (typeof (query.selectedspecialty) !== "undefined" && query.selectedspecialty !== null && query.selectedspecialty !== "") {
var posspeciality = value._MedicalSpecialty.indexOf(query.selectedspecialty);
if (posspeciality > -1) {
count = count + 1;
@@ -444,16 +446,25 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, pages, B
$scope.AnimationData = result;
$scope.CAlistViewData = $scope.AnimationData.root.CAData;
- var clickedCAVideo = [];
- clickedCAVideo = new jinqJs()
- .from($scope.CAlistViewData)
- .where('_id == ' + $scope.voId)
- .select('_Video','_LowerSummary');
-
- $scope.clickedCAVideo = clickedCAVideo[0]._Video;
- $scope.clickedCASummary = clickedCAVideo[0]._LowerSummary
-
- if ($scope.clickedCAVideo.length > 0 && $scope.clickedCASummary.length > 0) {
+ var clickedCAVideo = [];
+ clickedCAVideo = new jinqJs()
+ .from($scope.CAlistViewData)
+ .where('_id == ' + $scope.voId)
+ .select('_Video', '_LowerSummary', '_HostedFolderId');
+
+ $scope.clickedCAVideo = clickedCAVideo[0]._Video;
+ $scope.clickedCASummary = clickedCAVideo[0]._LowerSummary;
+ $scope.hostedFolderId = clickedCAVideo[0]._HostedFolderId;
+ $scope.poster = $scope.hostedServer + $scope.hostedFolderId + "/" + $scope.hostedFolderId + ".jpg";
+ $scope.ad = $scope.hostedServer + $scope.hostedFolderId + "/" + $scope.hostedFolderId + "_ad.mp4";
+ $scope.HDVid = $scope.hostedServer + $scope.hostedFolderId + "/" + $scope.hostedFolderId + "_HD.mp4";
+ $scope.webm = $scope.hostedServer + $scope.hostedFolderId + "/" + $scope.hostedFolderId + ".webm";
+ $scope.ogv = $scope.hostedServer + $scope.hostedFolderId + "/" + $scope.hostedFolderId + ".ogv";
+ $scope.playerScript = "~/../libs/video_4_12_11/video_4_12_11.js";
+ //$scope.vtt = $scope.hostedServer + $scope.hostedFolderId + "/" + $scope.hostedFolderId + ".vtt"
+ $scope.vtt = "~/../content/data/vtt/" + $scope.hostedFolderId + ".vtt";
+ console.log($scope.vtt);
+ if ($scope.clickedCAVideo.length > 0 && $scope.clickedCASummary.length > 0) {
$rootScope.isLoading = false;
$('#spinner').css('visibility', 'hidden');
@@ -464,10 +475,22 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, pages, B
theme: 'success',
currentController: 'CAController',
parentSlug: 'clinical-animations',
- content: '
' +
- '
' + $scope.clickedCASummary + '
' +
- '
',
+ content: '
' + $scope.clickedCASummary + '
',
//ajax: {
// url: 'app/views/ca/ca-view-detail.html'
@@ -477,11 +500,12 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, pages, B
top: 70,
left: 1,
},
-
- size: { width: $(window).outerWidth() - 10, height: $(window).outerHeight()},
+
+ size: { width: $(window).outerWidth() - 10, height: $(window).outerHeight() },
});
+
$rootScope.currentSlug = 'clinical-animations-detail';
$rootScope.openViews.push(
@@ -490,7 +514,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, pages, B
"slug": $rootScope.currentSlug
});
- }
+ }
},
@@ -508,6 +532,12 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, pages, B
}
+ $scope.loadCAPlayer = function (summary, link, vidNumber) {
+ $scope.clickedCASummary = summary;
+ $scope.clickedCAVideo = link;
+ $scope.videoNumber = vidNumber;
+ };
+
}]
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
index 655699b..e3c666b 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
@@ -140,7 +140,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
.orderBy([{ field: '_Title', sort: 'asc' }])
.select();
- console.log($scope.selectedCIListViewData);
+ // console.log($scope.selectedCIListViewData);
$('#grid-view').empty();
angular.forEach($scope.selectedCIListViewData, function (value, key) {
$scope.imagePath = "~/../content/images/ci/thumbnails/" + value._ThumbnailImage;
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
index 76077cc..17b6715 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -1943,18 +1943,41 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
$scope.HighlightBodyOnExtract = function () {
console.log(' insode HighlightBodyOnExtract. $rootScope.MaskCanvasData length= ' + $rootScope.MaskCanvasData.length + ', $rootScope.previousHighlightList.length= ' + $rootScope.previousHighlightList.length)
+
+ $("#btnExtract").removeClass("btn-black");
+ $("#btnExtract").addClass("btn-primary");
+
+
+ if ($("#btnNormalMode").hasClass("btn-primary")) {
+ $("#btnNormalMode").removeClass("btn-primary");
+ $("#btnNormalMode").addClass("btn-black");
+ }
+
+ if ($("#btnHighLight").hasClass("btn-primary")) {
+ $("#btnHighLight").removeClass("btn-primary");
+ $("#btnHighLight").addClass("btn-black");
+ }
+
+
+ //terminate previous running workers to create space for new workers
+ $scope.layerNumber = $('#txtlayerNumber').val();
+ $scope.terminateCurrentlyRunningWPs();
+
var multiTermList = [];
var CallBackBodyRegion = [];
+ var selectedAnnotation;
if ($rootScope.isListManagerSelected) {
multiTermList = $scope.AllTerms;
+ selectedAnnotation = $rootScope.actualTermNumber;
}
else if (($rootScope.previousHighlightList != null || $rootScope.previousHighlightList != undefined) && ($rootScope.previousHighlightList.length > 0)) {
angular.forEach($rootScope.previousHighlightList, function (value, key) {
var ActualTermNo = $scope.getActualTermNumber(value);
+ selectedAnnotation = ActualTermNo;
if (ActualTermNo != null) {
var TermList = $scope.getTermNumberList(ActualTermNo);
if (TermList != null) {
@@ -1968,16 +1991,12 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
});
}
- //2. Find Actul Term No Based on Icolor.
- //var ActualTermNo = $scope.getActualTermNumber(RGBColor);
-
- ////3. Find Term No List Based on ActualTermNo
- //var TermList = $scope.getTermNumberList(ActualTermNo);
+ //get term list to get term coordinates
+ $scope.TermList = $scope.getTermNumberList(selectedAnnotation);
-
- //terminate previous running workers to create space for new workers
- $scope.layerNumber = $('#txtlayerNumber').val();
- $scope.terminateCurrentlyRunningWPs();
+ $scope.termCoordinate = $scope.getTermCoordinate(selectedAnnotation);
+
+
$timeout(function () {
@@ -2076,7 +2095,6 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
grayCanvasContext.putImageData(updatedData, 0, 0);
-
//to resolve lateral arm black issue in highlight mode
if ($rootScope.viewOrientationId == 5 && (bodyRegionId == 6 || bodyRegionId == 4)) {
@@ -2098,6 +2116,22 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
grayCanvasContext.putImageData(imgData, 0, 0);
}
+ CallBackBodyRegion.push(bodyRegionId);
+
+ $scope.doAligneCanvasWithTerm = false;
+ if ((($rootScope.viewOrientationId == '1') || ($rootScope.viewOrientationId == '4')) && (CallBackBodyRegion.length == 9)) {
+ $scope.doAligneCanvasWithTerm = true;
+ }
+ else if ((($rootScope.viewOrientationId == '2') || ($rootScope.viewOrientationId == '3')) && (CallBackBodyRegion.length == 5)) {
+ $scope.doAligneCanvasWithTerm = true;
+ }
+ else if ((($rootScope.viewOrientationId == '5')) && (CallBackBodyRegion.length == 1)) {
+ $scope.doAligneCanvasWithTerm = true;
+ }
+ else if ((($rootScope.viewOrientationId == '6')) && (CallBackBodyRegion.length == 1)) {
+ $scope.doAligneCanvasWithTerm = true;
+ }
+
if ($rootScope.multiAnnotationIsON == true) {
@@ -2125,9 +2159,14 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
// }
//}
+ if ($scope.doAligneCanvasWithTerm == true) {
+ $scope.aligneCanvasWithTerm()
+ }
$timeout(function () { $scope.DisableProgressBar() }, 1000);
+
+
};
worker.onerror = function (e) {
alert('Error: Line ' + e.lineno + ' in ' + e.filename + ': ' + e.message);
@@ -3600,7 +3639,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
$scope.createTransparencyBox = function () {
- $scope.isTransparencyActivated = true;
+
+ $scope.isTransparencyBtnClicked = true;
//do not create TBOX if in extarct mode otherwise create
if ($rootScope.isExtract == false) {
@@ -3767,6 +3807,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
document.getElementById('canvasDiv').appendChild(tempCanvas);
}
+ $scope.isTransparencyActivated = true;
var BodyRegionDictionary = $rootScope.BodyRegionCordinatesData;
@@ -4897,9 +4938,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
$rootScope.CloseListManager();
// $('#btnIdentity').addClass('btn-primary');
- if ($scope.isTransparencyActivated == true) {
+ if ($scope.isTransparencyBtnClicked == true) {
- $scope.isTransparencyActivated = false;
+ $scope.isTransparencyBtnClicked = false;
var canvasDiv = document.getElementById('canvasDiv');
canvasDiv.removeEventListener("mousedown", mouseDownListener);
@@ -4920,7 +4961,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
$rootScope.isTransparencyBoxActivated = false;
$rootScope.isNormalMode = false;
-
+
//if listanager is visisble then close it
$rootScope.CloseListManager();
@@ -4951,21 +4992,29 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
}
else {
$scope.zoomInOut = 25;
+
+
}
//2.
$scope.CalculateImageCordinates($rootScope.viewOrientationId);
//3.
- if ($scope.zoomInOut == 25) {
- if ($('#canvasDiv') != null)
- $('#canvasDiv').scrollLeft(0)
- }
- else {
- if ($('#canvasDiv') != null)
- $('#canvasDiv').scrollLeft($('#canvasDiv').width() / 2)
- }
+
+ if ($scope.zoomInOut == 25) {
+ if ($('#canvasDiv') != null)
+ $('#canvasDiv').scrollLeft(0)
+
+ }
+ else {
+ if ($('#canvasDiv') != null)
+ $('#canvasDiv').scrollLeft($('#canvasDiv').width() / 2)
+
+
+ }
+
+
//remove annotation speech bubble
if ($('#dot').length > 0) {
$('#dot').remove();
@@ -5284,8 +5333,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
$rootScope.CanvasDivLeftPosition = $("#canvasDiv").scrollLeft();
-
-
+
if ($scope.isTransparencyActivated == true) {
$("#btnExtract").addClass("disabled");
@@ -5878,8 +5926,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
// $rootScope.isHighlightBodyByBodySystem = false;
- $rootScope.isLoading = true;
- $('#spinner').css('visibility', 'visible');
+
$rootScope.isGenderChnage = true;
@@ -5894,6 +5941,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
//2 first update the currentbodyviewid in local storage
localStorage.setItem("currentBodyViewId", currentBodyViewId);
+ $rootScope.isLoading = true;
+ $('#spinner').css('visibility', 'visible');
//3.
$scope.layerNumber = 0;
$scope.loadSelectedBodyView(currentBodyViewId);
@@ -5922,6 +5971,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
//2. first update the currentbodyviewid in local storage
localStorage.setItem("currentBodyViewId", currentBodyViewId);
+ $rootScope.isLoading = true;
+ $('#spinner').css('visibility', 'visible');
//3.
$scope.layerNumber = 0;
$scope.loadSelectedBodyView(currentBodyViewId);
@@ -6080,9 +6131,6 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
// $rootScope.isHighlightBodyByBodySystem = false;
- $rootScope.isLoading = true;
- $('#spinner').css('visibility', 'visible');
-
if ($rootScope.openViews.length > 0) {
$rootScope.openViews.splice($rootScope.openViews.length - 1);
@@ -6105,6 +6153,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
$rootScope.voId = selectedViewId;
$rootScope.isLoading = true;
+ $rootScope.isLoading = true;
+ $('#spinner').css('visibility', 'visible');
+
//1. first update the currentbodyviewid in local storage
localStorage.setItem("currentBodyViewId", $rootScope.voId);
@@ -6140,6 +6191,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
$rootScope.voId = selectedViewId;
$rootScope.isLoading = true;
+ $rootScope.isLoading = true;
+ $('#spinner').css('visibility', 'visible');
//1.
$scope.loadSelectedBodyView($rootScope.voId);
@@ -6826,14 +6879,14 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
}
}
- $('#spinner').css('visibility', 'visible');
- console.log('listManagerEvent');
+
if ($rootScope.islistManagerEventAlredayDispachted == true) {
-
+ $('#spinner').css('visibility', 'visible');
+ console.log('listManagerEvent');
var systemList = $rootScope.CommonData.DACommonData.BodySystems.Item;
$('#bodySystems').empty();
@@ -6921,13 +6974,16 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
var $el = $('
').appendTo('#termList')
$compile($el)($scope);
- $rootScope.isLoading = false;
- $('#spinner').css('visibility', 'hidden');
}
+
+ $rootScope.isLoading = false;
+ $('#spinner').css('visibility', 'hidden');
+
var termsTotal = '
' + $scope.VocabTermTxt.length + ' Structures';
$("#totalTerms").empty();
$('#totalTerms').append(termsTotal);
-
+
+
}
}
@@ -7080,6 +7136,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
$rootScope.isHighLight = false;
$('#sppeachBubble').css('display', 'none');
$("#dot").css("display", "none");
+ //DA > Annotation's Line should not displayed.
+ $("#bord").css("display", "none");
//redraw body of respective layer
$scope.CalculateImageCordinates($rootScope.viewOrientationId)
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
index 2fb82b9..136dcac 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -1,7 +1,7 @@
'use strict';
-AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", "$timeout",
- function ($rootScope, Modules, $log, $location, $timeout) {
+AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", "$timeout", "DataService",
+ function ($rootScope, Modules, $log, $location, $timeout, DataService) {
//$scope.pageToOpen = {
// name: 'MainMenu'
@@ -149,7 +149,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
//theme:"rounded"
});
}
-
+ $rootScope.isFontFamilyLoaded = false;
//annotation tool custom events
$rootScope.ShowAnnotationWindow = function () {
//7904
@@ -163,6 +163,33 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
$rootScope.$broadcast('annotationToolEvent', true);
$("#canvasPaint").css("display", "none");
$("#canvas").css("display", "none");
+
+ var FontFamilyJson = '~/../content/data/json/settings/fontstyle.json';
+ if ($rootScope.isFontFamilyLoaded == false) {
+
+
+ DataService.getJson(FontFamilyJson)
+ .then(
+ function (result) {
+
+ $rootScope.AnnotationFontFamily = result;
+ // alert($rootScope.AnnotationFontFamily.FontStyle.length);
+
+ for (var i = 0; i <= $rootScope.AnnotationFontFamily.FontFamily.length - 1; i++) {
+
+ $("#selected-font-family").append("
");
+
+ }
+ $rootScope.isFontFamilyLoaded = true;
+
+ },
+ function (error) {
+ console.log(error.statusText)
+ }
+ )
+
+ }
+
}
$rootScope.CloseAnnotationTool = function () {
@@ -178,6 +205,8 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
$rootScope.isAnnotationWindowClose = true;
$("#canvasPaint").css("display", "none");
$("#canvas").css("display", "none");
+ $('.btnCursor').removeClass('activebtncolor');
+ $(".btn-annotation").removeClass("activebtncolor");
}
$rootScope.CIAnotationIdentifyModeOff = false;
$rootScope.OnIdentifyClick = function () {
@@ -401,9 +430,13 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
document.getElementById('modeleditstyle').style.display = "none";
$rootScope.shapestyleOpacity = $("#" + id).css('opacity');
- $rootScope.shapestyleFillColor = $("#" + id).parent().css('background-color');
+ $("#shapeStyleDiv").parent().css("opacity", $rootScope.shapestyleOpacity);
+ $rootScope.shapestyleFillColor = $("#" + id).css('background-color');
+ $("#shapeStyleDiv").css("background-color", $rootScope.shapestyleFillColor);
$rootScope.shapestyleborderColor = $("#" + id).parent().css("border-top-color");
+ $("#shapeStyleDiv").parent().css("border-color", $rootScope.shapestyleborderColor);
$rootScope.shapestyleborderWidthSeparatingPixel = $("#" + id).parent().css("border-top-width");
+ $("#shapeStyleDiv").parent().css("border-width", $rootScope.shapestyleborderWidthSeparatingPixel);
var pixelSeparation = $rootScope.shapestyleborderWidthSeparatingPixel;
var intPart = pixelSeparation.split("p");
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js b/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js
index 425e466..09d92d7 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js
@@ -272,7 +272,7 @@ AIA.constant('BodySystems', ['Cardiovascular', 'Digestive', 'Endocrine', 'Immune
AIA.constant('ViewOrientations', ['Anterior', 'Posterior', 'Lateral','Medial', 'Superior', 'Inferior', 'Non-standard']);
-AIA.constant('MedicalSpecialties', ['Allergy & Immunology', 'Anesthesiology', 'Cardiology', 'Chiropractic', 'Dentistry', 'Dermatology', 'Embryology', 'Emergency Medicine', 'Endocrinology', 'First Aid', 'Gastroenterology', 'General Surgery', 'Geriatrics', 'Hematology', 'Infectious Diseases', 'Microbiology', 'Nuclear Medicine', 'Nephrology', 'Neurology', 'Nutrition', 'Obstetrics and Gynecology (OB/GYN)', 'Oncology (Cancer)', 'Opthalmology', 'Optometry', 'Orthopedics', 'Osteopathy', 'Otolaryngology (ENT)', 'Pathology', 'Pediatrics', 'Physiology', 'Plastic Surgery', 'Podiatry', 'Pulmonary Medicine', 'Radiology', 'Respiratory Therapy', 'Rheumatology', 'Sports Medicine', 'Vascular Medicine', 'Thoracic Surgery']);
+AIA.constant('MedicalSpecialties', ['Allergy & Immunology', 'Anesthesiology', 'Cardiology', 'Chiropractic', 'Dentistry', 'Dermatology', 'Embryology', 'Emergency Medicine', 'Endocrinology', 'First Aid', 'Gastroenterology', 'General Surgery', 'Geriatrics', 'Hematology', 'Infectious Diseases', 'Microbiology', 'Nuclear Medicine', 'Nephrology', 'Neurology', 'Nutrition', 'Obstetrics and Gynecology (OB/GYN)', 'Oncology (Cancer)', 'Opthalmology', 'Optometry', 'Orthopedics', 'Osteopathy', 'Otolaryngology (ENT)', 'Pathology', 'Pediatrics', 'Physiology', 'Plastic Surgery', 'Podiatry', 'Pulmonary Medicine', 'Radiology', 'Respiratory Therapy', 'Rheumatology', 'Sports Medicine', 'Urology', 'Vascular Medicine', 'Thoracic Surgery']);
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-body-view-list.html b/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-body-view-list.html
index c4b25ca..5f4ffc1 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-body-view-list.html
+++ b/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-body-view-list.html
@@ -28,17 +28,7 @@
@@ -1113,6 +1128,7 @@
+
@@ -1155,11 +1171,10 @@
range: "min",
min: 1,
max: 60,
- value: 10,
+ value: 1,
slide: function (event, ui) {
- $("#amount-2").val(ui.value);
-
+ $("#btnBrushSize").val(ui.value);
},
stop: function (event, ui) {
@@ -1169,6 +1184,44 @@
}
});
+
+
+ $("#btnBrushSize").keydown(function () {
+ var brushSizevalue = this.value;
+ $("#slider-range-min-2").slider("value", parseInt(brushSizevalue));
+ });
+ $("#btnBrushSize").keyup(function () {
+ var brushSizevalue = this.value;
+ $("#slider-range-min-2").slider("value", parseInt(brushSizevalue));
+ });
+ $("#btnBrushSizeIncrement").click(function () {
+ var brushIncrementVar = $("#btnBrushSize").val();
+ if (brushIncrementVar >= 60) {
+ $("#slider-range-min-2").slider("value", 60);
+ }
+ else {
+ var brushIncrementedValue = parseInt(brushIncrementVar) + 1;
+ $("#btnBrushSize").val(brushIncrementedValue);
+ $("#slider-range-min-2").slider("value", parseInt(brushIncrementedValue));
+ }
+ });
+ $("#btnBrushSizeDecrease").click(function () {
+ var brushDecreaseVar = $("#btnBrushSize").val();
+ if (brushDecreaseVar <= 1) {
+ $("#slider-range-min-2").slider("value", 1);
+ }
+ else {
+ var brushDecrementedValue = parseInt(brushDecreaseVar) - 1;
+ $("#btnBrushSize").val(brushDecrementedValue);
+ $("#slider-range-min-2").slider("value", parseInt(brushDecrementedValue));
+ }
+ });
+ $("#btnBrushSize").val($("#slider-range-min-2").slider("value"));
+
+
+
+
+
//$("#slider-range-min-2").on("slidestart", function (event, ui) {
// $('.btnCursor').trigger('click');
@@ -1180,7 +1233,6 @@
//});
// $("#slider-range-min-2").on("slidechange", function (event, ui) { alert("ssasa"); });
- $("#amount-2").val($("#slider-vertical-2").slider("value"));
$(function () {
$('[data-toggle="tooltip"]').tooltip();
@@ -1417,7 +1469,7 @@
if (opacity) value += ', ' + opacity;
if (typeof console === 'object') {
console.log(value);
- $("#imgOpacity").parent().css("background-color", value);
+ $("#imgOpacity").css("background-color", value);
}
},
@@ -1462,7 +1514,7 @@
step: .1,
slide: function (event, ui) {
- $(".marginTopBtm10 img.imgopacity").css("opacity", ui.value);
+ $(".marginTopBtm10 .imgopacity").css("opacity", ui.value);
// $("#slider-value").html(ui.value);
}
diff --git a/400-SOURCECODE/AIAHTML5.Web/libs/video_4_12_11/css/font/vjs.eot b/400-SOURCECODE/AIAHTML5.Web/libs/video_4_12_11/css/font/vjs.eot
new file mode 100644
index 0000000..a2c0f5f
--- /dev/null
+++ b/400-SOURCECODE/AIAHTML5.Web/libs/video_4_12_11/css/font/vjs.eot
diff --git a/400-SOURCECODE/AIAHTML5.Web/libs/video_4_12_11/css/font/vjs.svg b/400-SOURCECODE/AIAHTML5.Web/libs/video_4_12_11/css/font/vjs.svg
new file mode 100644
index 0000000..fa6aa7b
--- /dev/null
+++ b/400-SOURCECODE/AIAHTML5.Web/libs/video_4_12_11/css/font/vjs.svg
@@ -0,0 +1,28 @@
+
+
+
\ No newline at end of file
diff --git a/400-SOURCECODE/AIAHTML5.Web/libs/video_4_12_11/css/font/vjs.ttf b/400-SOURCECODE/AIAHTML5.Web/libs/video_4_12_11/css/font/vjs.ttf
new file mode 100644
index 0000000..682a9b2
--- /dev/null
+++ b/400-SOURCECODE/AIAHTML5.Web/libs/video_4_12_11/css/font/vjs.ttf
diff --git a/400-SOURCECODE/AIAHTML5.Web/libs/video_4_12_11/css/font/vjs.woff b/400-SOURCECODE/AIAHTML5.Web/libs/video_4_12_11/css/font/vjs.woff
new file mode 100644
index 0000000..a79d0fa
--- /dev/null
+++ b/400-SOURCECODE/AIAHTML5.Web/libs/video_4_12_11/css/font/vjs.woff
diff --git a/400-SOURCECODE/AIAHTML5.Web/libs/video_4_12_11/css/video-js_4_12_11.css b/400-SOURCECODE/AIAHTML5.Web/libs/video_4_12_11/css/video-js_4_12_11.css
new file mode 100644
index 0000000..fd688e2
--- /dev/null
+++ b/400-SOURCECODE/AIAHTML5.Web/libs/video_4_12_11/css/video-js_4_12_11.css
@@ -0,0 +1,1225 @@
+/*!
+Video.js Default Styles (http://videojs.com)
+Version 4.12.11
+Create your own skin at http://designer.videojs.com
+*/
+/* SKIN
+================================================================================
+The main class name for all skin-specific styles. To make your own skin,
+replace all occurrences of 'vjs-default-skin' with a new name. Then add your new
+skin name to your video tag instead of the default skin.
+e.g.