Merge remote-tracking branch 'upstream/gui_B'

Author: jessdtate

src/Dataflow/Network/Module.cc

@@ -222,26 +222,29 @@ size_t Module::num_output_ports() const
   return oports_.size();
 }
 
-namespace //TODO requirements for state metadata reporting
+//TODO requirements for state metadata reporting
+std::string Module::stateMetaInfo() const
 {
-  std::string stateMetaInfo(ModuleStateHandle state)
+  if (!state_)
+    return "Null state map.";
+  auto keys = state_->getKeys();
+  size_t i = 0;
+  std::ostringstream ostr;
+  ostr << "\n\t{";
+  for (const auto& key : keys)
   {
-    if (!state)
-      return "Null state map.";
-    auto keys = state->getKeys();
-    size_t i = 0;
-    std::ostringstream ostr;
-    ostr << "\n\t{";
-    for (const auto& key : keys)
-    {
-      ostr << "[" << key.name() << ", " << state->getValue(key).value() << "]";
-      i++;
-      if (i < keys.size())
-        ostr << ",\n\t";
-    }
-    ostr << "}";
-    return ostr.str();
+    ostr << "[" << key.name() << ", " << state_->getValue(key).value() << "]";
+    i++;
+    if (i < keys.size())
+      ostr << ",\n\t";
   }
+  ostr << "}";
+  return ostr.str();
+}
+
+void Module::copyStateToMetadata()
+{
+  metadata_.setMetadata("Module state", stateMetaInfo());
 }
 
 bool Module::executeWithSignals() NOEXCEPT
@@ -253,7 +256,7 @@ bool Module::executeWithSignals() NOEXCEPT
   {
     std::string isoString = boost::posix_time::to_simple_string(boost::posix_time::microsec_clock::universal_time());
     metadata_.setMetadata("Last execution timestamp", isoString);
-    metadata_.setMetadata("Module state", stateMetaInfo(get_state()));
+    copyStateToMetadata();
   }
   /// @todo: status() calls should be logged everywhere, need to change legacy loggers. issue #nnn
   status("STARTING MODULE: " + id_.id_);
@@ -362,6 +365,7 @@ void Module::set_state(ModuleStateHandle state)
   }
   initStateObserver(state_.get());
   postStateChangeInternalSignalHookup();
+  copyStateToMetadata();
 }
 
 AlgorithmBase& Module::algo()
@@ -537,6 +541,7 @@ Module::Builder& Module::Builder::setStateDefaults()
   if (module_)
   {
     module_->setStateDefaults();
+    module_->copyStateToMetadata();
   }
   return *this;
 }

src/Dataflow/Network/Module.h

@@ -277,6 +277,9 @@ namespace Networks {
     virtual void postStateChangeInternalSignalHookup() {}
     void sendFeedbackUpstreamAlongIncomingConnections(const Core::Datatypes::ModuleFeedback& feedback) const;
 
+    std::string stateMetaInfo() const;
+    void copyStateToMetadata();
+
   private:
     template <class T>
     boost::shared_ptr<T> getRequiredInputAtIndex(const PortId& id);

src/Interface/Application/Connection.cc

@@ -279,7 +279,7 @@ ConnectionLine::ConnectionLine(PortWidget* fromPort, PortWidget* toPort, const C
   setFlags(ItemIsSelectable | ItemIsMovable | ItemSendsGeometryChanges | ItemIsFocusable);
 
   setZValue(defaultZValue());
-  setToolTip("<font color=\"#000000\" size=2>Left - Highlight\nDouble-Left - Menu\ni - Datatype info");
+  setToolTip("<font color=\"#EEEEEE\" size=2>Left - Highlight<br>Double-Left - Menu<br>i - Datatype info");
   setAcceptHoverEvents(true);
 
   menu_ = new ConnectionMenu(this);

src/Interface/Application/ModuleProxyWidget.cc

@@ -111,8 +111,6 @@ namespace SCIRun
   }
 }
 
-const int fadeInSeconds = 1;
-
 ModuleProxyWidget::ModuleProxyWidget(ModuleWidget* module, QGraphicsItem* parent/* = 0*/)
   : QGraphicsProxyWidget(parent),
   NoteDisplayHelper(boost::make_shared<ModuleWidgetNoteDisplayStrategy>()),
@@ -136,23 +134,55 @@ ModuleProxyWidget::ModuleProxyWidget(ModuleWidget* module, QGraphicsItem* parent
 
   originalSize_ = size();
 
-  {
-    timeLine_ = new QTimeLine(fadeInSeconds * 1000, this);
-    connect(timeLine_, SIGNAL(valueChanged(qreal)), this, SLOT(animate(qreal)));
-    //timeLine_->start();
-  }
+  // {
+  //   const int fadeInSeconds = 1;
+  //   timeLine_ = new QTimeLine(fadeInSeconds * 1000, this);
+  //   connect(timeLine_, SIGNAL(valueChanged(qreal)), this, SLOT(loadAnimate(qreal)));
+  //   timeLine_->start();
+  // }
 }
 
 ModuleProxyWidget::~ModuleProxyWidget()
 {
 }
 
