Expanding command objects

Author: dcwhite

src/Core/Command/CommandFactory.h

@@ -43,7 +43,7 @@ namespace SCIRun
       {
       public:
         virtual ~GlobalCommandFactory() {}
-        virtual CommandHandle create(GlobalCommands type) const = 0;
+        virtual CommandHandle create(GlobalCommands type, int param = 0) const = 0;
       };
 
       typedef boost::shared_ptr<GlobalCommandFactory> GlobalCommandFactoryHandle;

src/Core/Command/GlobalCommandBuilderFromCommandLine.cc

@@ -68,11 +68,16 @@ using namespace SCIRun::Core::Commands;
     else
       std::cout << "HEADLESS MODE" << std::endl;  /// @todo obviously
 
-    if (params->dataDirectory())
+    if (!params->dataDirectory())
       q->enqueue(cmdFactory_->create(SetupDataDirectory));
 
     if (!params->inputFiles().empty())
-      q->enqueue(cmdFactory_->create(LoadNetworkFile));
+    {
+      for (int i = 0; i < params->inputFiles().size(); ++i)
+      {
+        q->enqueue(cmdFactory_->create(LoadNetworkFile, i));
+      }
+    }
     else if (params->pythonScriptFile())
       q->enqueue(cmdFactory_->create(RunPythonScript));
 

src/Core/ConsoleApplication/ConsoleCommandFactory.cc

@@ -40,7 +40,7 @@ class NothingCommand : public ConsoleCommand
   virtual bool execute() { return true; }
 };
 
-CommandHandle ConsoleGlobalCommandFactory::create(GlobalCommands type) const
+CommandHandle ConsoleGlobalCommandFactory::create(GlobalCommands type, int param) const
 {
   switch (type)
   {
@@ -53,7 +53,7 @@ CommandHandle ConsoleGlobalCommandFactory::create(GlobalCommands type) const
   case PrintVersion:
     return boost::make_shared<PrintVersionCommand>();
   case LoadNetworkFile:
-    return boost::make_shared<LoadFileCommandConsole>();
+    return boost::make_shared<LoadFileCommandConsole>(param);
   case RunPythonScript:
     return boost::make_shared<RunPythonScriptCommandConsole>();
   case ExecuteCurrentNetwork:

src/Core/ConsoleApplication/ConsoleCommandFactory.h

@@ -39,7 +39,7 @@ namespace Console {
   class SCISHARE ConsoleGlobalCommandFactory : public Core::Commands::GlobalCommandFactory
   {
   public:
-    virtual Core::Commands::CommandHandle create(Core::Commands::GlobalCommands type) const;
+    virtual Core::Commands::CommandHandle create(Core::Commands::GlobalCommands type, int param) const override;
   };
 
 }}}

src/Core/ConsoleApplication/ConsoleCommands.cc

@@ -43,7 +43,7 @@ bool LoadFileCommandConsole::execute()
   auto inputFiles = Application::Instance().parameters()->inputFiles();
   if (!inputFiles.empty())
   {
-    auto filename = inputFiles[0];
+    auto filename = inputFiles[index_];
 
     /// @todo: real logger
     std::cout << "Attempting load of " + filename << std::endl;

src/Core/ConsoleApplication/ConsoleCommands.h

@@ -39,7 +39,10 @@ namespace Console {
   class SCISHARE LoadFileCommandConsole : public Core::Commands::ConsoleCommand
   {
   public:
+    explicit LoadFileCommandConsole(int index) : index_(index) {}
     virtual bool execute();
+  private:
+    int index_;
   };
 
   class SCISHARE RunPythonScriptCommandConsole : public Core::Commands::ConsoleCommand
@@ -77,7 +80,7 @@ namespace Console {
   public:
     virtual bool execute();
   };
-  
+
   /// @TODO
 //   class SCISHARE SetupDataDirectoryCommand : public Core::Commands::ConsoleCommand
 //   {

src/Interface/Application/GuiCommandFactory.cc

@@ -36,7 +36,7 @@ using namespace SCIRun::Gui;
 using namespace SCIRun::Core::Commands;
 using namespace SCIRun::Core::Console;
 
-CommandHandle GuiGlobalCommandFactory::create(GlobalCommands type) const
+CommandHandle GuiGlobalCommandFactory::create(GlobalCommands type, int param) const
 {
   switch (type)
   {
@@ -49,7 +49,7 @@ CommandHandle GuiGlobalCommandFactory::create(GlobalCommands type) const
   case PrintVersion:
     return boost::make_shared<PrintVersionCommand>();
   case LoadNetworkFile:
-    return boost::make_shared<LoadFileCommandGui>();
+    return boost::make_shared<LoadFileCommandGui>(param);
   case RunPythonScript:
     return boost::make_shared<RunPythonScriptCommandGui>();
   case SetupDataDirectory:
@@ -63,4 +63,4 @@ CommandHandle GuiGlobalCommandFactory::create(GlobalCommands type) const
   default:
     THROW_INVALID_ARGUMENT("Unknown global command type.");
   }
-}
+}

src/Interface/Application/GuiCommandFactory.h

@@ -37,7 +37,7 @@ namespace Gui {
   class GuiGlobalCommandFactory : public Core::Commands::GlobalCommandFactory
   {
   public:
-    virtual Core::Commands::CommandHandle create(Core::Commands::GlobalCommands type) const;
+    virtual Core::Commands::CommandHandle create(Core::Commands::GlobalCommands type, int param) const override;
   };
 
 }

src/Interface/Application/GuiCommands.cc

@@ -50,7 +50,7 @@ using namespace SCIRun::Dataflow::Networks;
 bool LoadFileCommandGui::execute()
 {
   auto inputFiles = Application::Instance().parameters()->inputFiles();
-  return SCIRunMainWindow::Instance()->loadNetworkFile(QString::fromStdString(inputFiles[0]));
+  return SCIRunMainWindow::Instance()->loadNetworkFile(QString::fromStdString(inputFiles[index_]));
 }
 
 bool ExecuteCurrentNetworkCommandGui::execute()

src/Interface/Application/GuiCommands.h

@@ -43,7 +43,10 @@ namespace Gui {
   class LoadFileCommandGui : public Core::Commands::GuiCommand
   {
   public:
+    explicit LoadFileCommandGui(int index) : index_(index) {}
     virtual bool execute();
+  private:
+    int index_;
   };
 
   class RunPythonScriptCommandGui : public Core::Commands::GuiCommand
@@ -81,7 +84,7 @@ namespace Gui {
   public:
     virtual bool execute();
   };
-  
+
   class ShowSplashScreenGui : public Core::Commands::GuiCommand
   {
   public:
@@ -92,7 +95,7 @@ namespace Gui {
     static QSplashScreen* splash_;
     static QTimer* splashTimer_;
   };
-  
+
   class FileOpenCommand : public Core::Commands::GuiCommand
   {
   public: