Merge branch 'master' into renderer-work

cbrightsci · cbrightsci · commit b279394483ec · 2015-01-22T19:07:23.000-07:00
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -93,25 +93,30 @@ MESSAGE(STATUS "Git version tag: " "${VERSION_TAG}")
 MESSAGE(STATUS "Git version branch: " "${VERSION_BRANCH}")
 MESSAGE(STATUS "Git version commit hash: " "${VERSION_HASHVAR}")
 
-#TODO: parse the version information into pieces.
-#string(REGEX REPLACE "^v([0-9]+)\\..*" "\\1" VERSION_MAJOR "${VERSION}")
-#string(REGEX REPLACE "^v[0-9]+\\.([0-9]+).*" "\\1" VERSION_MINOR "${VERSION}")
-#string(REGEX REPLACE "^v[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" VERSION_PATCH "${VERSION}")
+#parse the version information into pieces.
+string(REGEX REPLACE "^v([0-9]+)\\..*" "\\1" VERSION_MAJOR "${VERSION_TAG}")
+string(REGEX REPLACE "^v[0-9]+\\.([0-9]+).*" "\\1" VERSION_MINOR "${VERSION_TAG}")
+#TODO: make generic 
+string(REGEX REPLACE "^v[0-9]+\\.[0-9]+\\-(alpha.[A-Z]+)\\-.*" "\\1" VERSION_PATCH "${VERSION_TAG}")
+#TODO: parse SHA 
 #string(REGEX REPLACE "^v[0-9]+\\.[0-9]+\\.[0-9]+(.*)" "\\1" VERSION_SHA1 "${VERSION}")
 #set(VERSION_SHORT "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
 
+#MESSAGE(STATUS "Git version major: " "${VERSION_MAJOR}")
+#MESSAGE(STATUS "Git version minor: " "${VERSION_MINOR}")
+#MESSAGE(STATUS "Git version patch name: " "${VERSION_PATCH}")
+
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/CMake/Modules/Version.cc.in
  ${CMAKE_CURRENT_SOURCE_DIR}/Core/Application/Version.cc)
 set(version_file "${CMAKE_CURRENT_SOURCE_DIR}/Core/Application/Version.cc")
 
 
 ########################################################################
 # SCIRUN version number.
-# TODO: update using parsed tag from above
 
-SET(SCIRUN_VERSION_MAJOR "5")
-SET(SCIRUN_VERSION_MINOR "0")
-SET(SCIRUN_VERSION_PATCH "0")
+SET(SCIRUN_VERSION_MAJOR "${VERSION_MAJOR}")
+SET(SCIRUN_VERSION_MINOR "${VERSION_MINOR}")
+SET(SCIRUN_VERSION_PATCH "${VERSION_PATCH}")
 
 SET(SCIRUN_VERSION_STRING "${SCIRUN_VERSION_MAJOR}.${SCIRUN_VERSION_MINOR}")
 
@@ -215,6 +220,8 @@ IF(UNIX)
 ENDIF()
 
 IF(APPLE)
