Attempt at cleaning up module color change logic--needs redo

Author: dcwhite

src/Interface/Application/GuiApplication.cc

@@ -49,12 +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.");
+    //QMessageBox::critical(0, "Critical error", "Unhandled exception: " + QString(e.what()) + "\nExiting now.");
+    std::cout << "Unhandled exception: " << e.what() << std::endl;
     return 1;
   }
   catch (...)
   {
-    QMessageBox::critical(0, "Critical error", "Unknown unhandled exception: exiting now.");
+    //QMessageBox::critical(0, "Critical error", "Unknown unhandled exception: exiting now.");
+    std::cout << "Unhandled exception: Unknown" << std::endl;
     return 1;
   }
 }

src/Interface/Application/ModuleWidget.cc

@@ -399,7 +399,7 @@ void ModuleWidgetDisplayMini::setupButtons(bool hasUI, QObject* module)
 
 void ModuleWidgetDisplayMini::setupIcons()
 {
-  
+
 }
 
 QAbstractButton* ModuleWidgetDisplayMini::getOptionsButton() const
@@ -447,6 +447,20 @@ void ModuleWidgetDisplayMini::adjustLayout(QLayout* layout)
   // #endif
 }
 
+static const int UNSET = -1;
+static const int SELECTED = -50;
+static const int ERRORED = -100;
+static bool isUnsetOrSelected(int state)
+{
+  return UNSET == state || SELECTED == state;
+}
+
+typedef boost::bimap<QString, int> ColorStateLookup;
+typedef ColorStateLookup::value_type ColorStatePair;
+static ColorStateLookup colorStateLookup;
+void fillColorStateLookup(const QString& background);
+
+
 ModuleWidget::ModuleWidget(NetworkEditor* ed, const QString& name, SCIRun::Dataflow::Networks::ModuleHandle theModule, boost::shared_ptr<SCIRun::Gui::DialogErrorControl> dialogErrorControl,
   QWidget* parent /* = 0 */)
   : QStackedWidget(parent), HasNotes(theModule->get_id(), true),
@@ -459,6 +473,7 @@ ModuleWidget::ModuleWidget(NetworkEditor* ed, const QString& name, SCIRun::Dataf
   isMini_(globalMiniMode_),
   errored_(false),
   theModule_(theModule),
+  previousModuleState_(UNSET),
   moduleId_(theModule->get_id()),
   dialog_(nullptr),
   dockable_(nullptr),
@@ -472,6 +487,8 @@ ModuleWidget::ModuleWidget(NetworkEditor* ed, const QString& name, SCIRun::Dataf
   miniIndex_(0),
   isViewScene_(name == "ViewScene")
 {
+  fillColorStateLookup(defaultBackgroundColor_);
+
   setupModuleActions();
   setupLogging();
 
@@ -932,7 +949,10 @@ void ModuleWidget::trackConnections()
 void ModuleWidget::execute()
 {
   {
+    //qDebug() << "executing()";
     errored_ = false;
+    //previousModuleState_ = (int)ModuleInterface::Completed;
+    //std::cout << "execute() prev = " << previousModuleState_ << std::endl;
     //colorLocked_ = true; //TODO
     timer_.restart();
     theModule_->do_execute();
@@ -957,31 +977,60 @@ boost::signals2::connection ModuleWidget::connectErrorListener(const ErrorSignal
   return theModule_->connectErrorListener(subscriber);
 }
 
+void fillColorStateLookup(const QString& background)
+{
+  if (colorStateLookup.empty())
+  {
+    colorStateLookup.insert(ColorStatePair(moduleRGBA(205,190,112), (int)ModuleInterface::Waiting));
+    colorStateLookup.insert(ColorStatePair(moduleRGBA(170,204,170), (int)ModuleInterface::Executing));
+    colorStateLookup.insert(ColorStatePair(background, (int)ModuleInterface::Completed));
+    colorStateLookup.insert(ColorStatePair(moduleRGBA(0,255,255), SELECTED));
+    colorStateLookup.insert(ColorStatePair(moduleRGBA(176, 23, 31), ERRORED));
+  }
+}
+
+//primitive state machine
+//TODO: slot should set previousModuleState_
 void ModuleWidget::updateBackgroundColorForModuleState(int moduleState)
 {
+  //qDebug() << "updateColor to " << moduleState;
+  //std::cout << "update prev = " << previousModuleState_ << std::endl;
   switch (moduleState)
   {
   case (int)ModuleInterface::Waiting:
-    Q_EMIT backgroundColorUpdated(moduleRGBA(205,190,112));
+    if (isUnsetOrSelected(previousModuleState_) || previousModuleState_ == (int)ModuleInterface::Completed)
+    {
+      Q_EMIT backgroundColorUpdated(moduleRGBA(205,190,112));
+    }
     break;
   case (int)ModuleInterface::Executing:
-    Q_EMIT backgroundColorUpdated(moduleRGBA(170,204,170));
+    if (isUnsetOrSelected(previousModuleState_) || previousModuleState_ == (int)ModuleInterface::Waiting)
+    {
+      Q_EMIT backgroundColorUpdated(moduleRGBA(170,204,170));
+    }
     break;
   case (int)ModuleInterface::Completed:
-    if (!errored_)
-      Q_EMIT backgroundColorUpdated(defaultBackgroundColor_);
+    //if (isUnsetOrSelected(previousModuleState_) || previousModuleState_ == (int)ModuleInterface::Executing)
+    {
+      if (!errored_)
+        Q_EMIT backgroundColorUpdated(defaultBackgroundColor_);
+    }
     break;
   }
 }
 
 void ModuleWidget::updateBackgroundColor(const QString& color)
 {
+  //std::cout << "color set to: " << color.toStdString() << std::endl;
   if (!colorLocked_)
   {
     QString rounded;
     if (SCIRunMainWindow::Instance()->newInterface())
       rounded = "color: white; border-radius: 7px;";
     setStyleSheet(rounded + " background-color: " + color);
+    //qDebug() << "looking up color: " << color << "\n";
+    previousModuleState_ = colorStateLookup.left.at(color);
+    //qDebug() << "state set to: " << previousModuleState_;
   }
 }
 
@@ -1209,4 +1258,4 @@ void ModuleWidget::changeDisplay(int oldIndex, int newIndex)
   setCurrentIndex(newIndex);
   resize(size);
   Q_EMIT displayChanged();
-}
+}

src/Interface/Application/ModuleWidget.h

@@ -182,6 +182,7 @@ private Q_SLOTS:
   bool isMini_, errored_;
 
   SCIRun::Dataflow::Networks::ModuleHandle theModule_;
+  std::atomic<int> previousModuleState_;
 
   void addPorts(int index);
   void createPorts(const SCIRun::Dataflow::Networks::ModuleInfoProvider& moduleInfoProvider);
@@ -223,7 +224,7 @@ private Q_SLOTS:
   bool deleting_;
   const QString defaultBackgroundColor_;
   int fullIndex_, miniIndex_;
-  bool isViewScene_; //TODO: lots of special logic around this case. 
+  bool isViewScene_; //TODO: lots of special logic around this case.
 
   static bool globalMiniMode_;
 };