Hacked together solution, closes #1390

dcwhite · dcwhite · commit e491600ffa8a · 2016-04-14T17:06:27.000-06:00
diff --git a/src/Core/Application/CMakeLists.txt b/src/Core/Application/CMakeLists.txt
@@ -51,8 +51,7 @@ TARGET_LINK_LIBRARIES(Core_Application
   Core_Logging
   Core_IEPlugin
   Core_Application_Session
-  Core_Services
-  Core_ICom
+  Core_Application_Preferences
   ${SCI_BOOST_LIBRARY}
 )
 
diff --git a/src/Core/Application/Preferences/Preferences.cc b/src/Core/Application/Preferences/Preferences.cc
@@ -50,7 +50,8 @@ Preferences::Preferences() :
   highlightPorts("highlightPorts", false),
   autoNotes("autoNotes", false),
   modulesAreDockable("modulesAreDockable", true),
-  networkBackgroundColor("backgroundColor", "#808080")
+  networkBackgroundColor("backgroundColor", "#808080"),
+  postModuleAddScript_temporarySolution("postModuleAddScript", "")
 {
 }
 
diff --git a/src/Core/Application/Preferences/Preferences.h b/src/Core/Application/Preferences/Preferences.h
@@ -85,6 +85,7 @@ namespace SCIRun
       BooleanVariable autoNotes;
       TrackedVariable<BooleanVariable> modulesAreDockable;
       StringVariable networkBackgroundColor;
+      StringVariable postModuleAddScript_temporarySolution;
 
       std::string dataDirectoryPlaceholder() const;
 
diff --git a/src/Interface/Application/DialogErrorControl.cc b/src/Interface/Application/DialogErrorControl.cc
@@ -37,10 +37,7 @@ DialogErrorControl::DialogErrorControl(QWidget*parent) : counter_(0)
 }
 bool DialogErrorControl::showDialog()
 {
-	if (SCIRun::Core::Preferences::Instance().showModuleErrorDialogs && counter_ <= MAX_DIALOGS_SHOWN)
-			return true;
-	else 
-			return false; 
+  return Core::Preferences::Instance().showModuleErrorDialogs && counter_ <= MAX_DIALOGS_SHOWN;
 }
 void DialogErrorControl::resetCounter()
 { 
diff --git a/src/Interface/Application/TriggeredEventsWindow.cc b/src/Interface/Application/TriggeredEventsWindow.cc
@@ -29,6 +29,7 @@
 #include <QtGui>
 #include <Interface/Application/TriggeredEventsWindow.h>
 #include <Interface/Application/NetworkEditor.h>
+#include <Core/Application/Preferences/Preferences.h>
 
 using namespace SCIRun::Gui;
 //using namespace SCIRun::Dataflow::Networks;
@@ -64,4 +65,5 @@ void TriggeredEventsWindow::updateScriptEditor()
 void TriggeredEventsWindow::updateScripts()
 {
   scripts_[eventListWidget_->currentItem()->text()] = scriptPlainTextEdit_->toPlainText();
+  Core::Preferences::Instance().postModuleAddScript_temporarySolution.setValue(scriptPlainTextEdit_->toPlainText().toStdString());
 }

Original file line number	Diff line number	Diff line change
`@@ -51,8 +51,7 @@ TARGET_LINK_LIBRARIES(Core_Application`
`51`	`51`	`Core_Logging`
`52`	`52`	`Core_IEPlugin`
`53`	`53`	`Core_Application_Session`
`54`		`- Core_Services`
`55`		`- Core_ICom`
	`54`	`+ Core_Application_Preferences`
`56`	`55`	`${SCI_BOOST_LIBRARY}`
`57`	`56`	`)`
`58`	`57`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,8 @@ Preferences::Preferences() :`
`50`	`50`	`highlightPorts("highlightPorts", false),`
`51`	`51`	`autoNotes("autoNotes", false),`
`52`	`52`	`modulesAreDockable("modulesAreDockable", true),`
`53`		`- networkBackgroundColor("backgroundColor", "#808080")`
	`53`	`+ networkBackgroundColor("backgroundColor", "#808080"),`
	`54`	`+ postModuleAddScript_temporarySolution("postModuleAddScript", "")`
`54`	`55`	`{`
`55`	`56`	`}`
`56`	`57`
Original file line number	Diff line number	Diff line change
`@@ -37,10 +37,7 @@ DialogErrorControl::DialogErrorControl(QWidget*parent) : counter_(0)`
`37`	`37`	`}`
`38`	`38`	`bool DialogErrorControl::showDialog()`
`39`	`39`	`{`
`40`		`- if (SCIRun::Core::Preferences::Instance().showModuleErrorDialogs && counter_ <= MAX_DIALOGS_SHOWN)`
`41`		`- return true;`
`42`		`- else`
`43`		`- return false;`
	`40`	`+ return Core::Preferences::Instance().showModuleErrorDialogs && counter_ <= MAX_DIALOGS_SHOWN;`
`44`	`41`	`}`
`45`	`42`	`void DialogErrorControl::resetCounter()`
`46`	`43`	`{`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@`
`29`	`29`	`#include <QtGui>`
`30`	`30`	`#include <Interface/Application/TriggeredEventsWindow.h>`
`31`	`31`	`#include <Interface/Application/NetworkEditor.h>`
	`32`	`+#include <Core/Application/Preferences/Preferences.h>`
`32`	`33`
`33`	`34`	`using namespace SCIRun::Gui;`
`34`	`35`	`//using namespace SCIRun::Dataflow::Networks;`
`@@ -64,4 +65,5 @@ void TriggeredEventsWindow::updateScriptEditor()`
`64`	`65`	`void TriggeredEventsWindow::updateScripts()`
`65`	`66`	`{`
`66`	`67`	`scripts_[eventListWidget_->currentItem()->text()] = scriptPlainTextEdit_->toPlainText();`
	`68`	`+ Core::Preferences::Instance().postModuleAddScript_temporarySolution.setValue(scriptPlainTextEdit_->toPlainText().toStdString());`
`67`	`69`	`}`