+  SET(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++11")
+  SET(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++")
   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++ -ftemplate-depth=256")
   SET(CMAKE_CXX_FLAGS_DEBUG "-Wshorten-64-to-32 ${CMAKE_CXX_FLAGS_DEBUG}")
 
diff --git a/src/Interface/Application/GuiApplication.cc b/src/Interface/Application/GuiApplication.cc
@@ -36,10 +36,10 @@ using namespace SCIRun::Gui;
 
 int GuiApplication::run(int argc, const char* argv[])
 {
+  QApplication app(argc, const_cast<char**>(argv));
+
   try
   {
-    QApplication app(argc, const_cast<char**>(argv));
-
     SCIRun::Gui::SCIRunMainWindow* mainWin = SCIRun::Gui::SCIRunMainWindow::Instance();
 
     mainWin->setController(Core::Application::Instance().controller());
@@ -49,14 +49,14 @@ int GuiApplication::run(int argc, const char* argv[])
   }
   catch (std::exception& e)
   {
-    //QMessageBox::critical(0, "Critical error", "Unhandled exception: " + QString(e.what()) + "\nExiting now.");
-    std::cout << "Unhandled exception: " << e.what() << std::endl;
+    QMessageBox::critical(0, "Critical error", "Unhandled exception: " + QString(e.what()) + "\nExiting now.");
+    std::cerr << "Unhandled exception: " << e.what() << std::endl;
     return 1;
   }
   catch (...)
   {
-    //QMessageBox::critical(0, "Critical error", "Unknown unhandled exception: exiting now.");
-    std::cout << "Unhandled exception: Unknown" << std::endl;
+    QMessageBox::critical(0, "Critical error", "Unknown unhandled exception: exiting now.");
+    std::cerr << "Unhandled exception: Unknown" << std::endl;
     return 1;
   }
 }
diff --git a/src/Interface/Application/ModuleWidget.cc b/src/Interface/Application/ModuleWidget.cc
@@ -1046,7 +1046,7 @@ void ModuleWidget::makeOptionsDialog()
     if (!dialog_)
     {
       if (!dialogFactory_)
-        dialogFactory_.reset(new ModuleDialogFactory(0));
+        dialogFactory_.reset(new ModuleDialogFactory(0, addWidgetToExecutionDisableList));
 
       dialog_ = dialogFactory_->makeDialog(moduleId_, theModule_->get_state());
       dialog_->pull();
diff --git a/src/Interface/Modules/Base/ModuleDialogGeneric.cc b/src/Interface/Modules/Base/ModuleDialogGeneric.cc
@@ -36,6 +36,8 @@ using namespace SCIRun::Dataflow::Networks;
 using namespace SCIRun::Core::Algorithms;
 using namespace SCIRun::Core::Logging;
 
+ExecutionDisablingServiceFunction ModuleDialogGeneric::disabler_;
+
 ModuleDialogGeneric::ModuleDialogGeneric(SCIRun::Dataflow::Networks::ModuleStateHandle state, QWidget* parent) : QDialog(parent),
   state_(state),
   pulling_(false),
@@ -65,6 +67,8 @@ ModuleDialogGeneric::~ModuleDialogGeneric()
 void ModuleDialogGeneric::connectButtonToExecuteSignal(QAbstractButton* button)
 {
   connect(button, SIGNAL(clicked()), this, SIGNAL(executeActionTriggered()));
+  if (disabler_)
+    disabler_(button);
 }
 
 void ModuleDialogGeneric::updateWindowTitle(const QString& title)
@@ -239,7 +243,7 @@ class CompositeSlotManager : public WidgetSlotManager
 {
 public:
   CompositeSlotManager(ModuleStateHandle state, ModuleDialogGeneric& dialog, const AlgorithmParameterName& stateKey, const std::vector<Widget*>& widgets)
-    : WidgetSlotManager(state, dialog) 
+    : WidgetSlotManager(state, dialog)
   {
     std::transform(widgets.begin(), widgets.end(), std::back_inserter(managers_), [&](Widget* w) { return boost::make_shared<Manager>(state, dialog, stateKey, w); });
   }
@@ -380,7 +384,7 @@ class DoubleLineEditSlotManager : public WidgetSlotManager
       virtual void pushImpl() override
       {
         LOG_DEBUG("In new version of push code for LineEdit: " << lineEdit_->text().toStdString());
-        try 
+        try
         {
           auto value = boost::lexical_cast<double>(lineEdit_->text().toStdString());
           state_->setValue(stateKey_, value);
@@ -607,5 +611,5 @@ void ModuleDialogGeneric::tableHeaderStyle(QTableWidget* tableHeader)
 {
 	tableHeader->setStyleSheet(
 		"QHeaderView::section {background: rgb(66,66,69);}"
-		); 
-}
+		);
+}
diff --git a/src/Interface/Modules/Base/ModuleDialogGeneric.h b/src/Interface/Modules/Base/ModuleDialogGeneric.h
@@ -41,6 +41,7 @@
 namespace SCIRun {
 namespace Gui {
 
+  typedef std::function<void(QWidget*)> ExecutionDisablingServiceFunction;
   typedef boost::bimap<std::string,std::string> GuiStringTranslationMap;
   typedef GuiStringTranslationMap::value_type StringPair;
 
@@ -53,6 +54,7 @@ namespace Gui {
     QAction* getExecuteAction() { return executeAction_; }
     void setDockable(QDockWidget* dock) { dock_ = dock; } // to enable title changes
     void updateWindowTitle(const QString& title);
+    static void setExecutionDisablingServiceFunction(ExecutionDisablingServiceFunction disabler) { disabler_ = disabler; }
 
     //TODO: input state hookup?
     //yeah: eventually replace int with generic dialog state object, but needs to be two-way (set/get)
@@ -86,7 +88,7 @@ namespace Gui {
       ModuleDialogGeneric* m_;
     };
 		void tabStyle(QTabWidget* tabs);
-		void tableHeaderStyle(QTableWidget* tableHeader); 
+		void tableHeaderStyle(QTableWidget* tableHeader);
     void addComboBoxManager(QComboBox* comboBox, const Core::Algorithms::AlgorithmParameterName& stateKey);
     void addComboBoxManager(QComboBox* comboBox, const Core::Algorithms::AlgorithmParameterName& stateKey, const GuiStringTranslationMap& stringMap);
     void addTextEditManager(QTextEdit* textEdit, const Core::Algorithms::AlgorithmParameterName& stateKey);
@@ -112,6 +114,7 @@ namespace Gui {
     QString windowTitle_;
     QDockWidget* dock_;
     QSize oldSize_;
+    static ExecutionDisablingServiceFunction disabler_;
   };
 
 }
diff --git a/src/Interface/Modules/Factory/ModuleDialogFactory.cc b/src/Interface/Modules/Factory/ModuleDialogFactory.cc
@@ -101,10 +101,11 @@ using namespace SCIRun::Gui;
 using namespace SCIRun::Dataflow::Networks;
 using namespace boost::assign;
 
-ModuleDialogFactory::ModuleDialogFactory(QWidget* parentToUse) : parentToUse_(parentToUse)
+ModuleDialogFactory::ModuleDialogFactory(QWidget* parentToUse, ExecutionDisablingServiceFunction disabler) : parentToUse_(parentToUse)
 {
   addDialogsToMakerMap1();
   addDialogsToMakerMap2();
+  ModuleDialogGeneric::setExecutionDisablingServiceFunction(disabler);
 }
 
 void ModuleDialogFactory::addDialogsToMakerMap1()
diff --git a/src/Interface/Modules/Factory/ModuleDialogFactory.h b/src/Interface/Modules/Factory/ModuleDialogFactory.h
@@ -38,18 +38,17 @@ namespace SCIRun
 {
   namespace Gui
   {
-    class ModuleDialogGeneric;
-
     class SCISHARE ModuleDialogFactory
     {
     public:
-      explicit ModuleDialogFactory(QWidget* parentToUse);
+      ModuleDialogFactory(QWidget* parentToUse, ExecutionDisablingServiceFunction disabler);
       ModuleDialogGeneric* makeDialog(const std::string& moduleId, SCIRun::Dataflow::Networks::ModuleStateHandle state);
     private:
       QWidget* parentToUse_;
       typedef boost::function<ModuleDialogGeneric*(const std::string&, SCIRun::Dataflow::Networks::ModuleStateHandle, QWidget*)> DialogMaker;
       typedef std::map<std::string, DialogMaker> DialogMakerMap;
       DialogMakerMap dialogMakerMap_;
+      ExecutionDisablingServiceFunction disabler_;
       void addDialogsToMakerMap1();
       void addDialogsToMakerMap2();
     };
@@ -58,4 +57,4 @@ namespace SCIRun
 
 #define ADD_MODULE_DIALOG(module, dialog) (#module, boost::factory<dialog*>())
 
-#endif
+#endif
diff --git a/src/Interface/Modules/Inverse/SolveInverseProblemWithTikhonovDialog.cc b/src/Interface/Modules/Inverse/SolveInverseProblemWithTikhonovDialog.cc
@@ -46,6 +46,8 @@ SolveInverseProblemWithTikhonovDialog::SolveInverseProblemWithTikhonovDialog(con
   lambdaMethod_.insert(StringPair("Slider", "slider"));
   lambdaMethod_.insert(StringPair("L-curve", "lcurve"));
 
+  tabStyle(inputTabWidget_);
+
   addDoubleLineEditManager(lCurveLambdaLineEdit_, SolveInverseProblemWithTikhonovModule::LambdaCorner);
   addSpinBoxManager(lambdaNumberSpinBox_, SolveInverseProblemWithTikhonovModule::LambdaNum);
   addDoubleSpinBoxManager(lambdaDoubleSpinBox_, SolveInverseProblemWithTikhonovModule::LambdaFromDirectEntry);

Original file line number	Diff line number	Diff line change
`@@ -36,10 +36,10 @@ using namespace SCIRun::Gui;`
`36`	`36`
`37`	`37`	`int GuiApplication::run(int argc, const char* argv[])`
`38`	`38`	`{`
	`39`	`+ QApplication app(argc, const_cast<char**>(argv));`
	`40`	`+`
`39`	`41`	`try`
`40`	`42`	`{`
`41`		`- QApplication app(argc, const_cast<char**>(argv));`
`42`		`-`
`43`	`43`	`SCIRun::Gui::SCIRunMainWindow* mainWin = SCIRun::Gui::SCIRunMainWindow::Instance();`
`44`	`44`
`45`	`45`	`mainWin->setController(Core::Application::Instance().controller());`
`@@ -49,14 +49,14 @@ int GuiApplication::run(int argc, const char* argv[])`
`49`	`49`	`}`
`50`	`50`	`catch (std::exception& e)`
`51`	`51`	`{`
`52`		`- //QMessageBox::critical(0, "Critical error", "Unhandled exception: " + QString(e.what()) + "\nExiting now.");`
`53`		`- std::cout << "Unhandled exception: " << e.what() << std::endl;`
	`52`	`+ QMessageBox::critical(0, "Critical error", "Unhandled exception: " + QString(e.what()) + "\nExiting now.");`
	`53`	`+ std::cerr << "Unhandled exception: " << e.what() << std::endl;`
`54`	`54`	`return 1;`
`55`	`55`	`}`
`56`	`56`	`catch (...)`
`57`	`57`	`{`
`58`		`- //QMessageBox::critical(0, "Critical error", "Unknown unhandled exception: exiting now.");`
`59`		`- std::cout << "Unhandled exception: Unknown" << std::endl;`
	`58`	`+ QMessageBox::critical(0, "Critical error", "Unknown unhandled exception: exiting now.");`
	`59`	`+ std::cerr << "Unhandled exception: Unknown" << std::endl;`
`60`	`60`	`return 1;`
`61`	`61`	`}`
`62`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1046,7 +1046,7 @@ void ModuleWidget::makeOptionsDialog()`
`1046`	`1046`	`if (!dialog_)`
`1047`	`1047`	`{`
`1048`	`1048`	`if (!dialogFactory_)`
`1049`		`- dialogFactory_.reset(new ModuleDialogFactory(0));`
	`1049`	`+ dialogFactory_.reset(new ModuleDialogFactory(0, addWidgetToExecutionDisableList));`
`1050`	`1050`
`1051`	`1051`	`dialog_ = dialogFactory_->makeDialog(moduleId_, theModule_->get_state());`
`1052`	`1052`	`dialog_->pull();`
Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,8 @@ using namespace SCIRun::Dataflow::Networks;`
`36`	`36`	`using namespace SCIRun::Core::Algorithms;`
`37`	`37`	`using namespace SCIRun::Core::Logging;`
`38`	`38`
	`39`	`+ExecutionDisablingServiceFunction ModuleDialogGeneric::disabler_;`
	`40`	`+`
`39`	`41`	`ModuleDialogGeneric::ModuleDialogGeneric(SCIRun::Dataflow::Networks::ModuleStateHandle state, QWidget* parent) : QDialog(parent),`
`40`	`42`	`state_(state),`
`41`	`43`	`pulling_(false),`
`@@ -65,6 +67,8 @@ ModuleDialogGeneric::~ModuleDialogGeneric()`
`65`	`67`	`void ModuleDialogGeneric::connectButtonToExecuteSignal(QAbstractButton* button)`
`66`	`68`	`{`
`67`	`69`	`connect(button, SIGNAL(clicked()), this, SIGNAL(executeActionTriggered()));`
	`70`	`+ if (disabler_)`
	`71`	`+ disabler_(button);`
`68`	`72`	`}`
`69`	`73`
`70`	`74`	`void ModuleDialogGeneric::updateWindowTitle(const QString& title)`
`@@ -239,7 +243,7 @@ class CompositeSlotManager : public WidgetSlotManager`
`239`	`243`	`{`
`240`	`244`	`public:`
`241`	`245`	`CompositeSlotManager(ModuleStateHandle state, ModuleDialogGeneric& dialog, const AlgorithmParameterName& stateKey, const std::vector<Widget*>& widgets)`
`242`		`- : WidgetSlotManager(state, dialog)`
	`246`	`+ : WidgetSlotManager(state, dialog)`
`243`	`247`	`{`
`244`	`248`	`std::transform(widgets.begin(), widgets.end(), std::back_inserter(managers_), [&](Widget* w) { return boost::make_shared<Manager>(state, dialog, stateKey, w); });`
`245`	`249`	`}`
`@@ -380,7 +384,7 @@ class DoubleLineEditSlotManager : public WidgetSlotManager`
`380`	`384`	`virtual void pushImpl() override`
`381`	`385`	`{`
`382`	`386`	`LOG_DEBUG("In new version of push code for LineEdit: " << lineEdit_->text().toStdString());`
`383`		`- try`
	`387`	`+ try`
`384`	`388`	`{`
`385`	`389`	`auto value = boost::lexical_cast<double>(lineEdit_->text().toStdString());`
`386`	`390`	`state_->setValue(stateKey_, value);`
`@@ -607,5 +611,5 @@ void ModuleDialogGeneric::tableHeaderStyle(QTableWidget* tableHeader)`
`607`	`611`	`{`
`608`	`612`	`tableHeader->setStyleSheet(`
`609`	`613`	`"QHeaderView::section {background: rgb(66,66,69);}"`
`610`		`- );`
`611`		`-}`
	`614`	`+ );`
	`615`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -101,10 +101,11 @@ using namespace SCIRun::Gui;`
`101`	`101`	`using namespace SCIRun::Dataflow::Networks;`
`102`	`102`	`using namespace boost::assign;`
`103`	`103`
`104`		`-ModuleDialogFactory::ModuleDialogFactory(QWidget* parentToUse) : parentToUse_(parentToUse)`
	`104`	`+ModuleDialogFactory::ModuleDialogFactory(QWidget* parentToUse, ExecutionDisablingServiceFunction disabler) : parentToUse_(parentToUse)`
`105`	`105`	`{`
`106`	`106`	`addDialogsToMakerMap1();`
`107`	`107`	`addDialogsToMakerMap2();`
	`108`	`+ ModuleDialogGeneric::setExecutionDisablingServiceFunction(disabler);`
`108`	`109`	`}`
`109`	`110`
`110`	`111`	`void ModuleDialogFactory::addDialogsToMakerMap1()`