Fixes #1441

Author: dcwhite

src/Interface/Application/NetworkEditor.cc

@@ -882,7 +882,10 @@ void NetworkEditor::updateModuleTags(const ModuleTags& moduleTags)
   }
   setShowTagGroupsOnFileLoad(moduleTags.showTagGroupsOnLoad);
   if (showTagGroupsOnFileLoad())
+  {
+    tagGroupsActive_ = true;
     drawTagGroups();
+  }
 }
 
 void NetworkEditor::updateConnectionNotes(const ConnectionNotes& notes)
@@ -1342,10 +1345,12 @@ void NetworkEditor::tagLayer(bool active, int tag)
   }
   if (ShowGroups == tag)
   {
+    tagGroupsActive_ = true;
     redrawTagGroups();
   }
   if (HideGroups == tag)
   {
+    tagGroupsActive_ = false;
     removeTagGroups();
   }
 }
@@ -1388,60 +1393,64 @@ void NetworkEditor::saveTagGroupRectInFile()
 {
   auto action = qobject_cast<QAction*>(sender());
   setShowTagGroupsOnFileLoad(action->isChecked());
+  Q_EMIT modified();
 }
 
 void NetworkEditor::drawTagGroups()
 {
-  QMap<int,QRectF> tagItemRects;
-
-  Q_FOREACH(QGraphicsItem* item, scene_->items())
+  if (tagGroupsActive_)
   {
-    if (dynamic_cast<ModuleProxyWidget*>(item))
-    {
-      const auto itemTag = item->data(TagDataKey).toInt();
+    QMap<int, QRectF> tagItemRects;
 
-      if (itemTag != NoTag)
+    Q_FOREACH(QGraphicsItem* item, scene_->items())
+    {
+      if (dynamic_cast<ModuleProxyWidget*>(item))
       {
-        auto r = item->boundingRect();
-        r.translate(item->pos());
-        if (!tagItemRects.contains(itemTag))
-        {
-          tagItemRects.insert(itemTag, r);
-        }
-        else
+        const auto itemTag = item->data(TagDataKey).toInt();
+
+        if (itemTag != NoTag)
         {
-          tagItemRects[itemTag] = tagItemRects[itemTag].united(r);
+          auto r = item->boundingRect();
+          r.translate(item->pos());
+          if (!tagItemRects.contains(itemTag))
+          {
+            tagItemRects.insert(itemTag, r);
+          }
+          else
+          {
+            tagItemRects[itemTag] = tagItemRects[itemTag].united(r);
+          }
         }
       }
     }
-  }
 
-  for (auto rectIter = tagItemRects.constBegin(); rectIter != tagItemRects.constEnd(); ++rectIter)
-  {
-    auto rectBounds = rectIter.value().adjusted(-10, -10, 10, 10);
-    QPen pen(tagColor_(rectIter.key()));
-    pen.setWidth(3);
-    pen.setCapStyle(Qt::RoundCap);
-    pen.setJoinStyle(Qt::RoundJoin);
-    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);
-    auto label = scene_->addSimpleText(tagName_(rectIter.key()), labelFont);
-    label->setBrush(pen.color());
-    static const QFontMetrics fm(labelFont);
-    auto textWidthInPixels = fm.width(label->text());
-    label->setPos((rect->rect().topLeft() + rect->rect().topRight()) / 2 + QPointF(-textWidthInPixels/2, -30));
+    for (auto rectIter = tagItemRects.constBegin(); rectIter != tagItemRects.constEnd(); ++rectIter)
+    {
+      auto rectBounds = rectIter.value().adjusted(-10, -10, 10, 10);
+      QPen pen(tagColor_(rectIter.key()));
+      pen.setWidth(3);
+      pen.setCapStyle(Qt::RoundCap);
+      pen.setJoinStyle(Qt::RoundJoin);
+      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);
+      auto label = scene_->addSimpleText(tagName_(rectIter.key()), labelFont);
+      label->setBrush(pen.color());
+      static const QFontMetrics fm(labelFont);
+      auto textWidthInPixels = fm.width(label->text());
+      label->setPos((rect->rect().topLeft() + rect->rect().topRight()) / 2 + QPointF(-textWidthInPixels / 2, -30));
+    }
   }
 }
 

src/Interface/Application/NetworkEditor.h

@@ -205,6 +205,7 @@ namespace Gui {
     void metadataLayer(bool active);
     void tagLayer(bool active, int tag);
     bool tagLayerActive() const { return tagLayerActive_; }
+    bool tagGroupsActive() const { return tagGroupsActive_; }
 
     virtual void displayError(const QString& msg, std::function<void()> showModule) override;
 
@@ -300,6 +301,7 @@ namespace Gui {
 		bool modulesSelectedByCL_;
     double currentScale_;
     bool tagLayerActive_;
+    bool tagGroupsActive_ {false};
     TagColorFunc tagColor_;
     TagNameFunc tagName_;