orthanc-stone: Applications/StoneWebViewer/WebApplication/app.js comparison

comparison Applications/StoneWebViewer/WebApplication/app.js @ 2003:963f28eb40cb deep-learning

integration default->deep-learning

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Wed, 02 Nov 2022 15:14:56 +0100
parents	2034ae383cfd e943a84da9ac
children	04148de691a7

comparison

equal deleted inserted replaced

-:2034ae383cfd
+:963f28eb40cb
 var MOUSE_TOOL_COMBINED = 1;
 var MOUSE_TOOL_ZOOM = 2;
 var MOUSE_TOOL_PAN = 3;
 var MOUSE_TOOL_CROSSHAIR = 4;
-var MOUSE_TOOL_CREATE_SEGMENT = 5;
+var MOUSE_TOOL_CREATE_LENGTH = 5;
 var MOUSE_TOOL_CREATE_ANGLE = 6;
 var MOUSE_TOOL_CREATE_CIRCLE = 7;
 var MOUSE_TOOL_REMOVE_MEASURE = 8;
+var MOUSE_TOOL_CREATE_PIXEL_PROBE = 9;       // New in 2.4
+var MOUSE_TOOL_CREATE_ELLIPSE_PROBE = 10;    // New in 2.4
+var MOUSE_TOOL_CREATE_RECTANGLE_PROBE = 11;  // New in 2.4
+var MOUSE_TOOL_CREATE_TEXT_ANNOTATION = 12;  // New in 2.4
+var MOUSE_TOOL_MAGNIFYING_GLASS = 13;        // New in 2.4
 function getParameterFromUrl(key) {
 var url = window.location.search.substring(1);
 var args = url.split('&');
 else if (config == "Rotate") {
 return stone.WebViewerAction.ROTATE;
 }
 else if (config == "Crosshair") {
 return stone.WebViewerAction.CROSSHAIR;
+}
+else if (config == "MagnifyingGlass") {
+return stone.WebViewerAction.MAGNIFYING_GLASS;
 }
 else {
 alert('Unsupported mouse action in the configuration file: ' + config);
 return stone.WebViewerAction.PAN;
 }
 data: function () {
 return {
 stone: stone,  // To access global object "stone" from "index.html"
 status: 'waiting',
 currentFrame: 0,
+currentFrameFromUser: 0,
 numberOfFrames: 0,
 quality: '',
 cineControls: false,
 cineIncrement: 0,
 cineFramesPerSecond: 30,
 contentTime: '',
 }
 },
 watch: {
 currentFrame: function(newVal, oldVal) {
-/**
+this.currentFrameFromUser = newVal + 1;
-* The "FrameUpdated" event has been received, which indicates
+if (this.cineLoadingFrame) {
-* that the schedule frame has been displayed: The cine loop can
+/**
-* proceed to the next frame (check out "CineCallback()").
+* The "FrameUpdated" event has been received, which indicates
-**/
+* that the schedule frame has been displayed: The cine loop can
-this.cineLoadingFrame = false;
+* proceed to the next frame (check out "CineCallback()").
+**/
+this.cineLoadingFrame = false;
+} else {
+stone.SetFrame(this.canvasId, newVal);
+}
+},
+currentFrameFromUser: function(newVal, oldVal) {
+if (parseInt(newVal, 10) !== NaN &&
+newVal >= 1 &&
+newVal <= this.numberOfFrames) {
+this.currentFrame = this.currentFrameFromUser - 1;
+}
 },
 content: function(newVal, oldVal) {
 this.status = 'loading';
 this.cineControls = false;
 this.cineMode = '';
 modalPreferences: false,
 // User preferences (stored in the local storage)
 settingNotDiagnostic: true,
 settingSoftwareRendering: false,
+settingLinearInterpolation: true,
 layoutCountX: 1,
 layoutCountY: 1,
 viewport1Width: '100%',
 settingNotDiagnostic: function(newVal, oldVal) {
 localStorage.settingNotDiagnostic = (newVal ? '1' : '0');
 },
 settingSoftwareRendering: function(newVal, oldVal) {
 localStorage.settingSoftwareRendering = (newVal ? '1' : '0');
+},
+settingLinearInterpolation: function(newVal, oldVal) {
+localStorage.settingLinearInterpolation = (newVal ? '1' : '0');
 }
 },
 methods: {
 FitContent: function() {
 // This function can be used even if WebAssembly is not initialized yet
 if (canvas != '') {
 stone.FlipY(canvas);
 }
 },
+RotateLeft: function() {
+var canvas = this.GetActiveCanvas();
+if (canvas != '') {
+stone.RotateLeft(canvas);
+}
+},
+RotateRight: function() {
+var canvas = this.GetActiveCanvas();
+if (canvas != '') {
+stone.RotateRight(canvas);
+}
+},
 ApplyPreferences: function() {
 this.modalPreferences = false;
+stone.SetLinearInterpolation(localStorage.settingLinearInterpolation);
 if ((stone.IsSoftwareRendering() != 0) != this.settingSoftwareRendering) {
 document.location.reload();
 }
 },
 stone.ApplyDeepLearningModel(this.GetActiveCanvas());
 }
 },
 mounted: function() {
+// Warning: In this function, the "stone" global object is not initialized yet!
 this.SetViewportLayout('1x1');
 if (localStorage.settingNotDiagnostic) {
 this.settingNotDiagnostic = (localStorage.settingNotDiagnostic == '1');
 }
 if (localStorage.settingSoftwareRendering) {
 this.settingSoftwareRendering = (localStorage.settingSoftwareRendering == '1');
+}
+if (localStorage.settingLinearInterpolation) {
+this.settingLinearInterpolation = (localStorage.settingLinearInterpolation == '1');
 }
 var that = this;
 window.addEventListener('VirtualSeriesThumbnailLoaded', function(args) {
 });
 window.addEventListener('StoneAnnotationRemoved', function() {
 // Ignore
 });
+window.addEventListener('TextAnnotationRequired', function(args) {
+var label = prompt('Enter your annotation:', '');
+if (label !== null) {
+stone.AddTextAnnotation(args.detail.canvasId, label,
+args.detail.pointedX, args.detail.pointedY,
+args.detail.labelX, args.detail.labelY);
+}
+});
 }
 });
 **/
 stone.Setup(Module);
 stone.SetDicomWebRoot(app.globalConfiguration.DicomWebRoot,
 true /* assume "/rendered" is available in DICOMweb (could be a configuration option) */);
-stone.SetSoftwareRendering(localStorage.settingSoftwareRendering == '1');
+stone.SetSoftwareRendering(app.settingSoftwareRendering);
+stone.SetLinearInterpolation(app.settingLinearInterpolation);
 if ('DicomCacheSize' in app.globalConfiguration) {
 stone.SetDicomCacheSize(app.globalConfiguration.DicomCacheSize);
 }