From 9be03d1b02b759f4c63ca277238b323cfef0136a Mon Sep 17 00:00:00 2001 From: eap Date: Thu, 16 May 2013 16:45:34 +0000 Subject: [PATCH] 0022098: EDF 2036 SMESH: Create groups from none conected parts of a mesh --- src/SMESH_I/SMESH_DumpPython.cxx | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/src/SMESH_I/SMESH_DumpPython.cxx b/src/SMESH_I/SMESH_DumpPython.cxx index 8736356ac..5840f0ab2 100644 --- a/src/SMESH_I/SMESH_DumpPython.cxx +++ b/src/SMESH_I/SMESH_DumpPython.cxx @@ -208,6 +208,7 @@ namespace SMESH case Entity_Quad_Edge: myStream<<"Entity_Quad_Edge"; break; case Entity_Triangle: myStream<<"Entity_Triangle"; break; case Entity_Quad_Triangle: myStream<<"Entity_Quad_Triangle"; break; + case Entity_BiQuad_Triangle: myStream<<"Entity_BiQuad_Triangle"; break; case Entity_Quadrangle: myStream<<"Entity_Quadrangle"; break; case Entity_Quad_Quadrangle: myStream<<"Entity_Quad_Quadrangle"; break; case Entity_BiQuad_Quadrangle: myStream<<"Entity_BiQuad_Quadrangle"; break; @@ -377,9 +378,9 @@ namespace SMESH { if ( theArg ) { FunctorType aFunctorType = theArg->GetFunctorType(); - switch(aFunctorType){ - case FT_AspectRatio: myStream<< "anAspectRatio"; break; - case FT_AspectRatio3D: myStream<< "anAspectRatio3D"; break; + switch(aFunctorType) { + case FT_AspectRatio: myStream<< "aAspectRatio"; break; + case FT_AspectRatio3D: myStream<< "aAspectRatio3D"; break; case FT_Warping: myStream<< "aWarping"; break; case FT_MinimumAngle: myStream<< "aMinimumAngle"; break; case FT_Taper: myStream<< "aTaper"; break; @@ -392,6 +393,10 @@ namespace SMESH case FT_FreeEdges: myStream<< "aFreeEdges"; break; case FT_FreeNodes: myStream<< "aFreeNodes"; break; case FT_FreeFaces: myStream<< "aFreeFaces"; break; + case FT_EqualNodes: myStream<< "aEqualNodes"; break; + case FT_EqualEdges: myStream<< "aEqualEdges"; break; + case FT_EqualFaces: myStream<< "aEqualFaces"; break; + case FT_EqualVolumes: myStream<< "aEqualVolumes"; break; case FT_MultiConnection: myStream<< "aMultiConnection"; break; case FT_MultiConnection2D: myStream<< "aMultiConnection2D"; break; case FT_Length: myStream<< "aLength"; break; @@ -401,7 +406,6 @@ namespace SMESH case FT_BelongToCylinder: myStream<< "aBelongToCylinder"; break; case FT_BelongToGenSurface: myStream<< "aBelongToGenSurface"; break; case FT_LyingOnGeom: myStream<< "aLyingOnGeom"; break; - case FT_CoplanarFaces: myStream<< "aCoplanarFaces"; break; case FT_RangeOfIds: myStream<< "aRangeOfIds"; break; case FT_BadOrientedVolume: myStream<< "aBadOrientedVolume"; break; case FT_BareBorderVolume: myStream<< "aBareBorderVolume"; break; @@ -410,10 +414,14 @@ namespace SMESH case FT_OverConstrainedFace: myStream<< "aOverConstrainedFace"; break; case FT_LinearOrQuadratic: myStream<< "aLinearOrQuadratic"; break; case FT_GroupColor: myStream<< "aGroupColor"; break; - case FT_ElemGeomType: myStream<< "anElemGeomType"; break; + case FT_ElemGeomType: myStream<< "aElemGeomType"; break; + case FT_EntityType: myStream<< "aEntityType"; break; + case FT_CoplanarFaces: myStream<< "aCoplanarFaces"; break; + case FT_BallDiameter: myStream<< "aBallDiameter"; break; + case FT_ConnectedElements: myStream<< "aConnectedElements"; break; case FT_LessThan: myStream<< "aLessThan"; break; case FT_MoreThan: myStream<< "aMoreThan"; break; - case FT_EqualTo: myStream<< "anEqualTo"; break; + case FT_EqualTo: myStream<< "aEqualTo"; break; case FT_LogicalNOT: myStream<< "aLogicalNOT"; break; case FT_LogicalAND: myStream<< "aLogicalAND"; break; case FT_LogicalOR: myStream<< "aLogicalOR"; break; @@ -866,12 +874,12 @@ TCollection_AsciiString SMESH_Gen_i::DumpPython_impl if( isMultiFile ) aScript += "def RebuildData(theStudy):"; aScript += "\n\t"; - aScript += helper + "aFilterManager = " + aSMESHGen + ".CreateFilterManager()\n\t"; - aScript += helper + "aMeasurements = " + aSMESHGen + ".CreateMeasurements()\n\t"; if ( isPublished ) - aScript += aSMESHGen + " = smeshBuilder.New(theStudy)"; + aScript += aSMESHGen + " = smeshBuilder.New(theStudy)\n\t"; else - aScript += aSMESHGen + " = smeshBuilder.New(None)"; + aScript += aSMESHGen + " = smeshBuilder.New(None)\n\t"; + aScript += helper + "aFilterManager = " + aSMESHGen + ".CreateFilterManager()\n\t"; + aScript += helper + "aMeasurements = " + aSMESHGen + ".CreateMeasurements()\n\t"; // import python files corresponding to plugins set moduleNameSet; -- 2.39.2