Working on save/display tag groups

Author: dcwhite

src/Dataflow/Serialization/Network/NetworkDescriptionSerialization.h

@@ -82,6 +82,7 @@ namespace Networks {
   typedef std::map<std::string, ModuleWithState> ModuleMapXML;
   typedef std::map<std::string, NoteXML> NotesMapXML;
   typedef std::map<std::string, int> ModuleTagsMapXML;
+  typedef std::map<int, std::string> ModuleTagLabelOverridesMapXML;
   typedef std::vector<std::string> DisabledComponentListXML;
 
   struct SCISHARE ModuleNotes
@@ -97,6 +98,8 @@ namespace Networks {
   struct SCISHARE ModuleTags
   {
     ModuleTagsMapXML tags;
+    ModuleTagLabelOverridesMapXML labels;
+    bool showTagGroupsOnLoad;
   };
 
   struct SCISHARE DisabledComponents
@@ -146,6 +149,11 @@ namespace Networks {
         ar & boost::serialization::make_nvp("disabledModules", disabledComponents.disabledModules);
         ar & boost::serialization::make_nvp("disabledConnections", disabledComponents.disabledConnections);
       }
+      if (version > 4)
+      {
+        ar & boost::serialization::make_nvp("moduleTagLabels", moduleTags.labels);
+        ar & boost::serialization::make_nvp("loadTagGroups", moduleTags.showTagGroupsOnLoad);
+      }
     }
   };
 
@@ -164,6 +172,6 @@ namespace Networks {
 
 }}}
 
-BOOST_CLASS_VERSION(SCIRun::Dataflow::Networks::NetworkFile, 4)
+BOOST_CLASS_VERSION(SCIRun::Dataflow::Networks::NetworkFile, 5)
 
 #endif

src/Interface/Application/NetworkEditor.cc

@@ -1346,6 +1346,48 @@ void NetworkEditor::tagLayer(bool active, int tag)
   }
 }
 
+namespace
+{
+  class TagGroupBox : public QGraphicsRectItem
+  {
+  public:
+    explicit TagGroupBox(const QRectF& rect, NetworkEditor* ned) : QGraphicsRectItem(rect), ned_(ned), displayOnLoad_(false)
+    {
+      setAcceptHoverEvents(true);
+    }
+  protected:
+    virtual void hoverEnterEvent(QGraphicsSceneHoverEvent*) override
+    {
+      setPen(QPen(pen().color(), 5));
+    }
+
+    virtual void hoverLeaveEvent(QGraphicsSceneHoverEvent*) override
+    {
+      setPen(QPen(pen().color(), 3));
+    }
+
+    virtual void mouseDoubleClickEvent(QGraphicsSceneMouseEvent* event) override
+    {
+      QMenu menu;
+      auto action = menu.addAction("Display in saved network", ned_, SLOT(saveTagGroupRectInFile()));
+      action->setCheckable(true);
+      action->setChecked(displayOnLoad_);
+      menu.exec(event->screenPos());
+      QGraphicsRectItem::mouseDoubleClickEvent(event);
+    }
+  private:
+    NetworkEditor* ned_;
+    bool displayOnLoad_;
+  };
+}
+
+void NetworkEditor::saveTagGroupRectInFile()
+{
+  qDebug() << "saveTagGroupRectInFile" << sender();
+  auto action = qobject_cast<QAction*>(sender());
+  action->setChecked(!action->isChecked());
+}
+
 void NetworkEditor::drawTagGroups()
 {
   QMap<int,QRectF> tagItemRects;
@@ -1379,13 +1421,17 @@ void NetworkEditor::drawTagGroups()
     pen.setWidth(3);
     pen.setCapStyle(Qt::RoundCap);
     pen.setJoinStyle(Qt::RoundJoin);
-    auto rect = scene_->addRect(rectBounds, pen);
+    auto rect = new TagGroupBox(rectBounds, this);
+    rect->setPen(pen);
+    scene_->addItem(rect);
     rect->setFlags(QGraphicsItem::ItemIsFocusable | QGraphicsItem::ItemIsSelectable);
+    rect->setZValue(-100000);
 
     auto fill = new QGraphicsRectItem(rectBounds);
     auto c = pen.color();
     c.setAlphaF(0.15);
     fill->setBrush(c);
+    fill->setZValue(-100000);
     scene_->addItem(fill);
 
     static const QFont labelFont("Courier", 20, QFont::Bold);

src/Interface/Application/NetworkEditor.h

@@ -252,6 +252,7 @@ namespace Gui {
     void redrawTagGroups();
     void adjustModuleWidth(int delta);
     void adjustModuleHeight(int delta);
+    void saveTagGroupRectInFile();
 
   Q_SIGNALS:
     void addConnection(const SCIRun::Dataflow::Networks::ConnectionDescription&);