Skip to content

Commit 7160437

Browse files
author
Brig Bagley
committed
added more unique name/ids for bbox and color map.
1 parent 41d84fb commit 7160437

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

src/Modules/Fields/EditMeshBoundingBox.cc

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,9 @@ bool EditMeshBoundingBox::isBoxEmpty() const
267267
Core::Datatypes::GeometryHandle EditMeshBoundingBox::buildGeometryObject() {
268268

269269
Core::Datatypes::GeometryHandle geom(new Core::Datatypes::GeometryObject(NULL));
270-
geom->objectName = "Bounding Box";
270+
std::ostringstream ostr;
271+
ostr << get_id() << "EditBoundingBox_" << geom.get();
272+
geom->objectName = ostr.str();
271273
GeometryObject::ColorScheme colorScheme(GeometryObject::COLOR_UNIFORM);
272274
int64_t numVBOElements = 0;
273275
std::vector<std::pair<Point,Point>> bounding_edges;
@@ -447,13 +449,8 @@ Core::Datatypes::GeometryHandle EditMeshBoundingBox::buildGeometryObject() {
447449
uniforms.push_back(GeometryObject::SpireSubPass::Uniform("uSpecularPower", 32.0f));
448450
for (const auto& uniform : uniforms) { pass.addUniform(uniform); }
449451

450-
std::ostringstream ostr;
451-
ostr << get_id() << "_" << this;
452-
geom->objectName = ostr.str();
453-
454452
geom->mPasses.push_back(pass);
455453

456-
457454
return geom;
458455
}
459456

src/Modules/Visualization/ShowColorMapModule.cc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,9 @@ ShowColorMapModule::buildGeometryObject(boost::shared_ptr<SCIRun::Core::Datatype
7979
const std::string& id) {
8080
//set up geometry
8181
Core::Datatypes::GeometryHandle geom(new Core::Datatypes::GeometryObject(NULL));
82-
geom->objectName = "Show Color Map";
82+
std::ostringstream ostr;
83+
ostr << get_id() << "ShowColorMap_" << geom.get();
84+
geom->objectName = ostr.str();
8385
std::vector<Vector> points;
8486
std::vector<double> colors;
8587
std::vector<uint32_t> indices;

0 commit comments

Comments
 (0)