# HG changeset patch
# User am@osimis.io
# Date 1537881293 -7200
# Node ID be2660b6e40a530363bef30d2ac635fc471360ef
# Parent 6c22e0506587fdda179af69baac7a03861c893d7
wip: commands + status update
diff -r 6c22e0506587 -r be2660b6e40a Applications/Commands/BaseCommandBuilder.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Applications/Commands/BaseCommandBuilder.cpp Tue Sep 25 15:14:53 2018 +0200
@@ -0,0 +1,63 @@
+/**
+ * Stone of Orthanc
+ * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
+ * Department, University Hospital of Liege, Belgium
+ * Copyright (C) 2017-2018 Osimis S.A., Belgium
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see .
+ **/
+
+#include "BaseCommandBuilder.h"
+#include "Core/OrthancException.h"
+#include
+#include "Framework/StoneException.h"
+
+namespace OrthancStone
+{
+ ICommand* BaseCommandBuilder::CreateFromJson(const Json::Value& commandJson)
+ {
+ if (!commandJson.isObject() || !commandJson["command"].isString())
+ {
+ throw StoneException(ErrorCode_CommandJsonInvalidFormat);
+ }
+
+ if (commandJson["commandType"].isString() && commandJson["commandType"].asString() == "simple")
+ {
+ printf("creating a simple command\n");
+ return new SimpleCommand(commandJson["command"].asString().c_str());
+ }
+
+ return NULL;
+ // std::string commandName = commandJson["command"].asString();
+
+
+
+
+ // CommandCreationFunctions::const_iterator it = commands_.find(commandName);
+ // if (it == commands_.end())
+ // {
+ // throw Orthanc::OrthancException(Orthanc::ErrorCode_UnknownResource); // TODO: use StoneException ?
+ // }
+
+ // // call the CreateCommandFn to build the command
+ // ICommand* command = it->second();
+ // if (commandJson["args"].isObject())
+ // {
+ // command->Configure(commandJson["args"]);
+ // }
+
+ // return command;
+ }
+
+}
diff -r 6c22e0506587 -r be2660b6e40a Applications/Commands/BaseCommandBuilder.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Applications/Commands/BaseCommandBuilder.h Tue Sep 25 15:14:53 2018 +0200
@@ -0,0 +1,38 @@
+/**
+ * Stone of Orthanc
+ * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
+ * Department, University Hospital of Liege, Belgium
+ * Copyright (C) 2017-2018 Osimis S.A., Belgium
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see .
+ **/
+
+#pragma once
+
+#include