Mercurial > hg > orthanc-stone

changeset 2299:5e19a6760208 refactoring

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cleaning
author Sebastien Jodogne <s.jodogne@gmail.com>
date Sun, 27 Sep 2026 10:46:33 +0200
parents e057abc1a572
children e2042d2a4c32
files Applications/Samples/Sdl/SingleFrameViewer/SdlSimpleViewer.cpp Applications/StoneWebViewer/WebAssembly/StoneWebViewer.cpp OrthancStone/Sources/StoneApplication.cpp OrthancStone/Sources/StoneApplication.h
diffstat 4 files changed, 35 insertions(+), 30 deletions(-) [+]
line wrap: on
line diff
--- a/Applications/Samples/Sdl/SingleFrameViewer/SdlSimpleViewer.cpp	Sat Sep 26 12:34:25 2026 +0200
+++ b/Applications/Samples/Sdl/SingleFrameViewer/SdlSimpleViewer.cpp	Sun Sep 27 10:46:33 2026 +0200
@@ -309,18 +309,21 @@
                   case SDLK_b:
                   {
                     // TODO Refactoring
-                    OrthancStone::StoneApplication::GetInstance().Submit(toto_, new OrthancStone::SleepOracleCommand(1000));
+                    OrthancStone::IEnvironment& environment = OrthancStone::StoneApplication::GetInstance().GetEnvironment();
+                    OrthancStone::New::IOracle& oracle = OrthancStone::StoneApplication::GetInstance().GetOracle();
+
+                    oracle.Submit(environment, toto_, new OrthancStone::SleepOracleCommand(1000));
 
                     {
                       std::unique_ptr<OrthancStone::HttpCommand> command(new OrthancStone::HttpCommand);
                       command->SetUrl("http://ip-api.com/json/");
-                      OrthancStone::StoneApplication::GetInstance().Submit(toto_, command.release());
+                      oracle.Submit(environment, toto_, command.release());
                     }
 
                     {
                       std::unique_ptr<OrthancStone::OrthancRestApiCommand> command(new OrthancStone::OrthancRestApiCommand);
                       command->SetUri("/system/");
-                      OrthancStone::StoneApplication::GetInstance().Submit(toto_, command.release());
+                      oracle.Submit(environment, toto_, command.release());
                     }
                     break;
                   }
--- a/Applications/StoneWebViewer/WebAssembly/StoneWebViewer.cpp	Sat Sep 26 12:34:25 2026 +0200
+++ b/Applications/StoneWebViewer/WebAssembly/StoneWebViewer.cpp	Sun Sep 27 10:46:33 2026 +0200
@@ -4887,11 +4887,17 @@
   {
     LOG(ERROR) << "success!";
 
-    /*const OrthancStone::HttpCommand::SuccessMessage& m = dynamic_cast<const OrthancStone::HttpCommand::SuccessMessage&>(result);
-      LOG(WARNING) << m.GetAnswer();*/
-
-    const OrthancStone::OrthancRestApiCommand::SuccessMessage& m = dynamic_cast<const OrthancStone::OrthancRestApiCommand::SuccessMessage&>(result);
-    LOG(WARNING) << m.GetAnswer();
+    if (command.GetType() == OrthancStone::IOracleCommand::Type_Http)
+    {
+      const OrthancStone::HttpCommand::SuccessMessage& m = dynamic_cast<const OrthancStone::HttpCommand::SuccessMessage&>(result);
+      LOG(WARNING) << m.GetAnswer();
+    }
+
+    if (command.GetType() == OrthancStone::IOracleCommand::Type_OrthancRestApi)
+    {
+      const OrthancStone::OrthancRestApiCommand::SuccessMessage& m = dynamic_cast<const OrthancStone::OrthancRestApiCommand::SuccessMessage&>(result);
+      LOG(WARNING) << m.GetAnswer();
+    }
   }
 
   virtual void HandleErrorFromOracle(const OrthancStone::IOracleCommand& command,
@@ -4977,16 +4983,24 @@
     DISPATCH_JAVASCRIPT_EVENT("StoneInitialized");
 
 
-    // TODO Refactoring
-    //OrthancStone::StoneApplication::GetInstance().Submit(toto_, new OrthancStone::SleepOracleCommand(2000));
-
-    /*std::unique_ptr<OrthancStone::HttpCommand> command(new OrthancStone::HttpCommand);
-    command->SetUrl("http://ip-api.com/json/");
-    OrthancStone::StoneApplication::GetInstance().Submit(toto_, command.release());*/
-
-    std::unique_ptr<OrthancStone::OrthancRestApiCommand> command(new OrthancStone::OrthancRestApiCommand);
-    command->SetUri("/system/");
-    OrthancStone::StoneApplication::GetInstance().Submit(toto_, command.release());
+    {
+      OrthancStone::IEnvironment& environment = OrthancStone::StoneApplication::GetInstance().GetEnvironment();
+      OrthancStone::New::IOracle& oracle = OrthancStone::StoneApplication::GetInstance().GetOracle();
+
+      oracle.Submit(environment, toto_, new OrthancStone::SleepOracleCommand(2000));
+
+      {
+        std::unique_ptr<OrthancStone::HttpCommand> command(new OrthancStone::HttpCommand);
+        command->SetUrl("http://ip-api.com/json/");
+        oracle.Submit(environment, toto_, command.release());
+      }
+
+      {
+        std::unique_ptr<OrthancStone::OrthancRestApiCommand> command(new OrthancStone::OrthancRestApiCommand);
+        command->SetUri("/system/");
+        oracle.Submit(environment, toto_, command.release());
+      }
+    }
   }
 
 
--- a/OrthancStone/Sources/StoneApplication.cpp	Sat Sep 26 12:34:25 2026 +0200
+++ b/OrthancStone/Sources/StoneApplication.cpp	Sun Sep 27 10:46:33 2026 +0200
@@ -270,12 +270,4 @@
     assert(pimpl_ != NULL);
     return pimpl_->GetOracle();
   }
-
-
-  void StoneApplication::Submit(const boost::shared_ptr<IOracleClient>& client,
-                                IOracleCommand* command /* takes ownership */)
-  {
-    assert(pimpl_ != NULL);
-    pimpl_->GetOracle().Submit(pimpl_->GetEnvironment(), client, command);
-  }
 }
--- a/OrthancStone/Sources/StoneApplication.h	Sat Sep 26 12:34:25 2026 +0200
+++ b/OrthancStone/Sources/StoneApplication.h	Sun Sep 27 10:46:33 2026 +0200
@@ -119,9 +119,5 @@
     IOracle& GetOldOracle();  // TODO Refactoring - Remove this
 
     New::IOracle& GetOracle();
-
-    // TODO Refactoring - Remove this?
-    void Submit(const boost::shared_ptr<IOracleClient>& client,
-                IOracleCommand* command /* takes ownership */);
   };
 }