Fix tag group problem

Author: dcwhite

src/Interface/Application/ModuleProxyWidget.h

@@ -97,16 +97,6 @@ namespace SCIRun
       QSizeF originalSize_;
       QTimeLine* timeLine_;
     };
-
-    // arbitrary values
-    static const int TagDataKey = 123;
-    static const int TagLayerKey = 100;
-    static const int CurrentTagKey = 101;
-    static const int NoTag = -1;
-    static const int AllTags = -50;
-    static const int ClearTags = -77;
-    static const int ShowGroups = -100;
-    static const int HideGroups = -101;
   }
 }
 

src/Interface/Application/NetworkEditor.cc

@@ -1568,7 +1568,8 @@ void NetworkEditor::tagLayer(bool active, int tag)
     {
       if (item->data(TagDataKey).toInt() == NoTag)
       {
-        item->setData(TagDataKey, tag);
+        if (validTag(tag))
+          item->setData(TagDataKey, tag);
       }
       else if (ClearTags == tag)
       {
@@ -1787,7 +1788,6 @@ void NetworkEditor::highlightTaggedItem(int tagValue)
 
 void NetworkEditor::highlightTaggedItem(QGraphicsItem* item, int tagValue)
 {
-  qDebug() << "highlightTaggedItem" << tagValue;
   if (tagValue == NoTag)
   {
     item->setGraphicsEffect(blurEffect());

src/Interface/Application/TagManagerWindow.cc

@@ -112,7 +112,7 @@ QColor TagManagerWindow::tagColor(int tag) const
 {
   int r, g, b;
   r = g = b = 155;
-  if (0 <= tag && tag < NumberOfTags)
+  if (validTag(tag))
   {
     auto colorStr = tagColors_[tag];
     try
@@ -134,8 +134,7 @@ QColor TagManagerWindow::tagColor(int tag) const
 
 QString TagManagerWindow::tagName(int tag) const
 {
-  auto name = (0 <= tag && tag < NumberOfTags) ? tagNames_[tag] : "[No tag]";
-  qDebug() << "tagName" << tag << name;
+  auto name = validTag(tag) ? tagNames_[tag] : "[No tag]";
   return name;
 }
 

src/Interface/Application/TagManagerWindow.h

@@ -40,7 +40,6 @@ class TagManagerWindow : public QDockWidget, public Ui::TagManager
 
 public:
   explicit TagManagerWindow(QWidget* parent = nullptr);
-  enum { NumberOfTags = 10 };
   void setTagNames(const QVector<QString>& names);
   void setTagColors(const QVector<QString>& colors);
   QStringList getTagNames() const { return tagNames_.toList(); }

src/Interface/Application/Utility.h

@@ -84,6 +84,24 @@ namespace Gui
   const char* insertNewModuleActionTypePropertyName();
 
   const Qt::GlobalColor CLIPBOARD_COLOR = Qt::cyan;
+
+  // arbitrary values
+  enum TagValues
+  {
+    MinTag = 0,
+    MaxTag = 9,
+    NumberOfTags = 10,
+    TagDataKey = 123,
+    TagLayerKey = 100,
+    CurrentTagKey = 101,
+    NoTag = -1,
+    AllTags = -50,
+    ClearTags = -77,
+    ShowGroups = -100,
+    HideGroups = -101
+  };
+
+  inline bool validTag(int tag) { return MinTag <= tag && tag <= MaxTag; }
 }
 
 }