Fix for renamed showfield

Author: dcwhite

src/Interface/Modules/Render/ViewScene.cc

@@ -1785,9 +1785,14 @@ void ViewSceneDialog::sendGeometryFeedbackToState(int x, int y, const std::strin
   state_->setTransientValue(Parameters::GeometryFeedbackInfo, vsf);
 }
 
-void ViewSceneDialog::updateMeshComponentSelection(const QString& moduleId, const QString& component, bool selected)
-{
-  MeshComponentSelectionFeedback sel(moduleId.toStdString(), component.toStdString(), selected);
+void ViewSceneDialog::updateMeshComponentSelection(const QString& showFieldName, const QString& component, bool selected)
+{
+  auto name = showFieldName.toStdString();
+  auto moduleId = name;
+  auto renamed = name.find("(from ");
+  if (renamed != std::string::npos)
+    moduleId.assign(name.begin() + renamed + 6, name.end() - 1);
+  MeshComponentSelectionFeedback sel(moduleId, component.toStdString(), selected);
   state_->setTransientValue(Parameters::MeshComponentSelection, sel);
 }
 

src/Interface/Modules/Render/ViewSceneControlsDock.cc

@@ -366,7 +366,7 @@ std::vector<QString> VisibleItemManager::synchronize(const std::vector<GeometryB
     if (!containsItem(name))
       addRenderItem(name);
 
-    auto stateIter = showFieldStates.find(name.toStdString());
+    auto stateIter = std::find_if(showFieldStates.begin(), showFieldStates.end(), [&name](const ShowFieldStatesMap::value_type& p) { return name.toStdString().find(p.first) != std::string::npos; });
     if (stateIter != showFieldStates.end())
     {
       auto state = stateIter->second;
@@ -394,7 +394,7 @@ void VisibleItemManager::addRenderItem(const QString& name)
 
   itemList_->addTopLevelItem(item);
   item->setCheckState(0, Qt::Checked);
-  if (name.startsWith("ShowField:"))
+  if (name.contains("ShowField:"))
   {
     new QTreeWidgetItem(item, QStringList("Nodes"));
     new QTreeWidgetItem(item, QStringList("Edges"));
@@ -410,7 +410,7 @@ void VisibleItemManager::updateCheckStates(const QString& name, std::vector<bool
     return;
   }
   auto item = items[0];
-  if (name.startsWith("ShowField:"))
+  if (name.contains("ShowField:"))
   {
     auto nodes = item->child(2);  //TODO: brittle sort order
     auto edges = item->child(0);