From c58c3faf74c93c073933d4f262037ea44928078b Mon Sep 17 00:00:00 2001 From: eap Date: Tue, 28 Jun 2011 12:58:21 +0000 Subject: [PATCH] Remove "Quadrangle preference" and "Triangle preference" obsolete hypotheses --- doc/salome/gui/SMESH/input/about_hypo.doc | 2 - .../gui/SMESH/input/additional_hypo.doc | 25 ---- idl/SMESH_BasicHypothesis.idl | 21 --- resources/StdMeshers.xml | 12 -- src/StdMeshers/Makefile.am | 4 - .../StdMeshers_QuadranglePreference.cxx | 129 ------------------ .../StdMeshers_QuadranglePreference.hxx | 70 ---------- .../StdMeshers_TrianglePreference.cxx | 126 ----------------- .../StdMeshers_TrianglePreference.hxx | 66 --------- src/StdMeshers_I/Makefile.am | 4 - .../StdMeshers_QuadranglePreference_i.cxx | 99 -------------- .../StdMeshers_QuadranglePreference_i.hxx | 66 --------- .../StdMeshers_TrianglePreference_i.cxx | 93 ------------- .../StdMeshers_TrianglePreference_i.hxx | 56 -------- 14 files changed, 773 deletions(-) delete mode 100644 src/StdMeshers/StdMeshers_QuadranglePreference.cxx delete mode 100644 src/StdMeshers/StdMeshers_QuadranglePreference.hxx delete mode 100644 src/StdMeshers/StdMeshers_TrianglePreference.cxx delete mode 100644 src/StdMeshers/StdMeshers_TrianglePreference.hxx delete mode 100644 src/StdMeshers_I/StdMeshers_QuadranglePreference_i.cxx delete mode 100644 src/StdMeshers_I/StdMeshers_QuadranglePreference_i.hxx delete mode 100644 src/StdMeshers_I/StdMeshers_TrianglePreference_i.cxx delete mode 100644 src/StdMeshers_I/StdMeshers_TrianglePreference_i.hxx diff --git a/doc/salome/gui/SMESH/input/about_hypo.doc b/doc/salome/gui/SMESH/input/about_hypo.doc index e1c9e401b..b03a7f29a 100644 --- a/doc/salome/gui/SMESH/input/about_hypo.doc +++ b/doc/salome/gui/SMESH/input/about_hypo.doc @@ -53,8 +53,6 @@ with other hypotheses:
  • Propagation of 1D Hypothesis on opposite edges
  • Non conform mesh allowed
  • Quadratic mesh
    • -
  • Quadrangle preference
    • -
  • Triangle preference
  • Viscous layers
    • diff --git a/doc/salome/gui/SMESH/input/additional_hypo.doc b/doc/salome/gui/SMESH/input/additional_hypo.doc index 67e10c35b..a3e4e6a3f 100644 --- a/doc/salome/gui/SMESH/input/additional_hypo.doc +++ b/doc/salome/gui/SMESH/input/additional_hypo.doc @@ -32,31 +32,6 @@ has been locally defined on the opposite edge.
    See Also a sample TUI Script of a \ref tui_propagation "Propagation hypothesis" operation -

    Quadrangle Preference

    - -This additional hypothesis can be used together with Quadrangle (Mapping) and Netgen 2D -algorithms. - -It allows Netgen 2D to build quadrangular meshes at any conditions. - -It allows Quadrangle (Mapping) to build quadrangular meshes even if the number -of nodes at the opposite edges of a meshed face is not equal, -otherwise this mesh will contain some triangular elements. This use -case is obsolete now. Use Quadrangle Parameters hypothesis with -type Quadrangle Preference set instead. -
    -This hypothesis has one restriction on its work: the total quantity of -segments on all four sides of the face must be even (divisible by 2). - -

    Triangle Preference (obsolete)

    - -This additional hypothesis can be used only together with Quadrangle (Mapping) -algorithm. It allows to build triangular mesh faces in the refinement -area if the number of nodes at the opposite edges of a meshed face is not equal, -otherwise refinement area will contain some quadrangular elements. -This hypothesis is obsolete now. Use Quadrangle Parameters -hypothesis with type Triangle Preference set instead. - \anchor viscous_layers_anchor

    Viscous Layers

    diff --git a/idl/SMESH_BasicHypothesis.idl b/idl/SMESH_BasicHypothesis.idl index 40a49f1f6..9b6a88ebb 100644 --- a/idl/SMESH_BasicHypothesis.idl +++ b/idl/SMESH_BasicHypothesis.idl @@ -469,27 +469,6 @@ module StdMeshers { }; - /*! - * StdMeshers_QuadranglePreference: interface of "QuadranglePreference" hypothesis. - * This hypothesis is used by StdMeshers_Quadrangle_2D algorithm. - * Presence of this hypothesis forces construction of quadrangles if the number - * of nodes on opposite edges is not the same in the case where the global number - * of nodes on edges is even - */ - interface StdMeshers_QuadranglePreference : SMESH::SMESH_Hypothesis - { - }; - - /*! - * StdMeshers_TrianglePreference: interface of "TrianglePreference" hypothesis. - * This hypothesis is used by StdMeshers_Quadrangle_2D algorithm. - * Presence of this hypothesis forces construction of triangles in the refinement - * area if the number of nodes on opposite edges is not the same. - */ - interface StdMeshers_TrianglePreference : SMESH::SMESH_Hypothesis - { - }; - /*! * StdMeshers_QuadraticMesh: interface of "QuadraticMesh" hypothesis. * This is an auxiliary 1D hypothesis whose presence forces construction diff --git a/resources/StdMeshers.xml b/resources/StdMeshers.xml index 03987bfdf..bc360fbce 100644 --- a/resources/StdMeshers.xml +++ b/resources/StdMeshers.xml @@ -90,18 +90,6 @@ icon-id="mesh_hypo_length.png" dim="2"/> - - - - >(istream & load, StdMeshers_QuadranglePreference & hyp) -{ - return hyp.LoadFrom( load ); -} -//================================================================================ -/*! - * \brief Initialize my parameter values by the mesh built on the geometry - * \param theMesh - the built mesh - * \param theShape - the geometry of interest - * \retval bool - true if parameter values have been successfully defined - * - * Just return false as this hypothesis does not have parameters values - */ -//================================================================================ - -bool StdMeshers_QuadranglePreference::SetParametersByMesh(const SMESH_Mesh* /*theMesh*/, - const TopoDS_Shape& /*theShape*/) -{ - return false; -} - -//================================================================================ -/*! - * \brief Initialize my parameter values by default parameters. - * \retval bool - true if parameter values have been successfully defined - */ -//================================================================================ - -bool StdMeshers_QuadranglePreference::SetParametersByDefaults(const TDefaults& /*dflts*/, - const SMESH_Mesh* /*theMesh*/) -{ - return false; -} - diff --git a/src/StdMeshers/StdMeshers_QuadranglePreference.hxx b/src/StdMeshers/StdMeshers_QuadranglePreference.hxx deleted file mode 100644 index a1e8f0cd9..000000000 --- a/src/StdMeshers/StdMeshers_QuadranglePreference.hxx +++ /dev/null @@ -1,70 +0,0 @@ -// Copyright (C) 2007-2011 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 -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -// - -// SMESH StdMeshers : implementaion of SMESH idl descriptions -// File : StdMeshers_QuadranglePreference.hxx -// Module : SMESH -// -#ifndef _StdMeshers_QuadranglePreference_HXX_ -#define _StdMeshers_QuadranglePreference_HXX_ - -#include "SMESH_StdMeshers.hxx" - -#include "SMESH_Hypothesis.hxx" -#include "Utils_SALOME_Exception.hxx" - -/*! - * \brief Hypothesis for StdMeshers_Quadrangle_2D, forcing construction - * of quadrangles if the number of nodes on opposite edges is not the same. - * GIBI can do it if the global number of nodes is even (DALL operator). - * See PAL10467 - */ -class STDMESHERS_EXPORT StdMeshers_QuadranglePreference:public SMESH_Hypothesis -{ - public: - StdMeshers_QuadranglePreference(int hypId, int studyId, SMESH_Gen * gen); - virtual ~ StdMeshers_QuadranglePreference(); - - virtual std::ostream & SaveTo(std::ostream & save); - virtual std::istream & LoadFrom(std::istream & load); - friend std::ostream & operator <<(std::ostream & save, StdMeshers_QuadranglePreference & hyp); - friend std::istream & operator >>(std::istream & load, StdMeshers_QuadranglePreference & hyp); - - /*! - * \brief Initialize my parameter values by the mesh built on the geometry - * \param theMesh - the built mesh - * \param theShape - the geometry of interest - * \retval bool - true if parameter values have been successfully defined - * - * Just return false as this hypothesis does not have parameters values - */ - virtual bool SetParametersByMesh(const SMESH_Mesh* theMesh, const TopoDS_Shape& theShape); - - /*! - * \brief Initialize my parameter values by default parameters. - * \retval bool - true if parameter values have been successfully defined - */ - virtual bool SetParametersByDefaults(const TDefaults& dflts, const SMESH_Mesh* theMesh=0); - -}; - -#endif diff --git a/src/StdMeshers/StdMeshers_TrianglePreference.cxx b/src/StdMeshers/StdMeshers_TrianglePreference.cxx deleted file mode 100644 index f1add4d58..000000000 --- a/src/StdMeshers/StdMeshers_TrianglePreference.cxx +++ /dev/null @@ -1,126 +0,0 @@ -// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -// - -// SMESH StdMeshers_TrianglePreference -// File : StdMeshers_TrianglePreference.cxx -// Module : SMESH -// -#include "StdMeshers_TrianglePreference.hxx" -#include "utilities.h" - -using namespace std; - -//============================================================================= -/*! - * - */ -//============================================================================= - -StdMeshers_TrianglePreference::StdMeshers_TrianglePreference(int hypId, - int studyId, - SMESH_Gen * gen) - :SMESH_Hypothesis(hypId, studyId, gen) -{ - _name = "TrianglePreference"; - _param_algo_dim = -2; // auxiliary used by StdMeshers_Quadrangle_2D -} - -//============================================================================= -/*! - * - */ -//============================================================================= - -StdMeshers_TrianglePreference::~StdMeshers_TrianglePreference() -{ -} - -//============================================================================= -/*! - * - */ -//============================================================================= - -ostream & StdMeshers_TrianglePreference::SaveTo(ostream & save) -{ - return save; -} - -//============================================================================= -/*! - * - */ -//============================================================================= - -istream & StdMeshers_TrianglePreference::LoadFrom(istream & load) -{ - return load; -} - -//============================================================================= -/*! - * - */ -//============================================================================= - -ostream & operator <<(ostream & save, StdMeshers_TrianglePreference & hyp) -{ - return hyp.SaveTo( save ); -} - -//============================================================================= -/*! - * - */ -//============================================================================= - -istream & operator >>(istream & load, StdMeshers_TrianglePreference & hyp) -{ - return hyp.LoadFrom( load ); -} -//================================================================================ -/*! - * \brief Initialize my parameter values by the mesh built on the geometry - * \param theMesh - the built mesh - * \param theShape - the geometry of interest - * \retval bool - true if parameter values have been successfully defined - * - * Just return false as this hypothesis does not have parameters values - */ -//================================================================================ - -bool StdMeshers_TrianglePreference::SetParametersByMesh(const SMESH_Mesh* /*theMesh*/, - const TopoDS_Shape& /*theShape*/) -{ - return false; -} - -//================================================================================ -/*! - * \brief Initialize my parameter values by default parameters. - * \retval bool - true if parameter values have been successfully defined - */ -//================================================================================ - -bool StdMeshers_TrianglePreference::SetParametersByDefaults(const TDefaults& /*dflts*/, - const SMESH_Mesh* /*theMesh*/) -{ - return false; -} - diff --git a/src/StdMeshers/StdMeshers_TrianglePreference.hxx b/src/StdMeshers/StdMeshers_TrianglePreference.hxx deleted file mode 100644 index fdd228548..000000000 --- a/src/StdMeshers/StdMeshers_TrianglePreference.hxx +++ /dev/null @@ -1,66 +0,0 @@ -// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -// - -// SMESH StdMeshers : implementaion of SMESH idl descriptions -// File : StdMeshers_TrianglePreference.hxx -// Module : SMESH -// -#ifndef _StdMeshers_TrianglePreference_HXX_ -#define _StdMeshers_TrianglePreference_HXX_ - -#include "SMESH_StdMeshers.hxx" - -#include "SMESH_Hypothesis.hxx" -#include "Utils_SALOME_Exception.hxx" - -/*! - * \brief Hypothesis for StdMeshers_Quadrangle_2D, forcing construction - * of triangles in the in a refinement area if the number of nodes - * on opposite edges is not the same. See Issue 16186. - */ -class STDMESHERS_EXPORT StdMeshers_TrianglePreference:public SMESH_Hypothesis -{ - public: - StdMeshers_TrianglePreference(int hypId, int studyId, SMESH_Gen * gen); - virtual ~ StdMeshers_TrianglePreference(); - - virtual std::ostream & SaveTo(std::ostream & save); - virtual std::istream & LoadFrom(std::istream & load); - friend std::ostream & operator <<(std::ostream & save, StdMeshers_TrianglePreference & hyp); - friend std::istream & operator >>(std::istream & load, StdMeshers_TrianglePreference & hyp); - - /*! - * \brief Initialize my parameter values by the mesh built on the geometry - * \param theMesh - the built mesh - * \param theShape - the geometry of interest - * \retval bool - true if parameter values have been successfully defined - * - * Just return false as this hypothesis does not have parameters values - */ - virtual bool SetParametersByMesh(const SMESH_Mesh* theMesh, const TopoDS_Shape& theShape); - - /*! - * \brief Initialize my parameter values by default parameters. - * \retval bool - true if parameter values have been successfully defined - */ - virtual bool SetParametersByDefaults(const TDefaults& dflts, const SMESH_Mesh* theMesh=0); - -}; - -#endif diff --git a/src/StdMeshers_I/Makefile.am b/src/StdMeshers_I/Makefile.am index 0ed513c5f..f4660cff0 100644 --- a/src/StdMeshers_I/Makefile.am +++ b/src/StdMeshers_I/Makefile.am @@ -43,7 +43,6 @@ salomeinclude_HEADERS = \ StdMeshers_MEFISTO_2D_i.hxx \ StdMeshers_Hexa_3D_i.hxx \ StdMeshers_AutomaticLength_i.hxx \ - StdMeshers_QuadranglePreference_i.hxx \ StdMeshers_QuadraticMesh_i.hxx \ StdMeshers_NumberOfLayers_i.hxx \ StdMeshers_NumberOfLayers2D_i.hxx \ @@ -59,7 +58,6 @@ salomeinclude_HEADERS = \ StdMeshers_SegmentAroundVertex_0D_i.hxx \ StdMeshers_SegmentLengthAroundVertex_i.hxx \ StdMeshers_UseExisting_1D2D_i.hxx \ - StdMeshers_TrianglePreference_i.hxx \ StdMeshers_MaxLength_i.hxx \ StdMeshers_QuadrangleParams_i.hxx \ StdMeshers_RadialQuadrangle_1D2D_i.hxx \ @@ -91,7 +89,6 @@ dist_libStdMeshersEngine_la_SOURCES = \ StdMeshers_MEFISTO_2D_i.cxx \ StdMeshers_Hexa_3D_i.cxx \ StdMeshers_AutomaticLength_i.cxx \ - StdMeshers_QuadranglePreference_i.cxx \ StdMeshers_QuadraticMesh_i.cxx \ StdMeshers_NumberOfLayers_i.cxx \ StdMeshers_NumberOfLayers2D_i.cxx \ @@ -107,7 +104,6 @@ dist_libStdMeshersEngine_la_SOURCES = \ StdMeshers_SegmentAroundVertex_0D_i.cxx \ StdMeshers_SegmentLengthAroundVertex_i.cxx \ StdMeshers_UseExisting_1D2D_i.cxx \ - StdMeshers_TrianglePreference_i.cxx \ StdMeshers_MaxLength_i.cxx \ StdMeshers_QuadrangleParams_i.cxx \ StdMeshers_RadialQuadrangle_1D2D_i.cxx \ diff --git a/src/StdMeshers_I/StdMeshers_QuadranglePreference_i.cxx b/src/StdMeshers_I/StdMeshers_QuadranglePreference_i.cxx deleted file mode 100644 index dba96998b..000000000 --- a/src/StdMeshers_I/StdMeshers_QuadranglePreference_i.cxx +++ /dev/null @@ -1,99 +0,0 @@ -// Copyright (C) 2007-2011 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 -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -// - -// SMESH SMESH_I : idl implementation based on 'SMESH' unit's calsses -// File : StdMeshers_QuadranglePreference_i.cxx -// Moved here from SMESH_LocalLength_i.cxx -// Author : Paul RASCLE, EDF -// Module : SMESH -// $Header$ -// -#include "StdMeshers_QuadranglePreference_i.hxx" -#include "SMESH_Gen_i.hxx" -#include "SMESH_Gen.hxx" - -#include "Utils_CorbaException.hxx" -#include "utilities.h" - -#include - -using namespace std; - -//============================================================================= -/*! - * StdMeshers_QuadranglePreference_i::StdMeshers_QuadranglePreference_i - * - * Constructor - */ -//============================================================================= - -StdMeshers_QuadranglePreference_i::StdMeshers_QuadranglePreference_i -( PortableServer::POA_ptr thePOA, - int theStudyId, - ::SMESH_Gen* theGenImpl ): SALOME::GenericObj_i( thePOA ), - SMESH_Hypothesis_i( thePOA ) -{ - myBaseImpl = new ::StdMeshers_QuadranglePreference( theGenImpl->GetANewId(), - theStudyId, - theGenImpl ); -} - -//============================================================================= -/*! - * StdMeshers_QuadranglePreference_i::~StdMeshers_QuadranglePreference_i - * - * Destructor - */ -//============================================================================= - -StdMeshers_QuadranglePreference_i::~StdMeshers_QuadranglePreference_i() -{ -} - -//============================================================================= -/*! - * StdMeshers_QuadranglePreference_i::GetImpl - * - * Get implementation - */ -//============================================================================= - -::StdMeshers_QuadranglePreference* StdMeshers_QuadranglePreference_i::GetImpl() -{ - return ( ::StdMeshers_QuadranglePreference* )myBaseImpl; -} - -//================================================================================ -/*! - * \brief Verify whether hypothesis supports given entity type - * \param type - dimension (see SMESH::Dimension enumeration) - * \retval CORBA::Boolean - TRUE if dimension is supported, FALSE otherwise - * - * Verify whether hypothesis supports given entity type (see SMESH::Dimension enumeration) - */ -//================================================================================ - -CORBA::Boolean StdMeshers_QuadranglePreference_i::IsDimSupported( SMESH::Dimension type ) -{ - return type == SMESH::DIM_2D; -} - diff --git a/src/StdMeshers_I/StdMeshers_QuadranglePreference_i.hxx b/src/StdMeshers_I/StdMeshers_QuadranglePreference_i.hxx deleted file mode 100644 index 67304adc6..000000000 --- a/src/StdMeshers_I/StdMeshers_QuadranglePreference_i.hxx +++ /dev/null @@ -1,66 +0,0 @@ -// Copyright (C) 2007-2011 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 -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -// - -// SMESH SMESH_I : idl implementation based on 'SMESH' unit's calsses -// File : StdMeshers_QuadranglePreference_i.hxx -// Moved here from SMESH_LocalLength_i.hxx -// Author : Paul RASCLE, EDF -// Module : SMESH -// $Header$ -// -#ifndef _SMESH_QuadranglePreference_I_HXX_ -#define _SMESH_QuadranglePreference_I_HXX_ - -#include "SMESH_StdMeshers_I.hxx" - -#include -#include CORBA_SERVER_HEADER(SMESH_BasicHypothesis) - -#include "SMESH_Hypothesis_i.hxx" -#include "StdMeshers_QuadranglePreference.hxx" - -class SMESH_Gen; - -// ====================================================== -// Local Length hypothesis -// ====================================================== -class STDMESHERS_I_EXPORT StdMeshers_QuadranglePreference_i: - public virtual POA_StdMeshers::StdMeshers_QuadranglePreference, - public virtual SMESH_Hypothesis_i -{ -public: - // Constructor - StdMeshers_QuadranglePreference_i( PortableServer::POA_ptr thePOA, - int theStudyId, - ::SMESH_Gen* theGenImpl ); - // Destructor - virtual ~StdMeshers_QuadranglePreference_i(); - - // Get implementation - ::StdMeshers_QuadranglePreference* GetImpl(); - - // Verify whether hypothesis supports given entity type - CORBA::Boolean IsDimSupported( SMESH::Dimension type ); -}; - -#endif - diff --git a/src/StdMeshers_I/StdMeshers_TrianglePreference_i.cxx b/src/StdMeshers_I/StdMeshers_TrianglePreference_i.cxx deleted file mode 100644 index 070b280ed..000000000 --- a/src/StdMeshers_I/StdMeshers_TrianglePreference_i.cxx +++ /dev/null @@ -1,93 +0,0 @@ -// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -// - -// File : StdMeshers_TrianglePreference_i.cxx -// Author : -// Module : SMESH -// -#include "StdMeshers_TrianglePreference_i.hxx" -#include "SMESH_Gen_i.hxx" -#include "SMESH_Gen.hxx" - -#include "Utils_CorbaException.hxx" -#include "utilities.h" - -#include - -using namespace std; - -//============================================================================= -/*! - * StdMeshers_TrianglePreference_i::StdMeshers_TrianglePreference_i - * - * Constructor - */ -//============================================================================= - -StdMeshers_TrianglePreference_i::StdMeshers_TrianglePreference_i -( PortableServer::POA_ptr thePOA, - int theStudyId, - ::SMESH_Gen* theGenImpl ): SALOME::GenericObj_i( thePOA ), - SMESH_Hypothesis_i( thePOA ) -{ - myBaseImpl = new ::StdMeshers_TrianglePreference( theGenImpl->GetANewId(), - theStudyId, - theGenImpl ); -} - -//============================================================================= -/*! - * StdMeshers_TrianglePreference_i::~StdMeshers_TrianglePreference_i - * - * Destructor - */ -//============================================================================= - -StdMeshers_TrianglePreference_i::~StdMeshers_TrianglePreference_i() -{ -} - -//============================================================================= -/*! - * StdMeshers_TrianglePreference_i::GetImpl - * - * Get implementation - */ -//============================================================================= - -::StdMeshers_TrianglePreference* StdMeshers_TrianglePreference_i::GetImpl() -{ - return ( ::StdMeshers_TrianglePreference* )myBaseImpl; -} - -//================================================================================ -/*! - * \brief Verify whether hypothesis supports given entity type - * \param type - dimension (see SMESH::Dimension enumeration) - * \retval CORBA::Boolean - TRUE if dimension is supported, FALSE otherwise - * - * Verify whether hypothesis supports given entity type (see SMESH::Dimension enumeration) - */ -//================================================================================ - -CORBA::Boolean StdMeshers_TrianglePreference_i::IsDimSupported( SMESH::Dimension type ) -{ - return type == SMESH::DIM_2D; -} - diff --git a/src/StdMeshers_I/StdMeshers_TrianglePreference_i.hxx b/src/StdMeshers_I/StdMeshers_TrianglePreference_i.hxx deleted file mode 100644 index fb9204ece..000000000 --- a/src/StdMeshers_I/StdMeshers_TrianglePreference_i.hxx +++ /dev/null @@ -1,56 +0,0 @@ -// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -// - -// File : StdMeshers_TrianglePreference_i.hxx -// Author : -// Module : SMESH -// -#ifndef _SMESH_TrianglePreference_I_HXX_ -#define _SMESH_TrianglePreference_I_HXX_ - -#include "SMESH_StdMeshers_I.hxx" - -#include -#include CORBA_SERVER_HEADER(SMESH_BasicHypothesis) - -#include "SMESH_Hypothesis_i.hxx" -#include "StdMeshers_TrianglePreference.hxx" - -class SMESH_Gen; - -class STDMESHERS_I_EXPORT StdMeshers_TrianglePreference_i: - public virtual POA_StdMeshers::StdMeshers_TrianglePreference, - public virtual SMESH_Hypothesis_i -{ -public: - // Constructor - StdMeshers_TrianglePreference_i( PortableServer::POA_ptr thePOA, - int theStudyId, - ::SMESH_Gen* theGenImpl ); - // Destructor - virtual ~StdMeshers_TrianglePreference_i(); - - // Get implementation - ::StdMeshers_TrianglePreference* GetImpl(); - - // Verify whether hypothesis supports given entity type - CORBA::Boolean IsDimSupported( SMESH::Dimension type ); -}; - -#endif //_SMESH_TrianglePreference_I_HXX_