ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-01-28 03:50:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into V7_5_BR

Browse Source
This commit is contained in:
vsr 2014-11-12 19:43:33 +03:00
commit 2a460c5e9f
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/GEOMImpl/GEOMImpl_FillingDriver.cxx
View File

@ -205,7 +205,7 @@ Standard_Integer GEOMImpl_FillingDriver::Execute(TFunction_Logbook& log) const
} }
/* a 'tolerance' is used to compare 2 knots : see GeomFill_Generator.cdl */ /* a 'tolerance' is used to compare 2 knots : see GeomFill_Generator.cdl */
Section.Perform(Precision::Confusion()); Section.Perform(Precision::PConfusion());
Handle(GeomFill_Line) Line = new GeomFill_Line(i); Handle(GeomFill_Line) Line = new GeomFill_Line(i);
GeomFill_AppSurf App (mindeg, maxdeg, tol3d, tol2d, nbiter); /* user parameters */ GeomFill_AppSurf App (mindeg, maxdeg, tol3d, tol2d, nbiter); /* user parameters */

8
src/STEPPlugin/STEPPlugin_ImportDriver.cxx
View File

@ -73,7 +73,7 @@
//============================================================================= //=============================================================================
TopoDS_Shape GetShape(const Handle(Standard_Transient) &theEnti, TopoDS_Shape GetShape(const Handle(Standard_Transient) &theEnti,
const Handle(Transfer_TransientProcess) &theTP) const Handle(Transfer_TransientProcess) &theTP)
{ {
TopoDS_Shape aResult; TopoDS_Shape aResult;
Handle(Transfer_Binder) aBinder = theTP->Find(theEnti); Handle(Transfer_Binder) aBinder = theTP->Find(theEnti);
@ -94,8 +94,8 @@ TopoDS_Shape GetShape(const Handle(Standard_Transient) &theEnti,
//============================================================================= //=============================================================================
TDF_Label GetLabel(const Handle(Standard_Transient) &theEnti, TDF_Label GetLabel(const Handle(Standard_Transient) &theEnti,
const TDF_Label &theShapeLabel, const TDF_Label &theShapeLabel,
const TopoDS_Shape &aShape) const TopoDS_Shape &aShape)
{ {
TDF_Label aResult; TDF_Label aResult;
@ -443,7 +443,7 @@ Standard_Integer STEPPlugin_ImportDriver::Execute( TFunction_Logbook& log ) cons
// Check if any BRep entity has been read, there must be at least a vertex // Check if any BRep entity has been read, there must be at least a vertex
if ( !TopExp_Explorer( aResShape, TopAbs_VERTEX ).More() ) if ( !TopExp_Explorer( aResShape, TopAbs_VERTEX ).More() )
anError = "No geometrical data in the imported file."; StdFail_NotDone::Raise( "No geometrical data in the imported file." );
// BEGIN: Store names and materials of sub-shapes from file // BEGIN: Store names and materials of sub-shapes from file
TopTools_IndexedMapOfShape anIndices; TopTools_IndexedMapOfShape anIndices;