Mercurial > hg > orthanc-wsi

changeset 587:b5fff3e9cb7c annotations

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
moving plugin enum to FrameworkEnumerations.h
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 04 Sep 2026 16:34:01 +0200
parents 28ad390fb2e3
children 5cd0db97602b
files Framework/FrameworkEnumerations.h ViewerPlugin/Annotations/AnnotationsWorkspace.h ViewerPlugin/Annotations/IAuthenticatedUser.h ViewerPlugin/Annotations/UserLayer.h ViewerPlugin/ViewerConfiguration.h
diffstat 5 files changed, 24 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- a/Framework/FrameworkEnumerations.h	Fri Sep 04 16:29:07 2026 +0200
+++ b/Framework/FrameworkEnumerations.h	Fri Sep 04 16:34:01 2026 +0200
@@ -53,6 +53,26 @@
     OpticalPath_Brightfield
   };
 
+
+  // Used by the viewer
+  enum AuthenticationSource
+  {
+    AuthenticationSource_None,
+    AuthenticationSource_RegisteredUsers,
+    AuthenticationSource_Plugin,
+    AuthenticationSource_HttpHeader
+  };
+
+
+  // Used by the viewer
+  enum ProjectRole
+  {
+    ProjectRole_Instructor,
+    ProjectRole_Learner,
+    ProjectRole_Guest
+  };
+
+
   const char* EnumerationToString(ImageCompression compression);
 
   ImageCompression DetectFormatFromFile(const std::string& path);
--- a/ViewerPlugin/Annotations/AnnotationsWorkspace.h	Fri Sep 04 16:29:07 2026 +0200
+++ b/ViewerPlugin/Annotations/AnnotationsWorkspace.h	Fri Sep 04 16:34:01 2026 +0200
@@ -23,7 +23,6 @@
 
 #pragma once
 
-#include "../ViewerConfiguration.h"
 #include "AnnotationsWorkspaceId.h"
 #include "ProjectInformation.h"
 #include "UserAnnotationsSettings.h"
--- a/ViewerPlugin/Annotations/IAuthenticatedUser.h	Fri Sep 04 16:29:07 2026 +0200
+++ b/ViewerPlugin/Annotations/IAuthenticatedUser.h	Fri Sep 04 16:34:01 2026 +0200
@@ -23,7 +23,7 @@
 
 #pragma once
 
-#include "../ViewerConfiguration.h"
+#include "../../Framework/FrameworkEnumerations.h"
 #include "UserId.h"
 
 #include <orthanc/OrthancCPlugin.h>
--- a/ViewerPlugin/Annotations/UserLayer.h	Fri Sep 04 16:29:07 2026 +0200
+++ b/ViewerPlugin/Annotations/UserLayer.h	Fri Sep 04 16:34:01 2026 +0200
@@ -24,7 +24,7 @@
 #pragma once
 
 #include "../../Framework/BackgroundColor.h"
-#include "../ViewerConfiguration.h"
+#include "../../Framework/FrameworkEnumerations.h"
 #include "ILayer.h"
 #include "UserId.h"
 
--- a/ViewerPlugin/ViewerConfiguration.h	Fri Sep 04 16:29:07 2026 +0200
+++ b/ViewerPlugin/ViewerConfiguration.h	Fri Sep 04 16:34:01 2026 +0200
@@ -23,28 +23,13 @@
 
 #pragma once
 
+#include "../Framework/FrameworkEnumerations.h"
+
 #include "../Resources/Orthanc/Plugins/OrthancPluginCppWrapper.h"
 
 
 namespace OrthancWSI
 {
-  enum AuthenticationSource
-  {
-    AuthenticationSource_None,
-    AuthenticationSource_RegisteredUsers,
-    AuthenticationSource_Plugin,
-    AuthenticationSource_HttpHeader
-  };
-
-
-  enum ProjectRole
-  {
-    ProjectRole_Instructor,
-    ProjectRole_Learner,
-    ProjectRole_Guest
-  };
-
-
   class ViewerConfiguration
   {
   private: