Merge branch 'master' into embbWidget

Author: dcwhite

src/Interface/Application/CMakeLists.txt

@@ -104,6 +104,7 @@ SET(Interface_Application_FORMS
   Module.ui
   ModuleLogWindow.ui
   ConnectionStyleWizardPage.ui
+  NetworkSearch.ui
   NoteEditor.ui
   Preferences.ui
   ProvenanceWindow.ui

src/Interface/Application/ModuleProxyWidget.cc

@@ -430,4 +430,4 @@ ProxyWidgetPosition::ProxyWidgetPosition(QGraphicsProxyWidget* widget, const QPo
 QPointF ProxyWidgetPosition::currentPosition() const
 {
   return widget_->pos() + offset_;
-}
+}

src/Interface/Application/NetworkEditor.cc

@@ -710,6 +710,37 @@ void NetworkEditor::mouseReleaseEvent(QMouseEvent *event)
   QGraphicsView::mouseReleaseEvent(event);
 }
 
+void NetworkEditor::mouseDoubleClickEvent(QMouseEvent* event)
+{
+#if 0
+  if (!search_)
+  {
+    search_ = scene_->addWidget(new NetworkSearchWidget(this));
+    search_->setOpacity(0.9);
+  }
+  search_->setPos(mapToScene(event->pos()));
+  search_->setVisible(true);
+#endif
+  QGraphicsView::mouseDoubleClickEvent(event);  
+}
+
+void NetworkEditor::hideSearchBox()
+{
+  if (search_)
+    search_->setVisible(false);
+}
+
+NetworkSearchWidget::NetworkSearchWidget(NetworkEditor* ned)
+{
+  setupUi(this);
+  connect(closeButton_, SIGNAL(clicked()), ned, SLOT(hideSearchBox()));
+}
+
+NetworkSearchWidgetProxy::NetworkSearchWidgetProxy(NetworkSearchWidget* nsw)
+{
+  setWidget(nsw);
+}
+
 ConnectionLine* NetworkEditor::getSingleConnectionSelected()
 {
 	ConnectionLine* connectionSelected = nullptr;
@@ -832,6 +863,7 @@ ModuleTagsHandle NetworkEditor::dumpModuleTags(ModuleFilter filter) const
         tags->tags[mod->getModuleWidget()->getModuleId()] = mod->data(TagDataKey).toInt();
     }
   }
+  tags->labels = tagLabelOverrides_;
   tags->showTagGroupsOnLoad = showTagGroupsOnFileLoad();
   return tags;
 }
@@ -906,6 +938,7 @@ void NetworkEditor::updateModuleTags(const ModuleTags& moduleTags)
     }
   }
   setShowTagGroupsOnFileLoad(moduleTags.showTagGroupsOnLoad);
+  tagLabelOverrides_ = moduleTags.labels;
   if (showTagGroupsOnFileLoad())
   {
     tagGroupsActive_ = true;
@@ -1002,6 +1035,7 @@ void NetworkEditor::removeModuleWidget(const ModuleId& id)
 
 void NetworkEditor::clear()
 {
+  tagLabelOverrides_.clear();
   ModuleWidget::NetworkClearingScope clearing;
   //auto portSwitch = createDynamicPortDisabler();
   scene_->clear();
@@ -1391,7 +1425,9 @@ namespace
   class TagGroupBox : public QGraphicsRectItem
   {
   public:
-    explicit TagGroupBox(const QRectF& rect, NetworkEditor* ned) : QGraphicsRectItem(rect), ned_(ned)
+    explicit TagGroupBox(int tagNum, const QRectF& rect, NetworkEditor* ned) : QGraphicsRectItem(rect),
+      tagNumber_(tagNum),
+      ned_(ned)
     {
       setAcceptHoverEvents(true);
     }
@@ -1409,15 +1445,20 @@ namespace
     virtual void mouseDoubleClickEvent(QGraphicsSceneMouseEvent* event) override
     {
       QMenu menu;
-      auto action = menu.addAction("Display in saved network", ned_, SLOT(saveTagGroupRectInFile()));
-      action->setCheckable(true);
-      action->setChecked(ned_->showTagGroupsOnFileLoad());
+      auto autoDisplay = menu.addAction("Display in saved network", ned_, SLOT(saveTagGroupRectInFile()));
+      autoDisplay->setCheckable(true);
+      autoDisplay->setChecked(ned_->showTagGroupsOnFileLoad());
+      auto rename = menu.addAction("Rename in saved network...", ned_, SLOT(renameTagGroupInFile()));
+      rename->setProperty("tag", tagNumber_);
       menu.exec(event->screenPos());
       QGraphicsRectItem::mouseDoubleClickEvent(event);
     }
   private:
+    int tagNumber_;
     NetworkEditor* ned_;
   };
+
+  const int TagTextKey = 123;
 }
 
 void NetworkEditor::saveTagGroupRectInFile()
@@ -1427,6 +1468,25 @@ void NetworkEditor::saveTagGroupRectInFile()
   Q_EMIT modified();
 }
 
+void NetworkEditor::renameTagGroupInFile()
+{
+  auto action = qobject_cast<QAction*>(sender());
+  auto tagNum = action->property("tag").toInt();
+
+  bool ok;
+  auto text = QInputDialog::getText(this, tr("Rename tag group"),
+    tr("Enter new tag group name for this network file:"), QLineEdit::Normal, checkForOverriddenTagName(tagNum), &ok);
+  if (ok && !text.isEmpty())
+  {
+    bool changed = tagLabelOverrides_[tagNum] != text.toStdString();
+    tagLabelOverrides_[tagNum] = text.toStdString();
+    if (changed)
+      renameTagGroup(tagNum, text);
+  }
+
+  Q_EMIT modified();
+}
+
 void NetworkEditor::drawTagGroups()
 {
   if (tagGroupsActive_)
@@ -1458,11 +1518,12 @@ void NetworkEditor::drawTagGroups()
     for (auto rectIter = tagItemRects.constBegin(); rectIter != tagItemRects.constEnd(); ++rectIter)
     {
       auto rectBounds = rectIter.value().adjusted(-10, -10, 10, 10);
-      QPen pen(tagColor_(rectIter.key()));
+      auto tagNum = rectIter.key();
+      QPen pen(tagColor_(tagNum));
       pen.setWidth(3);
       pen.setCapStyle(Qt::RoundCap);
       pen.setJoinStyle(Qt::RoundJoin);
-      auto rect = new TagGroupBox(rectBounds, this);
+      auto rect = new TagGroupBox(tagNum, rectBounds, this);
       rect->setPen(pen);
       scene_->addItem(rect);
       rect->setFlags(QGraphicsItem::ItemIsFocusable | QGraphicsItem::ItemIsSelectable);
@@ -1476,15 +1537,25 @@ void NetworkEditor::drawTagGroups()
       scene_->addItem(fill);
 
       static const QFont labelFont("Courier", 20, QFont::Bold);
-      auto label = scene_->addSimpleText(tagName_(rectIter.key()), labelFont);
+
+      auto label = scene_->addSimpleText(checkForOverriddenTagName(tagNum), labelFont);
       label->setBrush(pen.color());
+      label->setData(TagTextKey, tagNum);
       static const QFontMetrics fm(labelFont);
       auto textWidthInPixels = fm.width(label->text());
       label->setPos((rect->rect().topLeft() + rect->rect().topRight()) / 2 + QPointF(-textWidthInPixels / 2, -30));
     }
   }
 }
 
+QString NetworkEditor::checkForOverriddenTagName(int tag) const
+{
+  auto nameOverrideIter = tagLabelOverrides_.find(tag);
+  if (nameOverrideIter != tagLabelOverrides_.end() && !nameOverrideIter->second.empty())
+    return QString::fromStdString(nameOverrideIter->second);
+  return tagName_(tag);
+}
+
 void NetworkEditor::removeTagGroups()
 {
   Q_FOREACH(QGraphicsItem* item, scene_->items())
@@ -1496,6 +1567,21 @@ void NetworkEditor::removeTagGroups()
   }
 }
 
+void NetworkEditor::renameTagGroup(int tag, const QString& name)
+{
+  Q_FOREACH(QGraphicsItem* item, scene_->items())
+  {
+    if (auto rectLabel = dynamic_cast<QGraphicsSimpleTextItem*>(item))
+    {
+      if (rectLabel->data(TagTextKey).toInt() == tag)
+      {
+        rectLabel->setText(name);
+        return;
+      }
+    }
+  }
+}
+
 void NetworkEditor::redrawTagGroups()
 {
   removeTagGroups();
@@ -1510,6 +1596,7 @@ void NetworkEditor::highlightTaggedItem(int tagValue)
 
 void NetworkEditor::highlightTaggedItem(QGraphicsItem* item, int tagValue)
 {
+  qDebug() << "highlightTaggedItem" << tagValue;
   if (tagValue == NoTag)
   {
     item->setGraphicsEffect(blurEffect());

src/Interface/Application/NetworkEditor.h

@@ -31,6 +31,8 @@
 
 #include <QGraphicsView>
 #include <QGraphicsTextItem>
+#include <QGraphicsProxyWidget>
+#include "ui_NetworkSearch.h"
 #ifndef Q_MOC_RUN
 #include <boost/shared_ptr.hpp>
 #include <atomic>
@@ -87,7 +89,7 @@ namespace Gui {
   {
     Q_OBJECT
   public:
-    explicit ErrorItem(const QString& text, std::function<void()> showModule, QGraphicsItem* parent = 0);
+    explicit ErrorItem(const QString& text, std::function<void()> showModule, QGraphicsItem* parent = nullptr);
     ~ErrorItem();
     int num() const { return counter_; }
   protected:
@@ -104,6 +106,20 @@ namespace Gui {
     static std::atomic<int> instanceCounter_;
   };
 
+  class NetworkSearchWidget : public QWidget, public Ui::NetworkSearch
+  {
+    Q_OBJECT
+  public:
+    explicit NetworkSearchWidget(class NetworkEditor* ned);
+  };
+
+  class NetworkSearchWidgetProxy : public QGraphicsProxyWidget
+  {
+    Q_OBJECT
+  public:
+    explicit NetworkSearchWidgetProxy(NetworkSearchWidget* base);
+  };
+
   class ModuleEventProxy : public QObject
   {
     Q_OBJECT
@@ -221,6 +237,7 @@ namespace Gui {
     virtual void wheelEvent(QWheelEvent* event) override;
     virtual void contextMenuEvent(QContextMenuEvent *event) override;
     virtual void mousePressEvent(QMouseEvent *event) override;
+    virtual void mouseDoubleClickEvent(QMouseEvent* event) override;
 
   public Q_SLOTS:
     void addModuleWidget(const std::string& name, SCIRun::Dataflow::Networks::ModuleHandle module, const SCIRun::Dataflow::Engine::ModuleCounter& count);
@@ -256,6 +273,7 @@ namespace Gui {
     void adjustModuleWidth(int delta);
     void adjustModuleHeight(int delta);
     void saveTagGroupRectInFile();
+    void renameTagGroupInFile();
 
   Q_SIGNALS:
     void addConnection(const SCIRun::Dataflow::Networks::ConnectionDescription&);
@@ -283,6 +301,7 @@ namespace Gui {
     void paste();
     void bringToFront();
     void sendToBack();
+    void hideSearchBox();
 
   private:
     typedef QPair<ModuleWidget*, ModuleWidget*> ModulePair;
@@ -298,6 +317,8 @@ namespace Gui {
     void pasteImpl(const QString& xml);
     void drawTagGroups();
     void removeTagGroups();
+    QString checkForOverriddenTagName(int tag) const;
+    void renameTagGroup(int tag, const QString& name);
 		bool modulesSelectedByCL_;
     double currentScale_;
     bool tagLayerActive_;
@@ -316,10 +337,12 @@ namespace Gui {
     boost::shared_ptr<ModuleEventProxy> moduleEventProxy_;
     boost::shared_ptr<ZLevelManager> zLevelManager_;
     std::string latestModuleId_;
+    std::map<int, std::string> tagLabelOverrides_;
     bool fileLoading_;
     bool insertingNewModuleAlongConnection_ { false };
     PreexecuteFunc preexecute_;
     bool showTagGroupsOnFileLoad_ { false };
+    QGraphicsProxyWidget* search_ { nullptr };
   };
 }
 }

src/Interface/Application/NetworkSearch.ui

@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>NetworkSearch</class>
+ <widget class="QWidget" name="NetworkSearch">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>432</width>
+    <height>27</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QHBoxLayout" name="horizontalLayout">
+   <property name="leftMargin">
+    <number>2</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>2</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
+   <item>
+    <widget class="QLabel" name="label">
+     <property name="font">
+      <font>
+       <weight>75</weight>
+       <bold>true</bold>
+      </font>
+     </property>
+     <property name="styleSheet">
+      <string notr="true"/>
+     </property>
+     <property name="text">
+      <string>Search network:</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLineEdit" name="searchLineEdit_"/>
+   </item>
+   <item>
+    <widget class="QToolButton" name="closeButton_">
+     <property name="maximumSize">
+      <size>
+       <width>16777215</width>
+       <height>21</height>
+      </size>
+     </property>
+     <property name="styleSheet">
+      <string notr="true">QPushButton { color: red }</string>
+     </property>
+     <property name="text">
+      <string>X</string>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

src/Interface/Application/SCIRunMainWindow.cc

@@ -1866,7 +1866,6 @@ void SCIRunMainWindow::showKeyboardShortcutsDialog()
 
 void SCIRunMainWindow::runNewModuleWizard()
 {
-	qDebug() << "new module wizard coming soon";
   auto wizard = new ClassWizard(this);
 	wizard->show();
 }

src/Interface/Application/TagManagerWindow.cc

@@ -134,9 +134,9 @@ QColor TagManagerWindow::tagColor(int tag) const
 
 QString TagManagerWindow::tagName(int tag) const
 {
-  if (0 <= tag && tag < NumberOfTags)
-    return tagNames_[tag];
-  return "[No tag]";
+  auto name = (0 <= tag && tag < NumberOfTags) ? tagNames_[tag] : "[No tag]";
+  qDebug() << "tagName" << tag << name;
+  return name;
 }
 
 void TagManagerWindow::showHelp(QWidget* parent)
@@ -149,8 +149,8 @@ void TagManagerWindow::showHelp(QWidget* parent)
     "according to the chosen colors). Or press 0 - 9 keys to see each tag group individually; other modules will be slightly blurred out. While in "
     "the single - tag view, you can click a module to toggle it as tagged. There is also a button in the toolbar to view all tagged modules."
     "\n\nOnce tags are being used, tag groups can be toggled using Alt-G (show) and Alt-Shift-G (hide). Boxes of the tag color, labelled with the tag's text, will be displayed overlaying the network. "
-    "To display tag groups on network load, double-click on a tag group box and select the option in the menu. "
-    "\n\nComing soon: tag names saved in the network file to override application-level names."
+    "To display tag groups on network load, double-click on a tag group box and select the display option in the menu. "
+    "\n\nTag names saved in the network file can override application-level names--double-click a displayed tag group box and select the rename option."
     );
 }