Improving running of program within simplesim

paradise-fi · Sep 19, 2024 · 2e61755 · 2e61755
1 parent 8755f87
commit 2e61755
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 38 deletions.
diff --git a/softwareComponents/simplesimClientLib/include/runmodules.hpp b/softwareComponents/simplesimClientLib/include/runmodules.hpp
@@ -7,6 +7,7 @@
 #include <atoms/util.hpp>
 
 #include <QListWidgetItem>
+#include <QDialog>
 
 
 namespace Ui
@@ -17,14 +18,16 @@ class RunModules;
 namespace rofi::simplesim
 {
 
-class RunModules : public QWidget {
+class RunModules : public QDialog {
     Q_OBJECT
 
 public:
-    // TODO: Fix passing bool&, it isn't really nice.
-    RunModules( bool& isRunning, QWidget * parent = nullptr, std::size_t moduleCount = 0 );
+    RunModules( QWidget * parent = nullptr );
 
     ~RunModules();
+
+    std::string getProgram();
+
 signals:
 
 private slots:
@@ -33,9 +36,7 @@ private slots:
 
 private:
     std::unique_ptr< Ui::RunModules > _ui;
-    std::size_t _moduleCount;
-    // TODO: Fix this, it isn't really nice.
-    bool& _isRunning;
+    std::string _program;
 };
 
 } // namespace rofi::simplesim
diff --git a/softwareComponents/simplesimClientLib/include/simplesim_client.hpp b/softwareComponents/simplesimClientLib/include/simplesim_client.hpp
@@ -31,6 +31,7 @@
 #include <QTimer>
 #include <QTreeWidgetItem>
 #include <QWidgetItem>
+#include <QProcess>
 
 
 #define vtkTypeMacro_( thisClass, superClass ) \
@@ -217,6 +218,7 @@ private slots:
     int _lastModule = -1;
     std::array< double, 3 > _lastColor;
     bool _isRunning = false;
+    std::vector< std::unique_ptr< QProcess > > _moduleProcesses;
 
     std::vector< rofi::configuration::ModuleId > _treeIdMapping;
     std::map< rofi::configuration::ModuleId, detail::ModuleRenderInfo > _moduleRenderInfos;

diff --git a/softwareComponents/simplesimClientLib/src/runmodules.cpp b/softwareComponents/simplesimClientLib/src/runmodules.cpp
@@ -8,9 +8,8 @@
 
 using rofi::simplesim::RunModules;
 
-RunModules::RunModules( bool& isRunning, QWidget* parent, std::size_t moduleCount )
-    : QWidget( parent ), _ui( std::make_unique< Ui::RunModules >() ), 
-      _moduleCount( moduleCount ), _isRunning( isRunning )
+RunModules::RunModules( QWidget* parent )
+    : QDialog( parent ), _ui( std::make_unique< Ui::RunModules >() ) 
 {
     _ui->setupUi( this );
 
@@ -24,31 +23,13 @@ RunModules::~RunModules() {}
 void RunModules::accept()
 {
     hide();
-    std::string program = _ui->textEdit->toPlainText().toStdString();
+    _program = _ui->textEdit->toPlainText().toStdString();
     _ui->textEdit->setPlainText( "" );
 
-    std::string simplesimPath = std::string(std::getenv("ROFI_BUILD_DIR")) + "/desktop/bin/rofi-simplesim";
-    std::string programPath = std::string(std::getenv("ROFI_BUILD_DIR")) + "/desktop/bin/" + program;
-    std::cout << "Running " << programPath << " for " << _moduleCount << " modules in the simulation." << std::endl;
-    _isRunning = true;
-
-    const char* executable = programPath.c_str();
-
-    for ( std::size_t i = 0; i < _moduleCount; ++i ) 
-    {
-        std::cout << "Running module " << i << std::endl;
-        pid_t module_id = fork();
-        if ( module_id == -1 )
-        {
-            std::cerr << "Failed to run module: " << std::strerror( errno ) << std::endl;
-            return;
-        }
-
-        if ( module_id == 0 )
-        {
-            if ( execl( executable, executable, static_cast< char* >( 0 ) ) == -1 ) {
-                std::cerr << "Failed to run module: " << std::strerror( errno ) << std::endl;
-            }
-        }
-    }
+    done( QDialog::Accepted );
+}
+
+std::string RunModules::getProgram()
+{
+    return _program;
 }
diff --git a/softwareComponents/simplesimClientLib/src/simplesim_client.cpp b/softwareComponents/simplesimClientLib/src/simplesim_client.cpp
@@ -447,9 +447,30 @@ void SimplesimClient::runModulesWindow()
     if ( !_runModulesWindow ) 
     {
         _runModulesWindow = 
-            std::make_unique< RunModules >( _isRunning, this, getCurrentConfig()->modules().size() );
+            std::make_unique< RunModules >( this );
+    }
+    // _runModulesWindow->show();
+    if (_runModulesWindow->exec() != QDialog::Accepted)
+    {
+        return;
+    }
+    std::string simplesimPath = std::string( std::getenv( "ROFI_BUILD_DIR" ) ) + "/desktop/bin/rofi-simplesim";
+    std::string program = _runModulesWindow->getProgram();
+    std::string programPath = std::string( std::getenv( "ROFI_BUILD_DIR" ) ) + "/desktop/bin/" + program; 
+
+    QString executable = QString::fromStdString( programPath );
+    QStringList arguments;
+
+    std::size_t moduleCount = getCurrentConfig()->modules().size();
+
+    for ( std::size_t i = 0; i < moduleCount; ++i )
+    {
+        std::cout << "Running module " << i << std::endl;
+        _moduleProcesses.push_back( std::make_unique< QProcess >( this ) );
+        _moduleProcesses[i]->start( executable, arguments );
+
+        // ToDo: Capture output in a separate console window.
     }
-    _runModulesWindow->show();
 }
 
 void SimplesimClient::setCamera( Matrix focalPoint )

diff --git a/tools/rofi-run/explorer/explorer.cpp b/tools/rofi-run/explorer/explorer.cpp
@@ -33,7 +33,7 @@ void Explorer::clearPath()
 
 void Explorer::reject()
 {
-   done(QDialog::Rejected);
+   done( QDialog::Rejected );
 }
 
 void Explorer::accept()
@@ -49,7 +49,7 @@ void Explorer::accept()
         return;
 
     }
-    done(QDialog::Accepted);
+    done( QDialog::Accepted );
 }
 
 void Explorer::setAcceptedExtension( std::string extension )