Closes #786

Author: dcwhite

src/Interface/Modules/Render/ViewScene.cc

@@ -148,15 +148,16 @@ void ViewSceneDialog::newGeometryValue()
     for (auto it = geomData->begin(); it != geomData->end(); ++it, ++port)
     {
       boost::shared_ptr<Core::Datatypes::GeometryObject> obj = *it;
+      auto displayName = QString::fromStdString(obj->objectName).split('_').first();
       if (isObjectUnselected(obj->objectName))
       {
-        itemManager_->addItem(QString::fromStdString(obj->objectName), false);
+        itemManager_->addItem(QString::fromStdString(obj->objectName), displayName, false);
       }
       else
       {
         spire->handleGeomObject(obj, port);
         validObjects.push_back(obj->objectName);
-        itemManager_->addItem(QString::fromStdString(obj->objectName), true);
+        itemManager_->addItem(QString::fromStdString(obj->objectName), displayName, true);
       }
     }
     spire->gcInvalidObjects(validObjects);
@@ -598,9 +599,11 @@ void ViewSceneItemManager::SetupConnections(ViewSceneDialog* slotHolder)
   connect(this, SIGNAL(itemSelected(const QString&)), slotHolder, SLOT(handleSelectedItem(const QString&)));
 }
 
-void ViewSceneItemManager::addItem(const QString& name, bool checked)
+void ViewSceneItemManager::addItem(const QString& name, const QString& displayName, bool checked)
 {
 	QStandardItem* item = new QStandardItem(name);
+  //TODO dan
+  //item->setToolTip(displayName);
 
 	item->setFlags(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled);
   if (checked)

src/Interface/Modules/Render/ViewScene.h

@@ -132,7 +132,7 @@ namespace SCIRun {
 			QStandardItemModel* model() { return model_; }
       void SetupConnections(ViewSceneDialog* slotHolder);
 			public Q_SLOTS:
-			void addItem(const QString& name, bool checked);
+      void addItem(const QString& name, const QString& displayName, bool checked);
 			void removeItem(const QString& name);
 			void removeAll();
 		Q_SIGNALS:

src/Modules/Fields/EditMeshBoundingBox.cc

@@ -447,7 +447,9 @@ Core::Datatypes::GeometryHandle EditMeshBoundingBox::buildGeometryObject() {
     uniforms.push_back(GeometryObject::SpireSubPass::Uniform("uSpecularPower", 32.0f));
     for (const auto& uniform : uniforms) { pass.addUniform(uniform); }
 
-    geom->objectName = get_id();
+    std::ostringstream ostr;
+    ostr << get_id() << "_" << this;
+    geom->objectName = ostr.str();
 
     geom->mPasses.push_back(pass);
 

src/Modules/Visualization/ShowField.cc

@@ -99,7 +99,9 @@ void ShowFieldModule::execute()
   boost::optional<boost::shared_ptr<SCIRun::Core::Datatypes::ColorMap>> colorMap = getOptionalInput(ColorMapObject);
   if (needToExecute())
   {
-    GeometryHandle geom = buildGeometryObject(field, colorMap, get_state(), get_id());
+    std::ostringstream ostr;
+    ostr << get_id() << "_" << this;
+    GeometryHandle geom = buildGeometryObject(field, colorMap, get_state(), ostr.str());
     sendOutput(SceneGraph, geom);
   }
 }