ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2024-12-27 09:50:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'hydro/imps_2017'

Browse Source
This commit is contained in:
vsr 2017-01-24 15:56:48 +03:00
commit 45a00be884
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/GEOMImpl/GEOMImpl_IInsertOperations.cxx
View File

@ -235,8 +235,15 @@ Handle(GEOM_Object) GEOMImpl_IInsertOperations::RestoreShape (std::istringstream
//See correcponding code in GEOM_Engine.cxx (method ProcessFunction) //See correcponding code in GEOM_Engine.cxx (method ProcessFunction)
//GEOM::TPythonDump(aFunction) << "#"; //GEOM::TPythonDump(aFunction) << "#";
GEOM::TPythonDump(aFunction) << result 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"; << " = geompy.RestoreShape(\"\") # the shape string has not been dump for performance reason";
}
SetErrorCode(OK); SetErrorCode(OK);

15
src/GEOM_SWIG/geomBuilder.py
View File

@ -11684,8 +11684,14 @@ class geomBuilder(object, GEOM._objref_GEOM_Gen):
return self.ImportFile(theFileName, theFormatName, theName) return self.ImportFile(theFileName, theFormatName, theName)
## Read a shape from the binary stream, containing its bounding representation (BRep). ## Read a shape from the binary stream, containing its bounding representation (BRep).
# @note This method will not be dumped to the python script by DumpStudy functionality. #
# @note GEOM.GEOM_Object.GetShapeStream() method can be used to obtain the shape's BRep stream. # @note As the byte-stream representing the shape data can be quite large, this method
# is not automatically dumped to the Python script with the DumpStudy functionality;
# so please use this method carefully, only for strong reasons.
#
# @note GEOM.GEOM_Object.GetShapeStream() method can be used to obtain the shape's
# data stream.
#
# @param theStream The BRep binary stream. # @param theStream The BRep binary stream.
# @param theName Object name; when specified, this parameter is used # @param theName Object name; when specified, this parameter is used
# for result publication in the study. Otherwise, if automatic # for result publication in the study. Otherwise, if automatic
@ -11712,6 +11718,11 @@ class geomBuilder(object, GEOM._objref_GEOM_Gen):
New GEOM_Object, containing the shape, read from theStream. New GEOM_Object, containing the shape, read from theStream.
""" """
# Example: see GEOM_TestOthers.py # Example: see GEOM_TestOthers.py
if not theStream:
# this is the workaround to ignore invalid case when data stream is empty
if int(os.getenv("GEOM_IGNORE_RESTORE_SHAPE", "0")) > 0:
print "WARNING: Result of RestoreShape is a NULL shape!"
return None
anObj = self.InsertOp.RestoreShape(theStream) anObj = self.InsertOp.RestoreShape(theStream)
RaiseIfFailed("RestoreShape", self.InsertOp) RaiseIfFailed("RestoreShape", self.InsertOp)
self._autoPublish(anObj, theName, "restored") self._autoPublish(anObj, theName, "restored")