Skip to content

Commit 60d6b52

Browse files
committed
Start gui for scripted events
1 parent df142de commit 60d6b52

File tree

3 files changed

+25
-4
lines changed

3 files changed

+25
-4
lines changed

src/Interface/Application/SCIRunMainWindow.cc

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,8 +252,9 @@ SCIRunMainWindow::SCIRunMainWindow() : shortcuts_(nullptr), firstTimePythonShown
252252
connect(recentFileActions_[i], SIGNAL(triggered()), this, SLOT(loadRecentNetwork()));
253253
}
254254

255+
setupScriptedEventsWindow();
255256
setupProvenanceWindow();
256-
provenanceWindow_->hide();
257+
257258
setupDevConsole();
258259
setupPythonConsole();
259260

@@ -939,6 +940,14 @@ void SCIRunMainWindow::resetBackgroundColor()
939940
GuiLogger::Instance().logInfo("Background color set to " + defaultColor.name());
940941
}
941942

943+
void SCIRunMainWindow::setupScriptedEventsWindow()
944+
{
945+
qDebug() << "TODO";
946+
// scriptedEventsWindow_ = new ScriptedEventsWindow(this);
947+
// connect(actionScriptedEvents_, SIGNAL(toggled(bool)), scriptedEventsWindow_, SLOT(setVisible(bool)));
948+
// connect(scriptedEventsWindow_, SIGNAL(visibilityChanged(bool)), actionScriptedEvents_, SLOT(setChecked(bool)));
949+
}
950+
942951
void SCIRunMainWindow::setupProvenanceWindow()
943952
{
944953
ProvenanceManagerHandle provenanceManager(new Dataflow::Engine::ProvenanceManager<SCIRun::Dataflow::Networks::NetworkFileHandle>(networkEditor_));
@@ -957,6 +966,8 @@ void SCIRunMainWindow::setupProvenanceWindow()
957966
commandConverter_.reset(new GuiActionProvenanceConverter(networkEditor_));
958967

959968
connect(commandConverter_.get(), SIGNAL(provenanceItemCreated(SCIRun::Dataflow::Engine::ProvenanceItemHandle)), provenanceWindow_, SLOT(addProvenanceItem(SCIRun::Dataflow::Engine::ProvenanceItemHandle)));
969+
970+
provenanceWindow_->hide();
960971
}
961972

962973
void SCIRunMainWindow::filterDoubleClickedModuleSelectorItem(QTreeWidgetItem* item)

src/Interface/Application/SCIRunMainWindow.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ class ShortcutsInterface;
5858
class TagManagerWindow;
5959
class PythonConsoleWidget;
6060
class FileDownloader;
61+
class ScriptedEventsWindow;
6162

6263
class SCIRunMainWindow : public QMainWindow, public Ui::SCIRunMainWindow
6364
{
@@ -118,6 +119,7 @@ public Q_SLOTS:
118119
QToolButton* executeButton_;
119120
QByteArray windowState_;
120121
QPushButton* versionButton_;
122+
ScriptedEventsWindow* scriptedEventsWindow_;
121123
void postConstructionSignalHookup();
122124
void executeCommandLineRequests();
123125
void setTipsAndWhatsThis();
@@ -130,6 +132,7 @@ public Q_SLOTS:
130132
void readSettings();
131133
void setupNetworkEditor();
132134
void setupProvenanceWindow();
135+
void setupScriptedEventsWindow();
133136
void setupDevConsole();
134137
void setupPreferencesWindow();
135138
void setupTagManagerWindow();

src/Interface/Application/SCIRunMainWindow.ui

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@
4444
<rect>
4545
<x>0</x>
4646
<y>0</y>
47-
<width>1093</width>
48-
<height>482</height>
47+
<width>1081</width>
48+
<height>443</height>
4949
</rect>
5050
</property>
5151
<property name="acceptDrops">
@@ -63,7 +63,7 @@
6363
<x>0</x>
6464
<y>0</y>
6565
<width>1440</width>
66-
<height>21</height>
66+
<height>22</height>
6767
</rect>
6868
</property>
6969
<widget class="QMenu" name="menuFile_">
@@ -210,6 +210,8 @@
210210
<addaction name="actionToggleTagLayer_"/>
211211
<addaction name="separator"/>
212212
<addaction name="actionCleanUpNetwork_"/>
213+
<addaction name="separator"/>
214+
<addaction name="actionScriptEvents_"/>
213215
</widget>
214216
<addaction name="menuFile_"/>
215217
<addaction name="menuEdit"/>
@@ -1015,6 +1017,11 @@
10151017
<string>Network Editor GUI*</string>
10161018
</property>
10171019
</action>
1020+
<action name="actionScriptEvents_">
1021+
<property name="text">
1022+
<string>Script Events...</string>
1023+
</property>
1024+
</action>
10181025
</widget>
10191026
<resources/>
10201027
<connections>

0 commit comments

Comments
 (0)