Skip to content

Commit

Permalink
Merge pull request #114 from amnp95/master
Browse files Browse the repository at this point in the history
adding shakermaker to the EE-UQ tools
  • Loading branch information
fmckenna authored Sep 27, 2024
2 parents b37eba4 + c67ee1e commit 58789a7
Showing 1 changed file with 29 additions and 20 deletions.
49 changes: 29 additions & 20 deletions WorkflowAppEE_UQ.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,8 @@ UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
#include <SC_ToolDialog.h>
#include <SC_RemoteAppTool.h>
#include <QList>
#include <RemoteAppTest.h>
// #include <RemoteAppTest.h>
#include <ShakerMaker.h>
#include "CustomizedItemModel.h"

#include <Utils/ProgramOutputDialog.h>
Expand Down Expand Up @@ -224,28 +225,36 @@ WorkflowAppEE_UQ::setMainWindow(MainWindowWorkflowApp* window) {
// Add Simple Test
//

RemoteAppTest *theTest = new RemoteAppTest();
QString testAppName = "simple-tool-test";
QString testAppVersion = "1.0.0";
QString testMachine = "stampede3";
QList<QString> testQueues;
testQueues << "simcenter";

SC_RemoteAppTool *theTestTool = new SC_RemoteAppTool(testAppName,
testAppVersion,
testMachine,
testQueues,
theRemoteService,
theTest,
theToolDialog);
theToolDialog->addTool(theTestTool, "Simple Tool Test");
// RemoteAppTest *theTest = new RemoteAppTest();
ShakerMaker *theShakerMaker = new ShakerMaker();

// QString testAppName = "simple-tool-test";
// QString testAppVersion = "1.0.0";
// QString testMachine = "stampede3";
// QList<QString> testQueues;
// testQueues << "simcenter";

// SC_RemoteAppTool *theTestTool = new SC_RemoteAppTool(testAppName,
// testAppVersion,
// testMachine,
// testQueues,
// theRemoteService,
// theTest,
// theToolDialog);
// theToolDialog->addTool(theTest, "Simple Tool Test");
theToolDialog->addTool(theShakerMaker, "ShakerMaker");


// // Set the path to the input file
QAction *showTest = toolsMenu->addAction("&Simple Tool Test");
connect(showTest, &QAction::triggered, this,[this, theDialog=theToolDialog, theEmp = theTestTool] {
theDialog->showTool("Simple Tool Test");
});
// QAction *showTest = toolsMenu->addAction("&Simple Tool Test");
QAction *showShakerMaker = toolsMenu->addAction("&ShakerMaker");
// connect(showTest, &QAction::triggered, this,[this, theDialog=theToolDialog, theEmp = theTest] {
// theDialog->showTool("Simple Tool Test");
// });

connect(showShakerMaker, &QAction::triggered, this,[this, theDialog=theToolDialog, theEmp = theShakerMaker] {
theDialog->showTool("ShakerMaker");
});

//
// Add Tools to menu bar
Expand Down

0 comments on commit 58789a7

Please sign in to comment.