-void ModuleProxyWidget::animate(qreal val)
+void ModuleProxyWidget::showAndColor(const QColor& color)
+{
+  animateColor_ = color;
+  timeLine_ = new QTimeLine(4000, this);
+  connect(timeLine_, SIGNAL(valueChanged(qreal)), this, SLOT(colorAnimate(qreal)));
+  timeLine_->start();
+  ensureThisVisible();
+}
+
+void ModuleProxyWidget::loadAnimate(qreal val)
 {
   setOpacity(val);
   setScale(val);
 }
 
+void ModuleProxyWidget::colorAnimate(qreal val)
+{
+  if (val < 1)
+  {
+    auto effect = graphicsEffect();
+    if (!effect)
+    {
+      auto colorize = new QGraphicsColorizeEffect;
+      colorize->setColor(animateColor_);
+      setGraphicsEffect(colorize);
+    }
+    else if (auto c = dynamic_cast<QGraphicsColorizeEffect*>(effect))
+    {
+      auto newColor = c->color();
+      newColor.setAlphaF(1 - val);
+      c->setColor(newColor);
+    }
+  }
+  else // 1 = done coloring
+    setGraphicsEffect(nullptr);
+}
+
 void ModuleProxyWidget::adjustHeight(int delta)
 {
   auto p = pos();
@@ -181,7 +211,7 @@ void ModuleProxyWidget::ensureThisVisible()
 
 void ModuleProxyWidget::ensureItemVisible(QGraphicsItem* item)
 {
-  auto views = scene()->views();
+  auto views = item->scene()->views();
   if (!views.isEmpty())
   {
     auto netEd = qobject_cast<NetworkEditor*>(views[0]);
@@ -213,6 +243,7 @@ void ModuleProxyWidget::disableModuleGUI(bool disabled)
 
 void ModuleProxyWidget::mousePressEvent(QGraphicsSceneMouseEvent *event)
 {
+  clearNoteCursor();
   auto taggingOn = data(TagLayerKey).toBool();
   auto currentTag = data(CurrentTagKey).toInt();
   if (taggingOn && currentTag > NoTag)

src/Interface/Application/ModuleProxyWidget.h

@@ -53,12 +53,17 @@ namespace SCIRun
       void adjustHeight(int delta);
       void adjustWidth(int delta);
 
+      //TODO: move to utility
+      static void ensureItemVisible(QGraphicsItem* item);
+
     public Q_SLOTS:
       void highlightIfSelected();
       void setDefaultNotePosition(NotePosition position);
       void createPortPositionProviders();
       void snapToGrid();
       void highlightPorts(int state);
+      void ensureThisVisible();
+      void showAndColor(const QColor& color);
 
     Q_SIGNALS:
       void selected();
@@ -74,15 +79,15 @@ namespace SCIRun
       virtual void setNoteGraphicsContext() override;
     private Q_SLOTS:
       void updateNote(const Note& note);
-      void ensureThisVisible();
       void disableModuleGUI(bool disabled);
-      void animate(qreal val);
+      void loadAnimate(qreal val);
+      void colorAnimate(qreal val);
     private:
-      void ensureItemVisible(QGraphicsItem* item);
       bool isSubwidget(QWidget* alienWidget) const;
       void updatePressedSubWidget(QGraphicsSceneMouseEvent* event);
 
       ModuleWidget* module_;
+      QColor animateColor_;
       bool grabbedByWidget_, isSelected_;
       QWidget* pressedSubWidget_;
       QPointF position_;

src/Interface/Application/ModuleWidget.cc

@@ -1075,11 +1075,12 @@ void ModuleWidget::makeOptionsDialog()
       }
 
       auto expand = Core::Application::Instance().parameters()->developerParameters()->guiExpandFactor().get_value_or(-1);
-      if (expand > 0)
+      if (expand > 1)
       {
         qDebug() << "expand factor for dialogs:" << expand;
         qDebug() << dialog_->size();
         dialog_->setFixedHeight(dialog_->size().height() * expand);
+        dialog_->setFixedWidth(dialog_->size().width() * ((expand - 1) * 0.5) + 1);
         qDebug() << dialog_->size();
       }
 
@@ -1356,20 +1357,20 @@ void ModuleWidget::unhighlightPorts()
   Q_EMIT displayChanged();
 }
 
-void ModuleWidget::updateMetadata(bool active)
+QString ModuleWidget::metadataToString() const
 {
-  if (active)
+  auto metadata = theModule_->metadata().getFullMap();
+  QStringList display;
+  for (const auto& metaPair : metadata)
   {
-    auto metadata = theModule_->metadata().getFullMap();
-    QStringList display;
-    for (const auto& metaPair : metadata)
-    {
-      display.append(QString::fromStdString(metaPair.first) + " : " + QString::fromStdString(metaPair.second));
-    }
-    setToolTip("Metadata:\n" + display.join("\n"));
+    display.append(QString::fromStdString(metaPair.first) + " : " + QString::fromStdString(metaPair.second));
   }
-  else
-    setToolTip("");
+  return display.join("\n");
+}
+
+void ModuleWidget::updateMetadata(bool active)
+{
+  setToolTip(active ? "Metadata:\n" + metadataToString() : "");
 }
 
 void ModuleWidget::setExecutionDisabled(bool disabled)

src/Interface/Application/ModuleWidget.h

@@ -159,6 +159,8 @@ class ModuleWidget : public QStackedWidget,
     ~NetworkClearingScope();
   };
 
+  QString metadataToString() const;
+
 public Q_SLOTS:
   virtual bool executeWithSignals() override;
   void toggleOptionsDialog();