X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FStdMeshers_I%2FStdMeshers_i.cxx;h=b94ca0a0f31a8a05c606ed59ba34d57c50ca70bd;hb=ccb5e3c25bf204e839c0094f50f543eacedba5e6;hp=ecf1dd8917939e7ebabfdd32e1fd3e058a3e5eb6;hpb=b0a908c0d20341651771d0249fb10882f54b2aad;p=modules%2Fsmesh.git diff --git a/src/StdMeshers_I/StdMeshers_i.cxx b/src/StdMeshers_I/StdMeshers_i.cxx index ecf1dd891..b94ca0a0f 100644 --- a/src/StdMeshers_I/StdMeshers_i.cxx +++ b/src/StdMeshers_I/StdMeshers_i.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2014 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2016 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 @@ -31,60 +31,74 @@ #include "utilities.h" -#include "StdMeshers_LocalLength_i.hxx" -#include "StdMeshers_AutomaticLength_i.hxx" -#include "StdMeshers_StartEndLength_i.hxx" +#include "StdMeshers_Adaptive1D_i.hxx" #include "StdMeshers_Arithmetic1D_i.hxx" -#include "StdMeshers_Geometric1D_i.hxx" -#include "StdMeshers_FixedPoints1D_i.hxx" -#include "StdMeshers_NumberOfSegments_i.hxx" +#include "StdMeshers_AutomaticLength_i.hxx" +#include "StdMeshers_CartesianParameters3D_i.hxx" +#include "StdMeshers_Cartesian_3D_i.hxx" +#include "StdMeshers_CompositeSegment_1D_i.hxx" #include "StdMeshers_Deflection1D_i.hxx" -#include "StdMeshers_Adaptive1D_i.hxx" -#include "StdMeshers_Propagation_i.hxx" +#include "StdMeshers_FixedPoints1D_i.hxx" +#include "StdMeshers_Geometric1D_i.hxx" +#include "StdMeshers_Hexa_3D_i.hxx" +#include "StdMeshers_ImportSource1D_i.hxx" +#include "StdMeshers_ImportSource2D_i.hxx" +#include "StdMeshers_Import_1D2D_i.hxx" +#include "StdMeshers_Import_1D_i.hxx" +#include "StdMeshers_LayerDistribution2D_i.hxx" +#include "StdMeshers_LayerDistribution_i.hxx" #include "StdMeshers_LengthFromEdges_i.hxx" -#include "StdMeshers_QuadranglePreference_i.hxx" -//#include "StdMeshers_TrianglePreference_i.hxx" -#include "StdMeshers_QuadraticMesh_i.hxx" +#include "StdMeshers_LocalLength_i.hxx" #include "StdMeshers_MaxElementArea_i.hxx" #include "StdMeshers_MaxElementVolume_i.hxx" +#include "StdMeshers_MaxLength_i.hxx" #include "StdMeshers_NotConformAllowed_i.hxx" -#include "StdMeshers_ProjectionSource3D_i.hxx" -#include "StdMeshers_ProjectionSource2D_i.hxx" -#include "StdMeshers_ProjectionSource1D_i.hxx" -#include "StdMeshers_NumberOfLayers_i.hxx" -#include "StdMeshers_LayerDistribution_i.hxx" #include "StdMeshers_NumberOfLayers2D_i.hxx" -#include "StdMeshers_LayerDistribution2D_i.hxx" -#include "StdMeshers_SegmentLengthAroundVertex_i.hxx" -#include "StdMeshers_MaxLength_i.hxx" +#include "StdMeshers_NumberOfLayers_i.hxx" +#include "StdMeshers_NumberOfSegments_i.hxx" +#include "StdMeshers_PolygonPerFace_2D_i.hxx" +#include "StdMeshers_Prism_3D_i.hxx" +#include "StdMeshers_ProjectionSource1D_i.hxx" +#include "StdMeshers_ProjectionSource2D_i.hxx" +#include "StdMeshers_ProjectionSource3D_i.hxx" +#include "StdMeshers_Projection_1D_2D_3D_i.hxx" +#include "StdMeshers_Propagation_i.hxx" #include "StdMeshers_QuadrangleParams_i.hxx" -#include "StdMeshers_ImportSource1D_i.hxx" -#include "StdMeshers_ImportSource2D_i.hxx" -#include "StdMeshers_Cartesian_3D_i.hxx" - -#include "StdMeshers_Regular_1D_i.hxx" -#ifdef ENABLE_MEFISTO - #include "StdMeshers_MEFISTO_2D_i.hxx" -#endif +#include "StdMeshers_QuadranglePreference_i.hxx" #include "StdMeshers_Quadrangle_2D_i.hxx" -#include "StdMeshers_Hexa_3D_i.hxx" -#include "StdMeshers_Projection_1D_2D_3D_i.hxx" -#include "StdMeshers_Prism_3D_i.hxx" +#include "StdMeshers_QuadraticMesh_i.hxx" +#include "StdMeshers_RadialQuadrangle_1D2D_i.hxx" +#include "StdMeshers_Regular_1D_i.hxx" #include "StdMeshers_SegmentAroundVertex_0D_i.hxx" -#include "StdMeshers_CompositeSegment_1D_i.hxx" +#include "StdMeshers_SegmentLengthAroundVertex_i.hxx" +#include "StdMeshers_StartEndLength_i.hxx" #include "StdMeshers_UseExisting_1D2D_i.hxx" -#include "StdMeshers_RadialQuadrangle_1D2D_i.hxx" -#include "StdMeshers_Import_1D_i.hxx" -#include "StdMeshers_Import_1D2D_i.hxx" -#include "StdMeshers_ViscousLayers_i.hxx" #include "StdMeshers_ViscousLayers2D_i.hxx" -#include "StdMeshers_CartesianParameters3D_i.hxx" +#include "StdMeshers_ViscousLayers_i.hxx" +#ifdef ENABLE_MEFISTO + #include "StdMeshers_MEFISTO_2D_i.hxx" +#endif -template class StdHypothesisCreator_i:public HypothesisCreator_i +namespace SMESH { + class ApplicableToAny + { + public: + static CORBA::Boolean IsApplicable( const TopoDS_Shape &S, CORBA::Boolean toCheckAll ) + { + return true; + } + }; +}; +template +class StdHypothesisCreator_i : public HypothesisCreator_i< T > { public: // as we have 'module StdMeshers' in SMESH_BasicHypothesis.idl virtual std::string GetModuleName() { return "StdMeshers"; } + virtual CORBA::Boolean IsApplicable( const TopoDS_Shape & S, CORBA::Boolean toCheckAll ) + { + return TIsApplicable::IsApplicable( S, toCheckAll ); + } }; //============================================================================= @@ -120,8 +134,6 @@ extern "C" STDMESHERS_I_EXPORT GenericHypothesisCreator_i* GetHypothesisCreator (const char* aHypName) { - MESSAGE("Get HypothesisCreator for " << aHypName); - GenericHypothesisCreator_i* aCreator = 0; // Hypotheses @@ -203,9 +215,11 @@ STDMESHERS_I_EXPORT aCreator = new StdHypothesisCreator_i; #endif else if (strcmp(aHypName, "Quadrangle_2D") == 0) - aCreator = new StdHypothesisCreator_i; + aCreator = new StdHypothesisCreator_i; + else if (strcmp(aHypName, "QuadFromMedialAxis_1D2D") == 0) + aCreator = new StdHypothesisCreator_i; else if (strcmp(aHypName, "Hexa_3D") == 0) - aCreator = new StdHypothesisCreator_i; + aCreator = new StdHypothesisCreator_i; else if (strcmp(aHypName, "Projection_1D") == 0) aCreator = new StdHypothesisCreator_i; else if (strcmp(aHypName, "Projection_1D2D") == 0) @@ -213,11 +227,11 @@ STDMESHERS_I_EXPORT else if (strcmp(aHypName, "Projection_2D") == 0) aCreator = new StdHypothesisCreator_i; else if (strcmp(aHypName, "Projection_3D") == 0) - aCreator = new StdHypothesisCreator_i; + aCreator = new StdHypothesisCreator_i; else if (strcmp(aHypName, "Prism_3D") == 0) - aCreator = new StdHypothesisCreator_i; + aCreator = new StdHypothesisCreator_i; else if (strcmp(aHypName, "RadialPrism_3D") == 0) - aCreator = new StdHypothesisCreator_i; + aCreator = new StdHypothesisCreator_i; else if (strcmp(aHypName, "SegmentAroundVertex_0D") == 0) aCreator = new StdHypothesisCreator_i; else if (strcmp(aHypName, "CompositeSegment_1D") == 0) @@ -227,13 +241,15 @@ STDMESHERS_I_EXPORT else if (strcmp(aHypName, "UseExisting_2D") == 0) aCreator = new StdHypothesisCreator_i; else if (strcmp(aHypName, "RadialQuadrangle_1D2D") == 0) - aCreator = new StdHypothesisCreator_i; + aCreator = new StdHypothesisCreator_i; else if (strcmp(aHypName, "Import_1D") == 0) aCreator = new StdHypothesisCreator_i; else if (strcmp(aHypName, "Import_1D2D") == 0) aCreator = new StdHypothesisCreator_i; else if (strcmp(aHypName, "Cartesian_3D") == 0) aCreator = new StdHypothesisCreator_i; + else if (strcmp(aHypName, "PolygonPerFace_2D") == 0) + aCreator = new StdHypothesisCreator_i; else ; return aCreator;