From cf4c2d720952655c85653322b20d9c74f71831f2 Mon Sep 17 00:00:00 2001 From: eap Date: Wed, 25 Dec 2013 14:05:14 +0000 Subject: [PATCH] 22384: [CEA 831] New wire discretization hypothesis: geometric progression --- .../examples/defining_hypotheses_ex01.py | 15 +- doc/salome/gui/SMESH/images/a-geometric1d.png | Bin 0 -> 16439 bytes .../gui/SMESH/input/1d_meshing_hypo.doc | 26 ++- doc/salome/gui/SMESH/input/about_hypo.doc | 1 + .../SMESH/input/tui_defining_hypotheses.doc | 3 +- idl/SMESH_BasicHypothesis.idl | 128 +++++------ resources/StdMeshers.xml.in | 11 +- src/SMESHGUI/SMESHGUI_Hypotheses.cxx | 2 + src/SMESHUtils/SMESH_Block.hxx | 2 +- src/SMESH_SWIG/StdMeshersBuilder.py | 58 ++++- src/StdMeshers/CMakeLists.txt | 4 + src/StdMeshers/StdMeshers_Geometric1D.cxx | 204 ++++++++++++++++++ src/StdMeshers/StdMeshers_Geometric1D.hxx | 67 ++++++ src/StdMeshers/StdMeshers_Regular_1D.cxx | 64 +++++- src/StdMeshers/StdMeshers_Regular_1D.hxx | 2 +- src/StdMeshers/StdMeshers_Reversible1D.cxx | 99 +++++++++ src/StdMeshers/StdMeshers_Reversible1D.hxx | 59 +++++ .../StdMeshersGUI_StdHypothesisCreator.cxx | 60 ++++++ src/StdMeshersGUI/StdMeshers_images.ts | 12 +- src/StdMeshersGUI/StdMeshers_msg_en.ts | 14 +- src/StdMeshersGUI/StdMeshers_msg_fr.ts | 12 ++ src/StdMeshers_I/CMakeLists.txt | 2 + src/StdMeshers_I/StdMeshers_Geometric1D_i.cxx | 143 ++++++++++++ src/StdMeshers_I/StdMeshers_Geometric1D_i.hxx | 65 ++++++ .../StdMeshers_Reversible1D_i.cxx | 143 ++++++++++++ .../StdMeshers_Reversible1D_i.hxx | 66 ++++++ src/StdMeshers_I/StdMeshers_i.cxx | 3 + 27 files changed, 1169 insertions(+), 96 deletions(-) create mode 100644 doc/salome/gui/SMESH/images/a-geometric1d.png create mode 100644 src/StdMeshers/StdMeshers_Geometric1D.cxx create mode 100644 src/StdMeshers/StdMeshers_Geometric1D.hxx create mode 100644 src/StdMeshers/StdMeshers_Reversible1D.cxx create mode 100644 src/StdMeshers/StdMeshers_Reversible1D.hxx create mode 100644 src/StdMeshers_I/StdMeshers_Geometric1D_i.cxx create mode 100644 src/StdMeshers_I/StdMeshers_Geometric1D_i.hxx create mode 100644 src/StdMeshers_I/StdMeshers_Reversible1D_i.cxx create mode 100644 src/StdMeshers_I/StdMeshers_Reversible1D_i.hxx diff --git a/doc/salome/examples/defining_hypotheses_ex01.py b/doc/salome/examples/defining_hypotheses_ex01.py index 4bb75c56b..1d5d281c8 100644 --- a/doc/salome/examples/defining_hypotheses_ex01.py +++ b/doc/salome/examples/defining_hypotheses_ex01.py @@ -1,12 +1,11 @@ -# Arithmetic 1D +# Arithmetic 1D and Geometric Progression import salome salome.salome_init() -import GEOM + from salome.geom import geomBuilder geompy = geomBuilder.New(salome.myStudy) -import SMESH, SALOMEDS from salome.smesh import smeshBuilder smesh = smeshBuilder.New(salome.myStudy) @@ -21,12 +20,20 @@ hexa = smesh.Mesh(box, "Box : hexahedrical mesh") algo1D = hexa.Segment() # optionally reverse node distribution on certain edges -allEdges = geompy.SubShapeAllSortedIDs( box, geompy.ShapeType["EDGE"]) +allEdges = geompy.SubShapeAllSorted( box, geompy.ShapeType["EDGE"]) reversedEdges = [ allEdges[0], allEdges[4] ] # define "Arithmetic1D" hypothesis to cut all edges in several segments with increasing arithmetic length algo1D.Arithmetic1D(1, 4, reversedEdges) +# define "Geometric Progression" hypothesis on one edge to cut this edge in segments with length increasing by 20% starting from 1 +gpAlgo = hexa.Segment( allEdges[1] ) +gpAlgo.GeometricProgression( 1, 1.2 ) + +# propagate distribution of nodes computed using "Geometric Progression" to parallel edges +gpAlgo.PropagationOfDistribution() + + # create a quadrangle 2D algorithm for faces hexa.Quadrangle() diff --git a/doc/salome/gui/SMESH/images/a-geometric1d.png b/doc/salome/gui/SMESH/images/a-geometric1d.png new file mode 100644 index 0000000000000000000000000000000000000000..a60be94a4a8ff4f2220b53154b6285878001469b GIT binary patch literal 16439 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
  • \ref adaptive_1d_anchor "Adaptive"
  • \ref arithmetic_1d_anchor "Arithmetic 1D"
    • +
  • \ref geometric_1d_anchor "Geometric Progression"
  • \ref average_length_anchor "Local Length"
  • \ref max_length_anchor "Max Size"
  • \ref deflection_1d_anchor "Deflection 1D"
    • @@ -56,7 +57,30 @@ picking them in the 3D viewer or by selecting the edges or groups of edges in th \image html b-ithmetic1d.png "Arithmetic 1D hypothesis - the size of mesh elements gradually increases" See Also a sample TUI Script of a -\ref tui_1d_arithmetic "Defining Arithmetic 1D hypothesis" operation. +\ref tui_1d_arithmetic "Defining Arithmetic 1D and Geometric Progression hypothesis" operation. + +
    +\anchor geometric_1d_anchor +

    Geometric Progression hypothesis

    + +Geometric Progression hypothesis allows to split edges into +segments with a length that changes in geometric progression (Lk = +Lk-1 * d) beginning from a given starting length and with a given +common ratio. + +The direction of the splitting is defined by the orientation of the +underlying geometrical edge. "Reverse Edges" list box allows to +specify the edges for which the splitting should be made in the +direction opposing to their orientation. This list box is enabled only +if the geometry object is selected for the meshing. In this case the +user can select edges to be reversed either directly picking them in +the 3D viewer or by selecting the edges or groups of edges in the +Object Browser. + +\image html a-geometric1d.png + +See Also a sample TUI Script of a +\ref tui_1d_arithmetic "Defining Arithmetic 1D and Geometric Progression hypothesis" operation.
    \anchor deflection_1d_anchor diff --git a/doc/salome/gui/SMESH/input/about_hypo.doc b/doc/salome/gui/SMESH/input/about_hypo.doc index 14f6bcde5..65d5c7ad0 100644 --- a/doc/salome/gui/SMESH/input/about_hypo.doc +++ b/doc/salome/gui/SMESH/input/about_hypo.doc @@ -20,6 +20,7 @@ In \b MESH there are the following Basic Hypotheses:
  • \ref max_length_anchor "Max Size"
  • \ref adaptive_1d_anchor "Adaptive"
  • \ref arithmetic_1d_anchor "Arithmetic 1D"
    • +
  • \ref geometric_1d_anchor "Geometric 1D"
  • \ref start_and_end_length_anchor "Start and end length"
  • \ref deflection_1d_anchor "Deflection 1D"
  • \ref automatic_length_anchor "Automatic Length"
    • diff --git a/doc/salome/gui/SMESH/input/tui_defining_hypotheses.doc b/doc/salome/gui/SMESH/input/tui_defining_hypotheses.doc index 333017d77..863bf76e7 100644 --- a/doc/salome/gui/SMESH/input/tui_defining_hypotheses.doc +++ b/doc/salome/gui/SMESH/input/tui_defining_hypotheses.doc @@ -9,6 +9,7 @@ This page provides example codes of \ref tui_defining_meshing_algos
    • \ref tui_1d_adaptive "Adaptive 1D" hypothesis
    • \ref tui_1d_arithmetic "Arithmetic 1D" hypothesis
      • +
    • \ref tui_1d_arithmetic "Geometric Progression" hypothesis
    • \ref tui_deflection_1d "Deflection 1D and Number of Segments" hypotheses
    • \ref tui_start_and_end_length "Start and End Length" hypotheses
    • \ref tui_average_length "Local Length"
      • @@ -44,7 +45,7 @@ This page provides example codes of \ref tui_defining_meshing_algos
      \anchor tui_1d_arithmetic -

      Arithmetic 1D

      +

      Arithmetic 1D and Geometric Progression

      \tui_script{defining_hypotheses_ex01.py}
      diff --git a/idl/SMESH_BasicHypothesis.idl b/idl/SMESH_BasicHypothesis.idl index 69dbd4a8c..6cea399d4 100644 --- a/idl/SMESH_BasicHypothesis.idl +++ b/idl/SMESH_BasicHypothesis.idl @@ -127,10 +127,36 @@ module StdMeshers double GetFineness(); }; + /*! + * Common inteface of 1D hypotheses that can be reversed + */ + interface Reversible1D + { + /*! + * Set list of edges to reverse + */ + void SetReversedEdges( in SMESH::long_array list ); + + /*! + * Returns list of edges to reverse + */ + SMESH::long_array GetReversedEdges(); + + /*! + * Set entry of the main object + */ + void SetObjectEntry( in string entry ); + + /*! + * Get the entry of the main object + */ + string GetObjectEntry(); + }; + /*! * StdMeshers_NumberOfSegments: interface of "Nb. Segments" hypothesis */ - interface StdMeshers_NumberOfSegments : SMESH::SMESH_Hypothesis + interface StdMeshers_NumberOfSegments : SMESH::SMESH_Hypothesis, Reversible1D { /*! * Builds and returns point distribution according to passed density function @@ -209,32 +235,12 @@ module StdMeshers */ long ConversionMode() raises (SALOME::SALOME_Exception); - - /*! - * Set list of edges to reverse - */ - void SetReversedEdges( in SMESH::long_array list ); - - /*! - * Returns list of edges to reverse - */ - SMESH::long_array GetReversedEdges(); - - /*! - * Set entry of the main object - */ - void SetObjectEntry( in string entry ); - - /*! - * Get the entry of the main object - */ - string GetObjectEntry(); }; /*! * StdMeshers_Arithmetic1D: interface of "Arithmetic 1D" hypothesis */ - interface StdMeshers_Arithmetic1D : SMESH::SMESH_Hypothesis + interface StdMeshers_Arithmetic1D : SMESH::SMESH_Hypothesis, Reversible1D { /*! * Sets or parameter value @@ -260,26 +266,36 @@ module StdMeshers * Returns or parameter value */ double GetLength(in boolean isStartLength); - + + }; + + /*! + * StdMeshers_Arithmetic1D: interface of "Geometric 1D" hypothesis + */ + interface StdMeshers_Geometric1D : SMESH::SMESH_Hypothesis, Reversible1D + { /*! - * Set list of edges to reverse + * Sets length of the first segment */ - void SetReversedEdges( in SMESH::long_array list ); - + void SetStartLength(in double length) + raises (SALOME::SALOME_Exception); + /*! - * Returns list of edges to reverse + * Sets value of Common Ratio */ - SMESH::long_array GetReversedEdges(); - + void SetCommonRatio(in double factor) + raises (SALOME::SALOME_Exception); + /*! - * Set entry of the main object + * Returns length of the first segment */ - void SetObjectEntry( in string entry ); - + double GetStartLength(); + /*! - * Get the entry of the main object + * Returns value of Common Ratio */ - string GetObjectEntry(); + double GetCommonRatio(); + }; /*! @@ -319,7 +335,7 @@ module StdMeshers /*! * StdMeshers_StartEndLength: interface of "Start and End Length" hypothesis */ - interface StdMeshers_StartEndLength : SMESH::SMESH_Hypothesis + interface StdMeshers_StartEndLength : SMESH::SMESH_Hypothesis, Reversible1D { /*! * Sets or parameter value @@ -346,25 +362,6 @@ module StdMeshers */ double GetLength(in boolean isStartLength); - /*! - * Set list of edges to reverse - */ - void SetReversedEdges( in SMESH::long_array list ); - - /*! - * Returns list of edges to reverse - */ - SMESH::long_array GetReversedEdges(); - - /*! - * Set entry of the main object - */ - void SetObjectEntry( in string entry ); - - /*! - * Get the entry of the main object - */ - string GetObjectEntry(); }; @@ -388,7 +385,7 @@ module StdMeshers /*! * StdMeshers_FixedPoints1D: interface of "Fixed points 1D" hypothesis */ - interface StdMeshers_FixedPoints1D : SMESH::SMESH_Hypothesis + interface StdMeshers_FixedPoints1D : SMESH::SMESH_Hypothesis, Reversible1D { /*! * Sets some points on edge using parameter on curve from 0 to 1 @@ -410,26 +407,7 @@ module StdMeshers * Returns list of numbers of segments */ SMESH::long_array GetNbSegments(); - - /*! - * Set list of edges to reverse - */ - void SetReversedEdges( in SMESH::long_array list ); - - /*! - * Returns list of edges to reverse - */ - SMESH::long_array GetReversedEdges(); - - /*! - * Set entry of the main object - */ - void SetObjectEntry( in string entry ); - - /*! - * Get the entry of the main object - */ - string GetObjectEntry(); + }; /*! diff --git a/resources/StdMeshers.xml.in b/resources/StdMeshers.xml.in index 9ecf423ca..93a04564b 100644 --- a/resources/StdMeshers.xml.in +++ b/resources/StdMeshers.xml.in @@ -55,6 +55,11 @@ icon-id ="mesh_hypo_length.png" dim ="1"/> + + LocalLength=LocalLength(SetLength(1),,SetPrecision(1)) MaxLength=MaxSize(SetLength(1)) Arithmetic1D=Arithmetic1D(SetStartLength(),SetEndLength(),SetReversedEdges()) + GeometricProgression=GeometricProgression(SetStartLength(),SetCommonRatio(),SetReversedEdges()) StartEndLength=StartEndLength(SetStartLength(),SetEndLength(),SetReversedEdges()) Deflection1D=Deflection1D(SetDeflection()) Adaptive1D=Adaptive(SetMinSize(),SetMaxSize(),SetDeflection()) @@ -235,7 +241,7 @@ LocalLength=LocalLength(SetLength(), ,SetPrecision()) MaxLength=MaxSize(SetLength()) Arithmetic1D=Arithmetic1D(SetStartLength(),SetEndLength(),SetReversedEdges()) + GeometricProgression=GeometricProgression(SetStartLength(),SetCommonRatio(),SetReversedEdges()) StartEndLength=StartEndLength(SetStartLength(),SetEndLength(),SetReversedEdges()) Deflection1D=Deflection1D(SetDeflection()) Adaptive1D=Adaptive(SetMinSize(),SetMaxSize(),SetDeflection()) diff --git a/src/SMESHGUI/SMESHGUI_Hypotheses.cxx b/src/SMESHGUI/SMESHGUI_Hypotheses.cxx index fa9add8e0..e8ebeea25 100644 --- a/src/SMESHGUI/SMESHGUI_Hypotheses.cxx +++ b/src/SMESHGUI/SMESHGUI_Hypotheses.cxx @@ -551,6 +551,8 @@ QString SMESHGUI_GenericHypothesisCreator::helpPage() const aHelpFileName = "a1d_meshing_hypo_page.html#max_length_anchor"; else if ( aHypType == "Arithmetic1D") aHelpFileName = "a1d_meshing_hypo_page.html#arithmetic_1d_anchor"; + else if ( aHypType == "GeometricProgression") + aHelpFileName = "a1d_meshing_hypo_page.html#geometric_1d_anchor"; else if ( aHypType == "FixedPoints1D") aHelpFileName = "a1d_meshing_hypo_page.html#fixed_points_1d_anchor"; else if ( aHypType == "MaxElementArea") diff --git a/src/SMESHUtils/SMESH_Block.hxx b/src/SMESHUtils/SMESH_Block.hxx index b0ee6f5c5..4fc690137 100644 --- a/src/SMESHUtils/SMESH_Block.hxx +++ b/src/SMESHUtils/SMESH_Block.hxx @@ -284,7 +284,7 @@ public: std::list< int > & theNbEdgesInWires, TopoDS_Vertex theFirstVertex=TopoDS_Vertex(), const bool theShapeAnalysisAlgo=false); - // Return nb wires and a list of oredered edges. + // Return nb wires and a list of ordered edges. // It is used to assign indices to subshapes. // theFirstVertex may be NULL. // Always try to set a seam edge first diff --git a/src/SMESH_SWIG/StdMeshersBuilder.py b/src/SMESH_SWIG/StdMeshersBuilder.py index 46737b38e..4e5b2d217 100644 --- a/src/SMESH_SWIG/StdMeshersBuilder.py +++ b/src/SMESH_SWIG/StdMeshersBuilder.py @@ -199,7 +199,8 @@ class StdMeshersBuilder_Segment(Mesh_Algorithm): hyp.SetDeflection(deflection) return hyp - ## Defines "Arithmetic1D" hypothesis to cut an edge in several segments with increasing arithmetic length + ## Defines "Arithmetic1D" hypothesis to cut an edge in several segments with a length + # that changes in arithmetic progression # @param start defines the length of the first segment # @param end defines the length of the last segment # @param reversedEdges is a list of edges to mesh using reversed orientation. @@ -226,6 +227,32 @@ class StdMeshersBuilder_Segment(Mesh_Algorithm): hyp.SetObjectEntry( entry ) return hyp + ## Defines "GeometricProgression" hypothesis to cut an edge in several + # segments with a length that changes in Geometric progression + # @param start defines the length of the first segment + # @param ratio defines the common ratio of the geometric progression + # @param reversedEdges is a list of edges to mesh using reversed orientation. + # A list item can also be a tuple (edge, 1st_vertex_of_edge) + # @param UseExisting if ==true - searches for an existing hypothesis created with + # the same parameters, else (default) - creates a new one + # @return an instance of StdMeshers_Geometric1D hypothesis + # @ingroup l3_hypos_1dhyps + def GeometricProgression(self, start, ratio, reversedEdges=[], UseExisting=0): + reversedEdgeInd = self.ReversedEdgeIndices(reversedEdges) + entry = self.MainShapeEntry() + from salome.smesh.smeshBuilder import IsEqual + compFun = lambda hyp, args: ( IsEqual(hyp.GetLength(1), args[0]) and \ + IsEqual(hyp.GetLength(0), args[1]) and \ + hyp.GetReversedEdges() == args[2] and \ + (not args[2] or hyp.GetObjectEntry() == args[3])) + hyp = self.Hypothesis("GeometricProgression", [start, ratio, reversedEdgeInd, entry], + UseExisting=UseExisting, CompareMethod=compFun) + hyp.SetStartLength( start ) + hyp.SetCommonRatio( ratio ) + hyp.SetReversedEdges( reversedEdgeInd ) + hyp.SetObjectEntry( entry ) + return hyp + ## Defines "FixedPoints1D" hypothesis to cut an edge using parameter # on curve from 0 to 1 (additionally it is neecessary to check # orientation of edges and create list of reversed edges if it is @@ -237,7 +264,7 @@ class StdMeshersBuilder_Segment(Mesh_Algorithm): # A list item can also be a tuple (edge, 1st_vertex_of_edge) # @param UseExisting if ==true - searches for an existing hypothesis created with # the same parameters, else (default) - creates a new one - # @return an instance of StdMeshers_Arithmetic1D hypothesis + # @return an instance of StdMeshers_FixedPoints1D hypothesis # @ingroup l3_hypos_1dhyps def FixedPoints1D(self, points, nbSegs=[1], reversedEdges=[], UseExisting=0): if not isinstance(reversedEdges,list): #old version script, before adding reversedEdges @@ -1019,7 +1046,8 @@ class StdMeshersBuilder_Prism3D(Mesh_Algorithm): return hyp ## Defines "Arithmetic1D" hypothesis, specifying the distribution of segments - # to build between the inner and the outer shells with a length that changes in arithmetic progression + # to build between the inner and the outer shells with a length that changes + # in arithmetic progression # @param start the length of the first segment # @param end the length of the last segment def Arithmetic1D(self, start, end ): @@ -1031,6 +1059,20 @@ class StdMeshersBuilder_Prism3D(Mesh_Algorithm): hyp.SetLength(end , 0) return hyp + ## Defines "GeometricProgression" hypothesis, specifying the distribution of segments + # to build between the inner and the outer shells with a length that changes + # in Geometric progression + # @param start the length of the first segment + # @param ratio the common ratio of the geometric progression + def GeometricProgression(self, start, ratio ): + if self.algoType != "RadialPrism_3D": + print "Prism_3D algorith doesn't support any hyposesis" + return None + hyp = self.OwnHypothesis("GeometricProgression", [start, ratio]) + hyp.SetStartLength( start ) + hyp.SetCommonRatio( ratio ) + return hyp + ## Defines "StartEndLength" hypothesis, specifying distribution of segments # to build between the inner and the outer shells as geometric length increasing # @param start for the length of the first segment @@ -1187,6 +1229,16 @@ class StdMeshersBuilder_RadialQuadrangle1D2D(Mesh_Algorithm): hyp.SetLength(end , 0) return hyp + ## Defines "GeometricProgression" hypothesis, specifying the distribution of segments + # with a length that changes in Geometric progression + # @param start the length of the first segment + # @param ratio the common ratio of the geometric progression + def GeometricProgression(self, start, ratio ): + hyp = self.OwnHypothesis("GeometricProgression", [start, ratio]) + hyp.SetStartLength( start ) + hyp.SetCommonRatio( ratio ) + return hyp + ## Defines "StartEndLength" hypothesis, specifying distribution of segments # as geometric length increasing # @param start for the length of the first segment diff --git a/src/StdMeshers/CMakeLists.txt b/src/StdMeshers/CMakeLists.txt index de84b5026..2dde1b291 100644 --- a/src/StdMeshers/CMakeLists.txt +++ b/src/StdMeshers/CMakeLists.txt @@ -75,8 +75,10 @@ ENDIF(SALOME_SMESH_ENABLE_MEFISTO) # header files / no moc processing SET(StdMeshers_HEADERS StdMeshers_LocalLength.hxx + StdMeshers_Reversible1D.hxx StdMeshers_StartEndLength.hxx StdMeshers_Arithmetic1D.hxx + StdMeshers_Geometric1D.hxx StdMeshers_FixedPoints1D.hxx StdMeshers_NumberOfSegments.hxx StdMeshers_Deflection1D.hxx @@ -136,8 +138,10 @@ ENDIF(SALOME_SMESH_ENABLE_MEFISTO) # sources / static SET(StdMeshers_SOURCES StdMeshers_LocalLength.cxx + StdMeshers_Reversible1D.cxx StdMeshers_StartEndLength.cxx StdMeshers_Arithmetic1D.cxx + StdMeshers_Geometric1D.cxx StdMeshers_FixedPoints1D.cxx StdMeshers_NumberOfSegments.cxx StdMeshers_Deflection1D.cxx diff --git a/src/StdMeshers/StdMeshers_Geometric1D.cxx b/src/StdMeshers/StdMeshers_Geometric1D.cxx new file mode 100644 index 000000000..8d2be979c --- /dev/null +++ b/src/StdMeshers/StdMeshers_Geometric1D.cxx @@ -0,0 +1,204 @@ +// Copyright (C) 2007-2013 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 : implementaion of SMESH idl descriptions +// File : StdMeshers_Geometric1D.cxx +// Module : SMESH +// +#include "StdMeshers_Geometric1D.hxx" + +#include "SMESH_Mesh.hxx" + +#include +#include +#include +#include +#include +#include +#include + +//============================================================================= +/*! + * Constructor + */ +//============================================================================= + +StdMeshers_Geometric1D::StdMeshers_Geometric1D(int hypId, int studyId, SMESH_Gen * gen) + :StdMeshers_Reversible1D(hypId, studyId, gen) +{ + _begLength = 1.; + _ratio = 1.; + _name = "GeometricProgression"; +} + +//============================================================================= +/*! + * Sets length of the first segment + */ +//============================================================================= + +void StdMeshers_Geometric1D::SetStartLength(double length) + throw(SALOME_Exception) +{ + if ( _begLength != length ) + { + if (length <= 0) + throw SALOME_Exception(LOCALIZED("length must be positive")); + _begLength = length; + NotifySubMeshesHypothesisModification(); + } +} + +//============================================================================= +/*! + * Sets value of Common Ratio + */ +//============================================================================= + +void StdMeshers_Geometric1D::SetCommonRatio(double factor) + throw(SALOME_Exception) +{ + if ( _ratio != factor ) + { + if (factor == 0) + throw SALOME_Exception(LOCALIZED("Zero factor is not allowed")); + _ratio = factor; + NotifySubMeshesHypothesisModification(); + } +} + +//============================================================================= +/*! + * Returns length of the first segment + */ +//============================================================================= + +double StdMeshers_Geometric1D::GetStartLength() const +{ + return _begLength; +} + +//============================================================================= +/*! + * Returns value of Common Ratio + */ +//============================================================================= + +double StdMeshers_Geometric1D::GetCommonRatio() const +{ + return _ratio; +} + +//============================================================================= +/*! + * + */ +//============================================================================= + +ostream & StdMeshers_Geometric1D::SaveTo(ostream & save) +{ + save << _begLength << " " << _ratio << " "; + + StdMeshers_Reversible1D::SaveTo( save ); + + return save; +} + +//============================================================================= +/*! + * + */ +//============================================================================= + +istream & StdMeshers_Geometric1D::LoadFrom(istream & load) +{ + bool isOK = true; + isOK = (load >> _begLength); + isOK = (load >> _ratio); + + if (isOK) + StdMeshers_Reversible1D::LoadFrom( load ); + + return load; +} + +//================================================================================ +/*! + * \brief Initialize start and end length 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 + */ +//================================================================================ + +bool StdMeshers_Geometric1D::SetParametersByMesh(const SMESH_Mesh* theMesh, + const TopoDS_Shape& theShape) +{ + if ( !theMesh || theShape.IsNull() ) + return false; + + _begLength = _ratio = 0.; + + int nbEdges = 0; + TopTools_IndexedMapOfShape edgeMap; + TopExp::MapShapes( theShape, TopAbs_EDGE, edgeMap ); + for ( int i = 1; i <= edgeMap.Extent(); ++i ) + { + const TopoDS_Edge& edge = TopoDS::Edge( edgeMap( i )); + BRepAdaptor_Curve C( edge ); + + vector< double > params; + if ( SMESH_Algo::GetNodeParamOnEdge( theMesh->GetMeshDS(), edge, params )) + { + nbEdges++; + double l1 = GCPnts_AbscissaPoint::Length( C, params[0], params[1] ); + _begLength += l1; + if ( params.size() > 2 && l1 > 1e-100 ) + _ratio += GCPnts_AbscissaPoint::Length( C, params[1], params[2]) / l1; + else + _ratio += 1; + } + } + if ( nbEdges ) { + _begLength /= nbEdges; + _ratio /= nbEdges; + } + else { + _begLength = 1; + _ratio = 1; + } + return nbEdges; +} + +//================================================================================ +/*! + * \brief Initialize my parameter values by default parameters. + * \retval bool - true if parameter values have been successfully defined + */ +//================================================================================ + +bool StdMeshers_Geometric1D::SetParametersByDefaults(const TDefaults& dflts, + const SMESH_Mesh* /*mesh*/) +{ + return ( _begLength = dflts._elemLength ); +} + diff --git a/src/StdMeshers/StdMeshers_Geometric1D.hxx b/src/StdMeshers/StdMeshers_Geometric1D.hxx new file mode 100644 index 000000000..436c31748 --- /dev/null +++ b/src/StdMeshers/StdMeshers_Geometric1D.hxx @@ -0,0 +1,67 @@ +// Copyright (C) 2007-2013 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 : implementaion of SMESH idl descriptions +// File : StdMeshers_Geometric1D.hxx +// Module : SMESH +// +#ifndef _SMESH_Geometric1D_HXX_ +#define _SMESH_Geometric1D_HXX_ + +#include "SMESH_StdMeshers.hxx" + +#include "StdMeshers_Reversible1D.hxx" +#include "Utils_SALOME_Exception.hxx" + +class STDMESHERS_EXPORT StdMeshers_Geometric1D: public StdMeshers_Reversible1D +{ +public: + StdMeshers_Geometric1D(int hypId, int studyId, SMESH_Gen* gen); + + void SetStartLength(double length) throw(SALOME_Exception); + void SetCommonRatio(double factor) throw(SALOME_Exception); + + double GetStartLength() const; + double GetCommonRatio() const; + + virtual std::ostream & SaveTo(std::ostream & save); + virtual std::istream & LoadFrom(std::istream & load); + + /*! + * \brief Initialize start and end length 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 + */ + 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); + +protected: + double _begLength, _ratio; +}; + +#endif diff --git a/src/StdMeshers/StdMeshers_Regular_1D.cxx b/src/StdMeshers/StdMeshers_Regular_1D.cxx index 8c02a524f..3470e50a2 100644 --- a/src/StdMeshers/StdMeshers_Regular_1D.cxx +++ b/src/StdMeshers/StdMeshers_Regular_1D.cxx @@ -37,6 +37,7 @@ #include "SMESH_subMeshEventListener.hxx" #include "StdMeshers_Adaptive1D.hxx" #include "StdMeshers_Arithmetic1D.hxx" +#include "StdMeshers_Geometric1D.hxx" #include "StdMeshers_AutomaticLength.hxx" #include "StdMeshers_Deflection1D.hxx" #include "StdMeshers_Distribution.hxx" @@ -89,6 +90,7 @@ StdMeshers_Regular_1D::StdMeshers_Regular_1D(int hypId, int studyId, _compatibleHypothesis.push_back("StartEndLength"); _compatibleHypothesis.push_back("Deflection1D"); _compatibleHypothesis.push_back("Arithmetic1D"); + _compatibleHypothesis.push_back("GeometricProgression"); _compatibleHypothesis.push_back("FixedPoints1D"); _compatibleHypothesis.push_back("AutomaticLength"); _compatibleHypothesis.push_back("Adaptive1D"); @@ -224,6 +226,21 @@ bool StdMeshers_Regular_1D::CheckHypothesis( SMESH_Mesh& aMesh, aStatus = SMESH_Hypothesis::HYP_OK; } + else if (hypName == "GeometricProgression") + { + const StdMeshers_Geometric1D * hyp = + dynamic_cast (theHyp); + ASSERT(hyp); + _value[ BEG_LENGTH_IND ] = hyp->GetStartLength(); + _value[ END_LENGTH_IND ] = hyp->GetCommonRatio(); + ASSERT( _value[ BEG_LENGTH_IND ] > 0 && _value[ END_LENGTH_IND ] > 0 ); + _hypType = GEOMETRIC_1D; + + _revEdgesIDs = hyp->GetReversedEdges(); + + aStatus = SMESH_Hypothesis::HYP_OK; + } + else if (hypName == "FixedPoints1D") { _fpHyp = dynamic_cast (theHyp); ASSERT(_fpHyp); @@ -877,9 +894,54 @@ bool StdMeshers_Regular_1D::computeInternalParameters(SMESH_Mesh & theMesh, return true; } + case GEOMETRIC_1D: { + + double a1 = _value[ BEG_LENGTH_IND ], an; + double q = _value[ END_LENGTH_IND ]; + + double U1 = theReverse ? l : f; + double Un = theReverse ? f : l; + double param = U1; + double eltSize = a1; + if ( theReverse ) + eltSize = -eltSize; + + int nbParams = 0; + while ( true ) { + // computes a point on a curve at the distance + // from the point of parameter . + GCPnts_AbscissaPoint Discret( theC3d, eltSize, param ); + if ( !Discret.IsDone() ) break; + param = Discret.Parameter(); + if ( f < param && param < l ) + theParams.push_back( param ); + else + break; + an = eltSize; + eltSize *= q; + ++nbParams; + } + if ( nbParams > 1 ) + { + if ( Abs( param - Un ) < 0.2 * Abs( param - theParams.back() )) + { + compensateError( a1, eltSize, U1, Un, theLength, theC3d, theParams ); + } + else if ( Abs( Un - theParams.back() ) < + 0.2 * Abs( theParams.back() - *(--theParams.rbegin()))) + { + theParams.pop_back(); + compensateError( a1, an, U1, Un, theLength, theC3d, theParams ); + } + } + if (theReverse) theParams.reverse(); // NPAL18025 + + return true; + } + case FIXED_POINTS_1D: { const std::vector& aPnts = _fpHyp->GetPoints(); - const std::vector& nbsegs = _fpHyp->GetNbSegments(); + const std::vector& nbsegs = _fpHyp->GetNbSegments(); int i = 0; TColStd_SequenceOfReal Params; for(; i& ids ) +{ + if ( ids != _edgeIDs ) + { + _edgeIDs = ids; + NotifySubMeshesHypothesisModification(); + } +} + +//============================================================================= +/*! + * + */ +//============================================================================= + +std::ostream & StdMeshers_Reversible1D::SaveTo(std::ostream & save) +{ + save << " " << _edgeIDs.size() << " "; + + if ( !_edgeIDs.empty() ) + { + for ( size_t i = 0; i < _edgeIDs.size(); i++) + save << " " << _edgeIDs[i]; + save << " " << _objEntry << " "; + } + + return save; +} + +//============================================================================= +/*! + * + */ +//============================================================================= + +std::istream & StdMeshers_Reversible1D::LoadFrom(std::istream & load) +{ + bool isOK; + int intVal; + + isOK = (load >> intVal); + if (isOK && intVal > 0) { + _edgeIDs.reserve( intVal ); + for (int i = 0; i < _edgeIDs.capacity() && isOK; i++) { + isOK = (load >> intVal); + if ( isOK ) _edgeIDs.push_back( intVal ); + } + isOK = (load >> _objEntry); + } + + return load; +} diff --git a/src/StdMeshers/StdMeshers_Reversible1D.hxx b/src/StdMeshers/StdMeshers_Reversible1D.hxx new file mode 100644 index 000000000..e393e2046 --- /dev/null +++ b/src/StdMeshers/StdMeshers_Reversible1D.hxx @@ -0,0 +1,59 @@ +// Copyright (C) 2007-2013 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 : implementaion of SMESH idl descriptions +// File : StdMeshers_Reversible1D.hxx +// Module : SMESH +// +#ifndef _SMESH_Reversible1D_HXX_ +#define _SMESH_Reversible1D_HXX_ + +#include "SMESH_StdMeshers.hxx" +#include "SMESH_Hypothesis.hxx" + +#include + +/*! + * \brief A base of reversible 1D hypotheses + */ +class STDMESHERS_EXPORT StdMeshers_Reversible1D : public SMESH_Hypothesis +{ +public: + StdMeshers_Reversible1D(int hypId, int studyId, SMESH_Gen* gen); + + void SetReversedEdges( const std::vector& ids); + + void SetObjectEntry( const char* entry ) { _objEntry = entry; } + + const char* GetObjectEntry() { return _objEntry.c_str(); } + + const std::vector& GetReversedEdges() const { return _edgeIDs; } + + virtual std::ostream & SaveTo(std::ostream & save); + virtual std::istream & LoadFrom(std::istream & load); + +protected: + std::vector _edgeIDs; + std::string _objEntry; +}; + +#endif diff --git a/src/StdMeshersGUI/StdMeshersGUI_StdHypothesisCreator.cxx b/src/StdMeshersGUI/StdMeshersGUI_StdHypothesisCreator.cxx index ca774d105..84d06b807 100644 --- a/src/StdMeshersGUI/StdMeshersGUI_StdHypothesisCreator.cxx +++ b/src/StdMeshersGUI/StdMeshersGUI_StdHypothesisCreator.cxx @@ -523,6 +523,23 @@ QString StdMeshersGUI_StdHypothesisCreator::storeParams() const h->SetObjectEntry( w->GetMainShapeEntry() ); } } + else if( hypType()=="GeometricProgression" ) + { + StdMeshers::StdMeshers_Geometric1D_var h = + StdMeshers::StdMeshers_Geometric1D::_narrow( hypothesis() ); + + StdMeshersGUI_SubShapeSelectorWdg* w = + widget< StdMeshersGUI_SubShapeSelectorWdg >( 2 ); + + h->SetVarParameter( params[0].text(), "SetStartLength" ); + h->SetStartLength( params[0].myValue.toDouble() ); + h->SetVarParameter( params[1].text(), "SetCommonRatio" ); + h->SetCommonRatio( params[1].myValue.toDouble() ); + if (w) { + h->SetReversedEdges( w->GetListOfIDs() ); + h->SetObjectEntry( w->GetMainShapeEntry() ); + } + } else if( hypType()=="FixedPoints1D" ) { StdMeshers::StdMeshers_FixedPoints1D_var h = @@ -878,6 +895,41 @@ bool StdMeshersGUI_StdHypothesisCreator::stdParams( ListOfStdParams& p ) const customWidgets()->append ( aDirectionWidget ); } + else if( hypType()=="GeometricProgression" ) + { + StdMeshers::StdMeshers_Geometric1D_var h = + StdMeshers::StdMeshers_Geometric1D::_narrow( hyp ); + + item.myName = tr( "SMESH_START_LENGTH_PARAM" ); + if(!initVariableName( hyp, item, "SetStartLength" )) + item.myValue = h->GetStartLength(); + p.append( item ); + + customWidgets()->append (0); + + item.myName = tr( "SMESH_COMMON_RATIO" ); + if(!initVariableName( hyp, item, "SetCommonRatio" )) + item.myValue = h->GetCommonRatio(); + p.append( item ); + + customWidgets()->append (0); + + item.myName = tr( "SMESH_REVERSED_EDGES" ); + p.append( item ); + + StdMeshersGUI_SubShapeSelectorWdg* aDirectionWidget = + new StdMeshersGUI_SubShapeSelectorWdg(); + QString aGeomEntry = SMESHGUI_GenericHypothesisCreator::getShapeEntry(); + QString aMainEntry = SMESHGUI_GenericHypothesisCreator::getMainShapeEntry(); + if ( aGeomEntry == "" ) + aGeomEntry = h->GetObjectEntry(); + + aDirectionWidget->SetGeomShapeEntry( aGeomEntry ); + aDirectionWidget->SetMainShapeEntry( aMainEntry ); + aDirectionWidget->SetListOfIDs( h->GetReversedEdges() ); + aDirectionWidget->showPreview( true ); + customWidgets()->append ( aDirectionWidget ); + } else if( hypType()=="FixedPoints1D" ) { @@ -1325,6 +1377,13 @@ void StdMeshersGUI_StdHypothesisCreator::attuneStdWidget (QWidget* w, const int) { sb->RangeStepAndValidator( VALUE_SMALL, VALUE_MAX, 1.0, "parametric_precision" ); } + else if( hypType()=="GeometricProgression" ) + { + if (sb->objectName() == tr("SMESH_START_LENGTH_PARAM")) + sb->RangeStepAndValidator( VALUE_SMALL, VALUE_MAX, 1.0, "length_precision" ); + else if (sb->objectName() == tr("SMESH_COMMON_RATIO")) + sb->RangeStepAndValidator( -VALUE_MAX, VALUE_MAX, 0.5, "len_tol_precision" ); + } else if( hypType()=="MaxLength" ) { sb->RangeStepAndValidator( VALUE_SMALL, VALUE_MAX, 1.0, "length_precision" ); @@ -1423,6 +1482,7 @@ QString StdMeshersGUI_StdHypothesisCreator::hypTypeName( const QString& t ) cons types.insert( "Deflection1D", "DEFLECTION1D" ); types.insert( "Adaptive1D", "ADAPTIVE1D" ); types.insert( "Arithmetic1D", "ARITHMETIC_1D" ); + types.insert( "GeometricProgression", "GEOMETRIC_1D" ); types.insert( "FixedPoints1D", "FIXED_POINTS_1D" ); types.insert( "AutomaticLength", "AUTOMATIC_LENGTH" ); types.insert( "ProjectionSource1D", "PROJECTION_SOURCE_1D" ); diff --git a/src/StdMeshersGUI/StdMeshers_images.ts b/src/StdMeshersGUI/StdMeshers_images.ts index 68c8f488a..537118cf5 100644 --- a/src/StdMeshersGUI/StdMeshers_images.ts +++ b/src/StdMeshersGUI/StdMeshers_images.ts @@ -7,6 +7,10 @@ ICON_DLG_ARITHMETIC_1D mesh_hypo_length.png + + ICON_DLG_GEOMETRIC_1D + mesh_hypo_length.png + ICON_DLG_FIXED_POINTS_1D mesh_hypo_length.png @@ -23,10 +27,6 @@ ICON_DLG_ADAPTIVE1D mesh_hypo_length.png - - ICON_DLG_GEOMETRIC_1D - mesh_hypo_length.png - ICON_DLG_LAYER_DISTRIBUTION mesh_hypo_layer_distribution.png @@ -163,6 +163,10 @@ ICON_SMESH_TREE_HYPO_Arithmetic1D mesh_tree_hypo_length.png + + ICON_SMESH_TREE_HYPO_Geometric1D + mesh_tree_hypo_length.png + ICON_SMESH_TREE_HYPO_AutomaticLength mesh_tree_hypo_length.png diff --git a/src/StdMeshersGUI/StdMeshers_msg_en.ts b/src/StdMeshersGUI/StdMeshers_msg_en.ts index a1b6307cc..49510a032 100644 --- a/src/StdMeshersGUI/StdMeshers_msg_en.ts +++ b/src/StdMeshersGUI/StdMeshers_msg_en.ts @@ -23,13 +23,21 @@ Arithmetic 1D - SMESH_ARITHMETIC_1D_PARAM - Arithmetic Reason + SMESH_ARITHMETIC_1D_TITLE + Hypothesis Construction - SMESH_ARITHMETIC_1D_TITLE + SMESH_GEOMETRIC_1D_HYPOTHESIS + Geometric Progression + + + SMESH_GEOMETRIC_1D_TITLE Hypothesis Construction + + SMESH_COMMON_RATIO + Common Ratio + SMESH_AUTOMATIC_LENGTH_HYPOTHESIS Automatic Length diff --git a/src/StdMeshersGUI/StdMeshers_msg_fr.ts b/src/StdMeshersGUI/StdMeshers_msg_fr.ts index 6c191f2de..dba900057 100755 --- a/src/StdMeshersGUI/StdMeshers_msg_fr.ts +++ b/src/StdMeshersGUI/StdMeshers_msg_fr.ts @@ -3,6 +3,18 @@ @default + + SMESH_COMMON_RATIO + Common Ratio + + + SMESH_GEOMETRIC_1D_TITLE + Hypothesis Construction + + + SMESH_GEOMETRIC_1D_HYPOTHESIS + Geometric Progression + SMESH_EDGES_WITH_LAYERS Edges with layers diff --git a/src/StdMeshers_I/CMakeLists.txt b/src/StdMeshers_I/CMakeLists.txt index 51cbd0c0d..73bacce5c 100644 --- a/src/StdMeshers_I/CMakeLists.txt +++ b/src/StdMeshers_I/CMakeLists.txt @@ -129,8 +129,10 @@ ENDIF(SALOME_SMESH_ENABLE_MEFISTO) SET(StdMeshersEngine_SOURCES StdMeshers_i.cxx StdMeshers_LocalLength_i.cxx + StdMeshers_Reversible1D_i.cxx StdMeshers_StartEndLength_i.cxx StdMeshers_Arithmetic1D_i.cxx + StdMeshers_Geometric1D_i.cxx StdMeshers_FixedPoints1D_i.cxx StdMeshers_NumberOfSegments_i.cxx StdMeshers_Deflection1D_i.cxx diff --git a/src/StdMeshers_I/StdMeshers_Geometric1D_i.cxx b/src/StdMeshers_I/StdMeshers_Geometric1D_i.cxx new file mode 100644 index 000000000..b3183e805 --- /dev/null +++ b/src/StdMeshers_I/StdMeshers_Geometric1D_i.cxx @@ -0,0 +1,143 @@ +// Copyright (C) 2007-2013 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_Geometric1D_i.cxx +// Module : SMESH +// +#include "StdMeshers_Geometric1D_i.hxx" +#include "SMESH_Gen_i.hxx" +#include "SMESH_Gen.hxx" +#include "SMESH_PythonDump.hxx" + +#include +#include + +//============================================================================= +/*! + * StdMeshers_Geometric1D_i::StdMeshers_Geometric1D_i + * + * Constructor + */ +//============================================================================= + +StdMeshers_Geometric1D_i::StdMeshers_Geometric1D_i( PortableServer::POA_ptr thePOA, + int theStudyId, + ::SMESH_Gen* theGenImpl ) + : SALOME::GenericObj_i( thePOA ), + SMESH_Hypothesis_i( thePOA ), + StdMeshers_Reversible1D_i( this ) +{ + myBaseImpl = new ::StdMeshers_Geometric1D( theGenImpl->GetANewId(), + theStudyId, + theGenImpl ); +} + +//============================================================================= +/*! + * Sets parameter value + */ +//============================================================================= + +void StdMeshers_Geometric1D_i::SetStartLength( CORBA::Double theLength ) + throw (SALOME::SALOME_Exception) +{ + try { + this->GetImpl()->SetStartLength( theLength ); + } + catch ( SALOME_Exception& S_ex ) { + THROW_SALOME_CORBA_EXCEPTION( S_ex.what(), SALOME::BAD_PARAM ); + } + // Update Python script + SMESH::TPythonDump() + << _this() << ".SetStartLength( " << SMESH::TVar(theLength) << " )"; +} + +//============================================================================= +/*! + * Sets parameter value + */ +//============================================================================= + +void StdMeshers_Geometric1D_i::SetCommonRatio( CORBA::Double factor ) + throw (SALOME::SALOME_Exception) +{ + try { + this->GetImpl()->SetCommonRatio( factor ); + } + catch ( SALOME_Exception& S_ex ) { + THROW_SALOME_CORBA_EXCEPTION( S_ex.what(), SALOME::BAD_PARAM ); + } + // Update Python script + SMESH::TPythonDump() + << _this() << ".SetCommonRatio( " << SMESH::TVar(factor) << " )"; +} + +//============================================================================= +/*! + * Returns length of the first segment + */ +//============================================================================= + +CORBA::Double StdMeshers_Geometric1D_i::GetStartLength() +{ + return this->GetImpl()->GetStartLength(); +} + +//============================================================================= +/*! + * Returns value of Common Ratio + */ +//============================================================================= + +CORBA::Double StdMeshers_Geometric1D_i::GetCommonRatio() +{ + return this->GetImpl()->GetCommonRatio(); +} + +//============================================================================= +/*! + * StdMeshers_Geometric1D_i::GetImpl + * + * Get implementation + */ +//============================================================================= + +::StdMeshers_Geometric1D* StdMeshers_Geometric1D_i::GetImpl() +{ + return ( ::StdMeshers_Geometric1D* )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_Geometric1D_i::IsDimSupported(::SMESH::Dimension type) +{ + return type == SMESH::DIM_1D; +} diff --git a/src/StdMeshers_I/StdMeshers_Geometric1D_i.hxx b/src/StdMeshers_I/StdMeshers_Geometric1D_i.hxx new file mode 100644 index 000000000..3786dd581 --- /dev/null +++ b/src/StdMeshers_I/StdMeshers_Geometric1D_i.hxx @@ -0,0 +1,65 @@ +// Copyright (C) 2007-2013 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_Geometric1D_i.hxx +// Module : SMESH +// +#ifndef _SMESH_Geometric1D_I_HXX_ +#define _SMESH_Geometric1D_I_HXX_ + +#include "SMESH_StdMeshers_I.hxx" + +#include +#include CORBA_SERVER_HEADER(SMESH_BasicHypothesis) + +#include "SMESH_Hypothesis_i.hxx" +#include "StdMeshers_Geometric1D.hxx" +#include "StdMeshers_Reversible1D_i.hxx" + +// ====================================================== +// Geometric 1D hypothesis +// ====================================================== +class STDMESHERS_I_EXPORT StdMeshers_Geometric1D_i: + public virtual POA_StdMeshers::StdMeshers_Geometric1D, + public virtual SMESH_Hypothesis_i, + public virtual StdMeshers_Reversible1D_i +{ + public: + // Constructor + StdMeshers_Geometric1D_i( PortableServer::POA_ptr thePOA, + int theStudyId, + ::SMESH_Gen* theGenImpl ); + + void SetStartLength(CORBA::Double length) throw(SALOME::SALOME_Exception); + void SetCommonRatio(CORBA::Double factor) throw(SALOME::SALOME_Exception); + + CORBA::Double GetStartLength(); + CORBA::Double GetCommonRatio(); + + virtual ::CORBA::Boolean IsDimSupported(::SMESH::Dimension type); + + // Get implementation + ::StdMeshers_Geometric1D* GetImpl(); +}; + +#endif diff --git a/src/StdMeshers_I/StdMeshers_Reversible1D_i.cxx b/src/StdMeshers_I/StdMeshers_Reversible1D_i.cxx new file mode 100644 index 000000000..20a8c9d4a --- /dev/null +++ b/src/StdMeshers_I/StdMeshers_Reversible1D_i.cxx @@ -0,0 +1,143 @@ +// Copyright (C) 2007-2013 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_Reversible1D_i.cxx +// Module : SMESH +// +#include "StdMeshers_Reversible1D_i.hxx" +#include "SMESH_PythonDump.hxx" + +#include +#include + +#include CORBA_SERVER_HEADER(SMESH_Hypothesis) + +//================================================================================ +/*! + * \brief Constructor + */ +//================================================================================ + +StdMeshers_Reversible1D_i::StdMeshers_Reversible1D_i( SMESH_Hypothesis_i* reversible ) + : myHyp( reversible ) +{ +} + +//============================================================================= +/*! + * StdMeshers_Reversible1D_i::SetReversedEdges + * + * Set edges to reverse + */ +//============================================================================= + +void StdMeshers_Reversible1D_i::SetReversedEdges( const SMESH::long_array& theIds ) +{ + try { + std::vector ids( theIds.length() ); + CORBA::Long iEnd = theIds.length(); + for ( CORBA::Long i = 0; i < iEnd; i++ ) + ids[ i ] = theIds[ i ]; + + this->GetImpl()->SetReversedEdges( ids ); + } + catch ( SALOME_Exception& S_ex ) { + THROW_SALOME_CORBA_EXCEPTION( S_ex.what(), SALOME::BAD_PARAM ); + } + + // Update Python script + SMESH::TPythonDump() << myHyp->_this() << ".SetReversedEdges( " << theIds << " )"; +} + +//============================================================================= +/*! + * StdMeshers_Reversible1D_i::SetObjectEntry + * + * Set the Entry for the Main Object + */ +//============================================================================= + +void StdMeshers_Reversible1D_i::SetObjectEntry( const char* theEntry ) +{ + string entry(theEntry); // actually needed as theEntry is spoiled by moment of dumping + try { + this->GetImpl()->SetObjectEntry( entry.c_str() ); + // Update Python script + SMESH::TPythonDump() << myHyp->_this() << ".SetObjectEntry( \"" << entry.c_str() << "\" )"; + } + catch ( SALOME_Exception& S_ex ) { + THROW_SALOME_CORBA_EXCEPTION( S_ex.what(),SALOME::BAD_PARAM ); + } +} + +//============================================================================= +/*! + * StdMeshers_Reversible1D_i::GetObjectEntry + * + * Set the Entry for the Main Object + */ +//============================================================================= + +char* StdMeshers_Reversible1D_i::GetObjectEntry() +{ + const char* entry; + try { + entry = this->GetImpl()->GetObjectEntry(); + } + catch ( SALOME_Exception& S_ex ) { + THROW_SALOME_CORBA_EXCEPTION( S_ex.what(), SALOME::BAD_PARAM ); + } + return CORBA::string_dup( entry ); +} + +//============================================================================= +/*! + * StdMeshers_Reversible1D_i::GetReversedEdges + * + * Get reversed edges + */ +//============================================================================= + +SMESH::long_array* StdMeshers_Reversible1D_i::GetReversedEdges() +{ + SMESH::long_array_var anArray = new SMESH::long_array; + std::vector ids = this->GetImpl()->GetReversedEdges(); + anArray->length( ids.size() ); + for ( CORBA::Long i = 0; i < ids.size(); i++) + anArray [ i ] = ids [ i ]; + + return anArray._retn(); +} + +//============================================================================= +/*! + * StdMeshers_Reversible1D_i::GetImpl + * + * Get implementation + */ +//============================================================================= + +::StdMeshers_Reversible1D* StdMeshers_Reversible1D_i::GetImpl() +{ + return ( ::StdMeshers_Reversible1D* )myHyp->GetImpl(); +} diff --git a/src/StdMeshers_I/StdMeshers_Reversible1D_i.hxx b/src/StdMeshers_I/StdMeshers_Reversible1D_i.hxx new file mode 100644 index 000000000..8d47a7c21 --- /dev/null +++ b/src/StdMeshers_I/StdMeshers_Reversible1D_i.hxx @@ -0,0 +1,66 @@ +// Copyright (C) 2007-2013 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_Reversible1D_i.hxx +// Module : SMESH +// +#ifndef _SMESH_Reversible1D_I_HXX_ +#define _SMESH_Reversible1D_I_HXX_ + +#include "SMESH_StdMeshers_I.hxx" + +#include +#include CORBA_SERVER_HEADER(SMESH_BasicHypothesis) + +#include "SMESH_Hypothesis_i.hxx" +#include "StdMeshers_Reversible1D.hxx" + +// ====================================================== +// Common metrhods of Reversible 1D hypotheses +// ====================================================== +class STDMESHERS_I_EXPORT StdMeshers_Reversible1D_i: + public virtual POA_StdMeshers::Reversible1D +{ + public: + StdMeshers_Reversible1D_i( SMESH_Hypothesis_i* reversible ); + + //Set Reversed Edges + void SetReversedEdges( const SMESH::long_array& theIDs); + + //Get Reversed Edges + SMESH::long_array* GetReversedEdges(); + + //Set the Entry of the Object + void SetObjectEntry( const char* theEntry); + + //Get Object Entry + char* GetObjectEntry(); + + // Get implementation + ::StdMeshers_Reversible1D* GetImpl(); + + private: + SMESH_Hypothesis_i* myHyp; +}; + +#endif diff --git a/src/StdMeshers_I/StdMeshers_i.cxx b/src/StdMeshers_I/StdMeshers_i.cxx index 314a894a0..2d98e11c4 100644 --- a/src/StdMeshers_I/StdMeshers_i.cxx +++ b/src/StdMeshers_I/StdMeshers_i.cxx @@ -35,6 +35,7 @@ #include "StdMeshers_AutomaticLength_i.hxx" #include "StdMeshers_StartEndLength_i.hxx" #include "StdMeshers_Arithmetic1D_i.hxx" +#include "StdMeshers_Geometric1D_i.hxx" #include "StdMeshers_FixedPoints1D_i.hxx" #include "StdMeshers_NumberOfSegments_i.hxx" #include "StdMeshers_Deflection1D_i.hxx" @@ -152,6 +153,8 @@ STDMESHERS_I_EXPORT aCreator = new StdHypothesisCreator_i; else if (strcmp(aHypName, "Arithmetic1D") == 0) aCreator = new StdHypothesisCreator_i; + else if (strcmp(aHypName, "GeometricProgression") == 0) + aCreator = new StdHypothesisCreator_i; else if (strcmp(aHypName, "AutomaticLength") == 0) aCreator = new StdHypothesisCreator_i; else if (strcmp(aHypName, "QuadranglePreference") == 0) -- 2.39.2