ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2024-12-26 01:10:36 +05:00
Code Issues Packages Projects Releases Wiki Activity

Fix Shaper #2198 ExportToGeom's shape stream not being dump by GEOM RestoreShape

Browse Source
This commit is contained in:
Christophe Bourcier 2017-07-11 14:11:06 +02:00
parent 7c7eefda24
commit d1b51d722f
1 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/GEOMImpl/GEOMImpl_IInsertOperations.cxx
View File

@ -231,18 +231,39 @@ Handle(GEOM_Object) GEOMImpl_IInsertOperations::RestoreShape (std::istringstream
//Set function value
aFunction->SetValue(aShape);
//Special dump to avoid restored shapes publication.
//See correcponding code in GEOM_Engine.cxx (method ProcessFunction)
//GEOM::TPythonDump(aFunction) << "#";
//Real dump if the stream comes from Shaper
std::string firstLine;
std::string shaperPrefix = "FromShaperExportToGeom;";
std::size_t shaperPrefixSize = shaperPrefix.size();
bool ignore = false;
//Go back to the start of the istringstream
theStream.seekg(0);
if ( const char* env_var = getenv( "GEOM_IGNORE_RESTORE_SHAPE" ) )
ignore = atoi( env_var ) > 1;
//Get first line
std::getline(theStream, firstLine);
MESSAGE("firstLine: " << firstLine);
if ( !ignore ) {
GEOM::TPythonDump(aFunction) << result
<< " = geompy.RestoreShape(\"\") # the shape string has not been dump for performance reason";
if (firstLine.substr(0, shaperPrefixSize) == shaperPrefix) {
//Special dump for shape stream coming from Shaper
std::string partName = firstLine.substr(shaperPrefixSize);
MESSAGE("Part from Shaper: " << partName);
GEOM::TPythonDump(aFunction) << result << " = geompy.RestoreShape(model.makeShape("
<< partName.c_str() << ".document()).getShapeStream())";
}
else {
//Special dump to avoid restored shapes publication.
//See correcponding code in GEOM_Engine.cxx (method ProcessFunction)
//GEOM::TPythonDump(aFunction) << "#";
bool ignore = false;
if ( const char* env_var = getenv( "GEOM_IGNORE_RESTORE_SHAPE" ) )
ignore = atoi( env_var ) > 1;
if ( !ignore ) {
GEOM::TPythonDump(aFunction) << result
<< " = geompy.RestoreShape(\"\") # the shape string has not been dump for performance reason";
}
}
SetErrorCode(OK);