Salome HOME
projects
/
modules
/
geom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Issue 0020904: [CEA 411] export VTK in GEOM
[modules/geom.git]
/
src
/
GEOMImpl
/
GEOMImpl_IBlocksOperations.cxx
diff --git
a/src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx
b/src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx
index b16bb8b793f010cdf7ff8c9e3bf8a5e69b65a75e..3aeca30083d730350ee13eda680200259a087b26 100644
(file)
--- a/
src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx
+++ b/
src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
08
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
10
CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-18,6
+18,7
@@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
#ifdef WNT
#pragma warning( disable:4786 )
#ifdef WNT
#pragma warning( disable:4786 )
@@
-2126,7
+2127,7
@@
TCollection_AsciiString GEOMImpl_IBlocksOperations::PrintBCErrors
//=============================================================================
Standard_Boolean GEOMImpl_IBlocksOperations::CheckCompoundOfBlocks
(Handle(GEOM_Object) theCompound,
//=============================================================================
Standard_Boolean GEOMImpl_IBlocksOperations::CheckCompoundOfBlocks
(Handle(GEOM_Object) theCompound,
- std::list<BCError>&
theErrors)
+ std::list<BCError>& theErrors)
{
SetErrorCode(KO);
{
SetErrorCode(KO);
@@
-2222,7
+2223,7
@@
Standard_Boolean GEOMImpl_IBlocksOperations::CheckCompoundOfBlocks
}
// 3. Find not glued blocks
}
// 3. Find not glued blocks
- GEOMAlgo_GlueAnalyser aGD;
+ GEOMAlgo_GlueAnalyser aGD;
aGD.SetShape(aComp);
aGD.SetTolerance(Precision::Confusion());
aGD.SetShape(aComp);
aGD.SetTolerance(Precision::Confusion());
@@
-2350,8
+2351,9
@@
Handle(GEOM_Object) GEOMImpl_IBlocksOperations::RemoveExtraEdges
}
//Make a Python command
}
//Make a Python command
- GEOM::TPythonDump(aFunction) << aCopy
- << " = geompy.RemoveExtraEdges(" << theObject << ")";
+ std::string doUnionFaces = (theOptimumNbFaces < 0) ? "False" : "True";
+ GEOM::TPythonDump(aFunction) << aCopy << " = geompy.RemoveExtraEdges("
+ << theObject << ", " << doUnionFaces.data() << ")";
SetErrorCode(OK);
return aCopy;
SetErrorCode(OK);
return aCopy;
@@
-2384,6
+2386,9
@@
Handle(GEOM_Object) GEOMImpl_IBlocksOperations::CheckAndImprove
GEOMImpl_IBlockTrsf aTI (aFunction);
aTI.SetOriginal(aLastFunction);
GEOMImpl_IBlockTrsf aTI (aFunction);
aTI.SetOriginal(aLastFunction);
+
+ // -1 means do not unite faces on common surface (?except case of seam edge between them?)
+ //aTI.SetOptimumNbFaces(-1);
aTI.SetOptimumNbFaces(6);
//Compute the fixed shape
aTI.SetOptimumNbFaces(6);
//Compute the fixed shape