Merge branch 'master' into rendererDan

dcwhite · dcwhite · commit 17ba08a4cc2a · 2015-01-15T11:25:35.000-07:00
diff --git a/src/Dataflow/Network/Network.cc b/src/Dataflow/Network/Network.cc
@@ -233,9 +233,16 @@ void Network::setModuleExecutionState(ModuleInterface::ExecutionState state, Mod
   };
 
   //TODO: possible fix for network execute delay. Need to test with users.
-  //boost::thread t(update);
-  // for now, just run in this thread
-  update();
+  if (settings().value("networkStateUpdateThread") == "yes")
+  {
+    boost::thread t(update);
+    std::cout << "threaded state update" << std::endl;
+  }
+  else // for now, just run in this thread
+  {
+    update();
+    std::cout << "non-threaded state update" << std::endl;
+  }
 }
 
 void Network::clear()
diff --git a/src/Interface/Application/NetworkEditor.cc b/src/Interface/Application/NetworkEditor.cc
@@ -44,6 +44,7 @@
 #include <Dataflow/Engine/Controller/NetworkEditorController.h> //TODO: remove
 #include <Dataflow/Network/NetworkSettings.h> //TODO: push
 #include <Core/Application/Preferences/Preferences.h>
+#include <Core/Application/Application.h>
 #ifdef BUILD_WITH_PYTHON
 #include <Dataflow/Engine/Python/NetworkEditorPythonAPI.h>
 #endif
@@ -127,6 +128,10 @@ void NetworkEditor::setNetworkEditorController(boost::shared_ptr<NetworkEditorCo
 
     connect(controller_.get(), SIGNAL(connectionAdded(const SCIRun::Dataflow::Networks::ConnectionDescription&)),
       this, SLOT(connectionAddedQueued(const SCIRun::Dataflow::Networks::ConnectionDescription&)));
+
+    //TODO: duplication
+    const std::string value = Application::Instance().parameters()->entireCommandLine().find("--testUpdateThread") != std::string::npos ? "yes" : "no";
+    controller_->getSettings().setValue("networkStateUpdateThread", value);
   }
 }
 
@@ -818,6 +823,10 @@ SCIRun::Dataflow::Networks::NetworkFileHandle NetworkEditor::saveNetwork() const
 void NetworkEditor::loadNetwork(const SCIRun::Dataflow::Networks::NetworkFileHandle& xml)
 {
   controller_->loadNetwork(xml);
+
+  //TODO: duplication
+  const std::string value = Application::Instance().parameters()->entireCommandLine().find("--testUpdateThread") != std::string::npos ? "yes" : "no";
+  controller_->getSettings().setValue("networkStateUpdateThread", value);
 }
 
 size_t NetworkEditor::numModules() const
diff --git a/src/Interface/Application/SCIRunMainWindow.cc b/src/Interface/Application/SCIRunMainWindow.cc
@@ -85,6 +85,11 @@ SCIRunMainWindow::SCIRunMainWindow() : firstTimePythonShown_(true)
       "color: white;"
       "selection-color: yellow;"
       "selection-background-color: blue;"
+      //"QMenuBar::item { background-color: rgb(66,66,69); color: black }"
+      "QToolBar {        background-color: rgb(66,66,69); border: 1px solid black; color: black     }"
+      "QProgressBar {        background-color: rgb(66,66,69); border: 0px solid black; color: black     }"
+      "QDockWidget {background: rgb(66,66,69); background-color: rgb(66,66,69) }"
+
       //"border: 1px solid white;"
       //"border-radius: 3px;"
       "QPushButton {"
@@ -143,6 +148,7 @@ SCIRunMainWindow::SCIRunMainWindow() : firstTimePythonShown_(true)
   setActionIcons();
 
   QToolBar* standardBar = addToolBar("Standard");
+  standardBar->setStyleSheet("QToolBar { background-color: rgb(66,66,69); border: 1px solid black; color: black }");
   standardBar->setObjectName("StandardToolBar");
   standardBar->addAction(actionNew_);
   standardBar->addAction(actionLoad_);
@@ -163,7 +169,7 @@ SCIRunMainWindow::SCIRunMainWindow() : firstTimePythonShown_(true)
   standardBar->addAction(actionResetNetworkZoom_);
   standardBar->addAction(actionDragMode_);
   standardBar->addAction(actionSelectMode_);
-  standardBar->setStyleSheet(styleSheet());
+  //standardBar->setStyleSheet(styleSheet());
   //setUnifiedTitleAndToolBarOnMac(true);
 
   QToolBar* executeBar = addToolBar(tr("&Execute"));
@@ -172,7 +178,8 @@ SCIRunMainWindow::SCIRunMainWindow() : firstTimePythonShown_(true)
 
   networkProgressBar_.reset(new NetworkExecutionProgressBar(this));
   executeBar->addActions(networkProgressBar_->actions());
-  executeBar->setStyleSheet(styleSheet());
+  executeBar->setStyleSheet("QToolBar { background-color: rgb(66,66,69); border: 1px solid black; color: black }");
+  //executeBar->setStyleSheet(styleSheet());
   executeBar->setAutoFillBackground(true);
   connect(actionExecute_All_, SIGNAL(triggered()), networkProgressBar_.get(), SLOT(resetModulesDone()));
   connect(networkEditor_->moduleEventProxy().get(), SIGNAL(moduleExecuteEnd(const std::string&)), networkProgressBar_.get(), SLOT(incrementModulesDone()));
@@ -283,6 +290,8 @@ SCIRunMainWindow::SCIRunMainWindow() : firstTimePythonShown_(true)
   actionModule_Selector->setChecked(!moduleSelectorDockWidget_->isHidden());
   actionProvenance_->setChecked(!provenanceWindow_->isHidden());
 
