Mercurial > hg > orthanc-databases

diff Framework/Plugins/DatabaseConstraint.h @ 551:1a23f1ce3b98

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
move classes DatabaseConstraint and ISqlLookupFormatter into namespace OrthancDatabases
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 09 Sep 2024 15:19:28 +0200
parents e620f36b8e09
children 7f45f23b10d0
line wrap: on
line diff
--- a/Framework/Plugins/DatabaseConstraint.h	Mon Sep 09 13:29:45 2024 +0200
+++ b/Framework/Plugins/DatabaseConstraint.h	Mon Sep 09 15:19:28 2024 +0200
@@ -45,7 +45,7 @@
 
 #include <deque>
 
-namespace Orthanc
+namespace OrthancDatabases
 {
   enum ConstraintType
   {
@@ -58,9 +58,9 @@
 
   namespace Plugins
   {
-    OrthancPluginResourceType Convert(ResourceType type);
+    OrthancPluginResourceType Convert(Orthanc::ResourceType type);
 
-    ResourceType Convert(OrthancPluginResourceType type);
+    Orthanc::ResourceType Convert(OrthancPluginResourceType type);
 
 #if ORTHANC_PLUGINS_HAS_DATABASE_CONSTRAINT == 1
     OrthancPluginConstraintType Convert(ConstraintType constraint);
@@ -75,8 +75,8 @@
   class DatabaseConstraint : public boost::noncopyable
   {
   private:
-    ResourceType              level_;
-    DicomTag                  tag_;
+    Orthanc::ResourceType     level_;
+    Orthanc::DicomTag         tag_;
     bool                      isIdentifier_;
     ConstraintType            constraintType_;
     std::vector<std::string>  values_;
@@ -84,8 +84,8 @@
     bool                      mandatory_;
 
   public:
-    DatabaseConstraint(ResourceType level,
-                       const DicomTag& tag,
+    DatabaseConstraint(Orthanc::ResourceType level,
+                       const Orthanc::DicomTag& tag,
                        bool isIdentifier,
                        ConstraintType type,
                        const std::vector<std::string>& values,
@@ -96,12 +96,12 @@
     explicit DatabaseConstraint(const OrthancPluginDatabaseConstraint& constraint);
 #endif
 
-    ResourceType GetLevel() const
+    Orthanc::ResourceType GetLevel() const
     {
       return level_;
     }
 
-    const DicomTag& GetTag() const
+    const Orthanc::DicomTag& GetTag() const
     {
       return tag_;
     }
@@ -135,7 +135,7 @@
       return mandatory_;
     }
 
-    bool IsMatch(const DicomMap& dicom) const;
+    bool IsMatch(const Orthanc::DicomMap& dicom) const;
 
 #if ORTHANC_PLUGINS_HAS_DATABASE_CONSTRAINT == 1
     void EncodeForPlugins(OrthancPluginDatabaseConstraint& constraint,