Tag improvements work in progress

Author: dcwhite

src/Interface/Application/ModuleProxyWidget.cc

@@ -123,6 +123,7 @@ ModuleProxyWidget::ModuleProxyWidget(ModuleWidget* module, QGraphicsItem* parent
   setWidget(module);
   setFlags(ItemIsMovable | ItemIsSelectable | ItemSendsGeometryChanges);
   setAcceptDrops(true);
+  setData(TagDataKey, NoTag);
 
   connect(module, SIGNAL(noteUpdated(const Note&)), this, SLOT(updateNote(const Note&)));
   connect(module, SIGNAL(requestModuleVisible()), this, SLOT(ensureThisVisible()));

src/Interface/Application/TagManagerWindow.cc

@@ -110,24 +110,26 @@ QStringList TagManagerWindow::getTagColors() const
 
 QColor TagManagerWindow::tagColor(int tag) const
 {
-  //rgb(128, 128, 0)
-  auto colorStr = tagColors_[tag];
   int r, g, b;
-  try
-  {
-    static boost::regex reg("rgb\\((.+), (.+), (.+)\\)");
-    boost::smatch what;
-    regex_match(colorStr, what, reg);
-    r = boost::lexical_cast<int>(what[1]);
-    g = boost::lexical_cast<int>(what[2]);
-    b = boost::lexical_cast<int>(what[3]);
-  }
-  catch (...)
+  r = g = b = 155;
+  if (0 <= tag && tag < NumberOfTags)
   {
-    //error results in gray
-    r = g = b = 155;
+    auto colorStr = tagColors_[tag];
+    try
+    {
+      static boost::regex reg("rgb\\((.+), (.+), (.+)\\)");
+      boost::smatch what;
+      regex_match(colorStr, what, reg);
+      r = boost::lexical_cast<int>(what[1]);
+      g = boost::lexical_cast<int>(what[2]);
+      b = boost::lexical_cast<int>(what[3]);
+    }
+    catch (...)
+    {
+      //error results in gray
+    }
   }
-  return QColor(r, g, b);
+  return QColor(r, g, b); 
 }
 
 QString TagManagerWindow::tagName(int tag) const
@@ -145,7 +147,10 @@ void TagManagerWindow::showHelp(QWidget* parent)
     "Each tag's color can be chosen in the Tag Manager window, as well as a descriptive label. Tag colors are a global setting, while module tags are saved in the network file. \n\n"
     "To use, while in the Network Editor, hold down the Alt / Option key. Then press A to see all module tag groups(each module will be colorized "
     "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.");
+    "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\Once 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."
+    "\n\nComing soon: tag names saved in the network file to override application-level names, as well as an option to display tag groups on network load."
+    );
 }
 
 void TagManagerWindow::helpButtonClicked()