+  moduleSelectorDockWidget_->setStyleSheet("QDockWidget {background: rgb(66,66,69); background-color: rgb(66,66,69) }");
+
   provenanceWindow_->hide();
 
   hideNonfunctioningWidgets();
@@ -1070,13 +1079,14 @@ void SCIRunMainWindow::displayAcknowledgement()
 
 void SCIRunMainWindow::setDataDirectory(const QString& dir)
 {
-  scirunDataLineEdit_->setText(dir);
-  scirunDataLineEdit_->setToolTip(dir);
   if (!dir.isEmpty())
-	{
+  {
+    scirunDataLineEdit_->setText(dir);
+    scirunDataLineEdit_->setToolTip(dir);
+
     RemembersFileDialogDirectory::setStartingDir(dir);
-		Core::Preferences::Instance().setDataDirectory(dir.toStdString());
-	}
+    Core::Preferences::Instance().setDataDirectory(dir.toStdString());
+  }
 }
 
 QString SCIRunMainWindow::dataDirectory() const
@@ -1092,7 +1102,7 @@ void SCIRunMainWindow::setDataDirectoryFromGUI()
 
 bool SCIRunMainWindow::newInterface() const
 {
-  return Core::Application::Instance().parameters()->entireCommandLine().find("--experimentalGUI") != std::string::npos;
+  return Core::Application::Instance().parameters()->entireCommandLine().find("--originalGUI") == std::string::npos;
 }
 
 namespace {
@@ -1314,4 +1324,4 @@ void SCIRunMainWindow::keyReleaseEvent(QKeyEvent *event)
     statusBar()->showMessage("Network zoom inactive", 1000);
 	}
   QMainWindow::keyPressEvent(event);
-}
+}
diff --git a/src/Interface/Modules/Fields/ReportFieldInfoDialog.cc b/src/Interface/Modules/Fields/ReportFieldInfoDialog.cc
@@ -41,9 +41,6 @@ ReportFieldInfoDialog::ReportFieldInfoDialog(const std::string& name, ModuleStat
 {
   setupUi(this);
   setWindowTitle(QString::fromStdString(name));
-  fixSize();
-
-  buttonBox->setVisible(false);
 }
 
 void ReportFieldInfoDialog::pullAndDisplayInfo() 
diff --git a/src/Interface/Modules/Fields/ReportFieldInfoDialog.ui b/src/Interface/Modules/Fields/ReportFieldInfoDialog.ui
@@ -6,12 +6,12 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>499</width>
-    <height>251</height>
+    <width>512</width>
+    <height>263</height>
    </rect>
   </property>
   <property name="sizePolicy">
-   <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+   <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
@@ -25,6 +25,9 @@
   <property name="windowTitle">
    <string>Dialog</string>
   </property>
+  <property name="sizeGripEnabled">
+   <bool>true</bool>
+  </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <widget class="QGroupBox" name="groupBox">
@@ -45,57 +48,8 @@
      </layout>
     </widget>
    </item>
-   <item>
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="enabled">
-      <bool>false</bool>
-     </property>
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::Reset|QDialogButtonBox::RestoreDefaults</set>
-     </property>
-     <property name="centerButtons">
-      <bool>false</bool>
-     </property>
-    </widget>
-   </item>
   </layout>
  </widget>
  <resources/>
- <connections>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>accepted()</signal>
-   <receiver>ReportFieldInfoDialog</receiver>
-   <slot>accept()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>248</x>
-     <y>254</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>157</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>rejected()</signal>
-   <receiver>ReportFieldInfoDialog</receiver>
-   <slot>reject()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>316</x>
-     <y>260</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>286</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
+ <connections/>
 </ui>
diff --git a/src/Interface/Modules/Render/ViewScene.cc b/src/Interface/Modules/Render/ViewScene.cc
@@ -96,7 +96,7 @@ ViewSceneDialog::ViewSceneDialog(const std::string& name, ModuleStateHandle stat
 
 	state->connect_state_changed(boost::bind(&ViewSceneDialog::newGeometryValueForwarder, this));
 	connect(this, SIGNAL(newGeometryValueForwarder()), this, SLOT(newGeometryValue()));
-	
+
 	addConfigurationDock(QString::fromStdString(name));
 }
 
@@ -374,6 +374,7 @@ void ViewSceneDialog::configurationButtonClicked()
 void ViewSceneDialog::addToolBar()
 {
 	mToolBar = new QToolBar(this);
+	mToolBar->setStyleSheet("QToolBar { background-color: rgb(66,66,69); border: 1px solid black; color: black }");
 
 	//addMouseMenu();
 	addAutoViewButton();
@@ -514,7 +515,7 @@ void ViewSceneDialog::addConfigurationDock(const QString& viewName)
 
 	QTabWidget* tabs = new QTabWidget(mConfigurationDock);
 	tabs->setFixedSize(300, 150);
-	
+
 	// View Tab
 	QWidget* viewTab = new QWidget();
 	addShowOrientationCheckbox(viewTab);

Original file line number	Diff line number	Diff line change
`@@ -41,9 +41,6 @@ ReportFieldInfoDialog::ReportFieldInfoDialog(const std::string& name, ModuleStat`
`41`	`41`	`{`
`42`	`42`	`setupUi(this);`
`43`	`43`	`setWindowTitle(QString::fromStdString(name));`
`44`		`- fixSize();`
`45`		`-`
`46`		`- buttonBox->setVisible(false);`
`47`	`44`	`}`
`48`	`45`
`49`	`46`	`void ReportFieldInfoDialog::pullAndDisplayInfo()`