Mercurial > hg > orthanc

diff OrthancServer/ServerJobs/DicomModalityStoreJob.h @ 3875:ea1d32861cfc transcoding

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
moving timeout from DicomAssocation to DicomAssociationParameters
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 04 May 2020 14:49:31 +0200
parents 09798f2b985f
children 661c931f22ad
line wrap: on
line diff
--- a/OrthancServer/ServerJobs/DicomModalityStoreJob.h	Thu Apr 30 15:00:20 2020 +0200
+++ b/OrthancServer/ServerJobs/DicomModalityStoreJob.h	Mon May 04 14:49:31 2020 +0200
@@ -47,9 +47,7 @@
   {
   private:
     ServerContext&                             context_;
-    std::string                                localAet_;
-    RemoteModalityParameters                   remote_;
-    int                                        timeout_;
+    DicomAssociationParameters                 parameters_;
     std::string                                moveOriginatorAet_;
     uint16_t                                   moveOriginatorId_;
     std::unique_ptr<DicomStoreUserConnection>  connection_;
@@ -75,29 +73,16 @@
     DicomModalityStoreJob(ServerContext& context,
                           const Json::Value& serialized);
 
-    const std::string& GetLocalAet() const
+    const DicomAssociationParameters& GetParameters() const
     {
-      return localAet_;
+      return parameters_;
     }
 
     void SetLocalAet(const std::string& aet);
 
-    const RemoteModalityParameters& GetRemoteModality() const
-    {
-      return remote_;
-    }
-
     void SetRemoteModality(const RemoteModalityParameters& remote);
 
-    void SetTimeout(int timeout)
-    {
-      timeout_ = timeout;
-    }
-
-    int GetTimeout() const
-    {
-      return timeout_;
-    }
+    void SetTimeout(uint32_t seconds);
 
     bool HasMoveOriginator() const
     {