From: jfa Date: Sat, 6 May 2006 08:51:48 +0000 (+0000) Subject: Join modifications from branch OCC_debug_for_3_2_0b1 X-Git-Tag: T3_2_0b1~5 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=57b43b4d010e2d0a1529d3c131bbb9d416e63258;p=modules%2Fsmesh.git Join modifications from branch OCC_debug_for_3_2_0b1 --- diff --git a/INSTALL b/INSTALL index dd103826d..6d03e0a4a 100644 --- a/INSTALL +++ b/INSTALL @@ -1,6 +1,6 @@ -This is the version 3.2.0a2 of SMESH +This is the version 3.2.0b1 of SMESH Compatible with : - - KERNEL 3.2.0a2 - - SALOMEGUI 3.2.0a2 - - GEOM 3.2.0a2 - - MED 3.2.0a2 + - KERNEL 3.2.0b1 + - SALOMEGUI 3.2.0b1 + - GEOM 3.2.0b1 + - MED 3.2.0b1 diff --git a/Makefile.in b/Makefile.in index ded60d8ed..c74723194 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,3 +1,22 @@ +# Copyright (C) 2005 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/ +# # -* Makefile *- # # Author : Patrick GOLDBRONN (CEA) @@ -76,11 +95,15 @@ mesh_tree_algo.png \ mesh_tree_algo_quad.png \ mesh_tree_algo_regular.png \ mesh_tree_algo_tetra.png \ +mesh_tree_algo_netgen_2d3d.png \ +mesh_tree_algo_netgen_2d.png \ mesh_tree_hypo_area.png \ mesh_tree_hypo_length.png \ mesh_tree_hypo.png \ mesh_tree_hypo_segment.png \ mesh_tree_hypo_volume.png \ +mesh_tree_hypo_netgen.png \ +mesh_tree_hypo_netgen_2d.png \ mesh_tree_mesh.png \ mesh_tree_importedmesh.png \ mesh_tree_mesh_warn.png \ @@ -127,6 +150,7 @@ SMESH_en.xml \ SMESH.config \ StdMeshers.xml \ SMESHCatalog.xml \ +SalomeApp.xml \ mesh_pattern.png \ pattern_sample_2d.png \ pattern_sample_3D.png \ @@ -138,7 +162,8 @@ mesh_quad_quadrangle.png \ mesh_quad_tetrahedron.png \ mesh_quad_pyramid.png \ mesh_quad_pentahedron.png \ -mesh_quad_hexahedron.png +mesh_quad_hexahedron.png \ +mesh_conv_to_quad.png BIN_SCRIPT= \ VERSION diff --git a/adm_local/Makefile.in b/adm_local/Makefile.in index 9b5e810db..734bc820a 100644 --- a/adm_local/Makefile.in +++ b/adm_local/Makefile.in @@ -1,3 +1,22 @@ +# Copyright (C) 2005 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/ +# # source path top_srcdir=@top_srcdir@ top_builddir=.. diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in index 7f57ab3d8..3c259c88c 100644 --- a/adm_local/unix/make_commence.in +++ b/adm_local/unix/make_commence.in @@ -168,6 +168,10 @@ CXXFLAGS+= $(CORBA_CXXFLAGS) #LDFLAGS+= $(CORBA_LIBS) LIBS+=$(CORBA_LIBS) +DOXYGEN = @DOXYGEN@ +DOXYGEN_WITH_PYTHON = @DOXYGEN_WITH_PYTHON@ +DOXYGEN_WITH_STL = @DOXYGEN_WITH_STL@ + ## Shared libraries LT_STATIC_EXEC=@LT_STATIC_EXEC@ DYNAMIC_DIRS=@DYNAMIC_DIRS@ @@ -224,7 +228,13 @@ all: Makefile: $(top_builddir)/config.status $(srcdir)/Makefile.in cd $(top_builddir) ; ./config.status -$(top_builddir)/config.status: $(top_srcdir)/configure +LOCAL_MAKE = make_commence make_conclude make_omniorb + +KERNEL_MAKE = make_module depend SALOMEconfig.h F77config.h sstream envScript + +$(top_builddir)/config.status: $(top_srcdir)/configure \ + $(LOCAL_MAKE:%=$(top_srcdir)/adm_local/unix/%.in) \ + $(KERNEL_MAKE:%=$(KERNEL_ROOT_DIR)/salome_adm/unix/%.in) cd $(top_builddir) ; ./config.status --recheck # VPATH contain $(srcdir), so make configure is good in top_srcdir and we must add target configure otherwise :-) @@ -239,7 +249,7 @@ $(top_srcdir)/configure.in: $(top_srcdir)/configure.in.base cd $(top_srcdir) && ./build_configure -ACLOCAL_SRC = \ +ACLOCAL_KERNEL = \ ac_cxx_bool.m4 check_corba.m4 \ ac_cxx_depend_flag.m4 check_hdf5.m4 enable_pthreads.m4 \ ac_cxx_mutable.m4 check_mico.m4 libtool.m4 \ @@ -255,12 +265,12 @@ check_GUI.m4 check_corba_in_GUI.m4 ACLOCAL_MED = check_Med.m4 ACLOCAL_GEOM = check_GEOM.m4 -$(top_srcdir)/aclocal.m4: $(ACLOCAL_SRC:%=@KERNEL_ROOT_DIR@/salome_adm/unix/config_files/%) \ +$(top_srcdir)/aclocal.m4: $(ACLOCAL_KERNEL:%=@KERNEL_ROOT_DIR@/salome_adm/unix/config_files/%) \ $(ACLOCAL_GUI:%=@GUI_ROOT_DIR@/adm_local/unix/config_files/%) \ $(ACLOCAL_MED:%=@MED_ROOT_DIR@/adm_local/unix/config_files/%) \ $(ACLOCAL_GEOM:%=@GEOM_ROOT_DIR@/adm_local/unix/config_files/%) - cd $(top_srcdir) ; aclocal --acdir=adm_local/unix/config_files -I @KERNEL_ROOT_DIR@/salome_adm/unix/config_files \ + cd $(top_srcdir) ; aclocal -I adm_local/unix/config_files -I @KERNEL_ROOT_DIR@/salome_adm/unix/config_files \ -I @GUI_ROOT_DIR@/adm_local/unix/config_files \ -I @MED_ROOT_DIR@/adm_local/unix/config_files \ -I @GEOM_ROOT_DIR@/adm_local/unix/config_files - \ No newline at end of file + diff --git a/bin/VERSION b/bin/VERSION index 3fb4d29dd..a32989223 100755 --- a/bin/VERSION +++ b/bin/VERSION @@ -1 +1 @@ -THIS IS SALOME - SMESH VERSION: 3.2.0a2 +THIS IS SALOME - SMESH VERSION: 3.2.0b1 diff --git a/build_configure b/build_configure index 2d81c7eae..121fb5d2a 100755 --- a/build_configure +++ b/build_configure @@ -150,10 +150,10 @@ echo " ./salome_adm/unix/SALOMEconfig.h \\" >> configure.in_tmp1 echo " ./salome_adm/unix/F77config.h \\" >> configure.in_tmp1 echo " ./salome_adm/unix/sstream \\" >> configure.in_tmp1 echo " ./salome_adm/unix/depend \\" >> configure.in_tmp1 -echo " ./adm_local/unix/make_omniorb \\" >> configure.in_tmp1 +echo " ./adm_local/unix/make_omniorb:${ABS_CONF_DIR}/adm_local/unix/make_omniorb.in \\" >> configure.in_tmp1 echo " ./salome_adm/unix/envScript \\" >> configure.in_tmp1 -echo " ./adm_local/unix/make_commence \\" >> configure.in_tmp1 -echo " ./adm_local/unix/make_conclude \\" >> configure.in_tmp1 +echo " ./adm_local/unix/make_commence:${ABS_CONF_DIR}/adm_local/unix/make_commence.in \\" >> configure.in_tmp1 +echo " ./adm_local/unix/make_conclude:${ABS_CONF_DIR}/adm_local/unix/make_conclude.in \\" >> configure.in_tmp1 echo " ./salome_adm/unix/make_module \\" >> configure.in_tmp1 \rm -f configure.in_tmp2 configure.in_tmp3 diff --git a/doc/Makefile.in b/doc/Makefile.in index 7295ede75..59e6c5962 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -1,3 +1,22 @@ +# Copyright (C) 2005 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/ +# # -* Makefile *- # diff --git a/doc/salome/Makefile.in b/doc/salome/Makefile.in index bd9a4eab5..224ee0881 100644 --- a/doc/salome/Makefile.in +++ b/doc/salome/Makefile.in @@ -1,3 +1,22 @@ +# Copyright (C) 2005 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/ +# # -* Makefile *- # diff --git a/doc/salome/gui/SMESH/about_viewing_meshes.htm b/doc/salome/gui/SMESH/about_viewing_meshes.htm index 77ef54955..1cba90dab 100755 --- a/doc/salome/gui/SMESH/about_viewing_meshes.htm +++ b/doc/salome/gui/SMESH/about_viewing_meshes.htm @@ -14,23 +14,13 @@ if (navigator.appName !="Netscape") - -

About viewing meshes

- -

You can get information about your mesh, change its presentation parameters - and access to other useful functionalities by right-clicking on it in - the Object Browser.

- -

Then the - following pop-up menu appears:

- -

  

+

Viewing meshes

-

+

After definition of algorithms and hypotheses a new mesh is listed in + the Object Browser. Right-click on it and select Compute - the mesh will be automatically + displayed in the VTK + 3D Viewer. Alternatively click + Display only to hide all other objects at the same time.

 

-

The Update button refreshes the presentation of your mesh in the Object - Browser, applying all recent changes.

- -

By clicking on Standard Mesh Infos - and Advanced Mesh - Infos you can learn the Mesh - Infos.

- -

Via Numbering -  you can - display the ID numbers of all meshing elements or nodes composing your - mesh in the viewer.

- -

Via Display Mode, Display - Entity,  Colors - / Size, and  Transparency - you can change the way of presentation of your mesh.

+

After the mesh has appeared in the Viewer, you can select it with left + mouse click and  get + information about it, change its presentation parameters and access to + other useful options by right-clicking on the selected mesh.

-

In the Clipping menu you can create - cross-sections of the selected objects.

- -

Quality Controls are described in - the next chapter.

- -

By clicking on Display Only - you hide all other objects.

- -

The Erase button deletes the - selected object from the session.

+

  

-

Using the Change background - button you can set the background color. By default it is black.  

+

 

-

See Also - a sample TUI Script of a Viewing Mesh Infos - operation.  

+

 

diff --git a/doc/salome/gui/SMESH/adding_quadratic_nodes_and_elements.htm b/doc/salome/gui/SMESH/adding_quadratic_nodes_and_elements.htm new file mode 100755 index 000000000..8f7706a41 --- /dev/null +++ b/doc/salome/gui/SMESH/adding_quadratic_nodes_and_elements.htm @@ -0,0 +1,119 @@ + + + + + +Adding Quadratic Nodes and Elements + + + + + + + + + +

Adding Quadratic Elements

+ +

MESH modules allows you to work with Quadratic + Elements.

+ +

Quadratic Edge in not a straight but a broken line and can be defined + by three points: first, middle and last. All more complex Quadratic + Elements differ from ordinary ones in that they consist of Quadratic + Edges.

+ +

To + add a quadratic element to your mesh:

+ +

1. Select your mesh in the Object Browser + or in the 3D viewer.

+ +

2. From the Modification + menu choose the Add item + and select one of the following:

+ +

+ +

To create any Quadratic + Element specify the nodes which will form your triangle by selecting + them in the 3D viewer with pressed Shift button. Their numbers will appear + in the dialog box as Corner Nodes + (alternatively you can just input numbers in this field without selection).The + edges formed by the corner nodes will appear in the table. To define the + middle nodes for each edge double-click on the respective field and input + the number of the node. All edges and the object formed by them will be + displayed in the Object browser. When all edges are defined you will be + able to click OK or Apply + button to add the element to the mesh.

+ +

 

+ +

Reverse + button for Quadratic Edges switches the first and the last nodes. For all other elements it reverses the element. +

+ +

 

+ + + + diff --git a/doc/salome/gui/SMESH/aspect_ratio_3d.htm b/doc/salome/gui/SMESH/aspect_ratio_3d.htm index 20573a1fd..90c6d6c80 100755 --- a/doc/salome/gui/SMESH/aspect_ratio_3d.htm +++ b/doc/salome/gui/SMESH/aspect_ratio_3d.htm @@ -16,21 +16,22 @@ if (navigator.appName !="Netscape")

Display Entity

-

In this submenu you can choose to display only faces,

+

In this submenu you can choose to display only volumes, faces or edges + or combine them.

 

-

+

Only Faces                                                  Only + Edges

-

 

- -

only edges,

- -

 

- -

+

 

 

-

or both.

-

Adding nodes and elements

-

In SMESH you can add to your mesh different elements such as:

+

In MESH you can add to your mesh different elements such as:

 

@@ -101,9 +101,13 @@ else

  • Quadrangles

    • +

  • Polygons

    • +

  • Tetrahedrons

  • Hexahedrons

    • + +

  • Polyhedrons

    •  

    @@ -123,9 +127,7 @@ else

     

    -

    - -

     

    +

     

    @@ -143,7 +145,11 @@ else

    Adding nodes

    -

         

    +

        

    + +

     

    + +

     

     

    @@ -197,7 +203,8 @@ else

     

    -

    Adding polygons

    +

    Adding polygons +

              

    @@ -244,7 +251,7 @@ else

     

    -

    Adding polyhedrons

    +

    Adding polyhedrons

            

    diff --git a/doc/salome/gui/SMESH/files/area_of_elements.htm b/doc/salome/gui/SMESH/files/area_of_elements.htm index d92aa5ef3..5f8bcb65e 100755 --- a/doc/salome/gui/SMESH/files/area_of_elements.htm +++ b/doc/salome/gui/SMESH/files/area_of_elements.htm @@ -89,7 +89,7 @@ else

    Area mesh quality control is based on the algorithm of area calculation of  meshing - elements . It can be applied to meshes consisting of 2D meshing elements + elements. It can be applied to meshes consisting of 2D meshing elements with 3 and 4 nodes (triangles and quadrangles).    

     

    @@ -116,7 +116,7 @@ else

     

    See Also - a sample TUI Script of an Area + a sample TUI Script of an Area quality control operation.  

     

    diff --git a/doc/salome/gui/SMESH/files/arithmetic_1d.htm b/doc/salome/gui/SMESH/files/arithmetic_1d.htm index ead4f03b7..6a4e2b48a 100755 --- a/doc/salome/gui/SMESH/files/arithmetic_1d.htm +++ b/doc/salome/gui/SMESH/files/arithmetic_1d.htm @@ -14,28 +14,36 @@ if (navigator.appName !="Netscape")

    1D Meshing Hypotheses

    -

    Arithmetic 1D hypothesis

    + + +

    Arithmetic 1D hypothesis

    Arithmetic 1D hypothesis allows to split edges into segments with a length that changes in arithmetic @@ -106,15 +141,15 @@ else

     

    -

         

    +

         

     

    -

    See Also +

    See Also a sample TUI Script of a Defining Arithmetic 1D hypothesis operation.  

    -

    Deflection 1D hypothesis

    +

    Deflection 1D hypothesis

    Deflection ID hypothesis can be applied for meshing curvilinear edges composing your geometrical object. @@ -128,19 +163,19 @@ else

     

    -

          

    +

          

     

    -

    See Also +

    See Also a sample TUI Script of a Defining Deflection 1D hypothesis operation.  

     

    -

    +

    -

    Average Length hypothesis

    +

    Average Length hypothesis

    Average Length hypothesis can be applied for meshing of edges composing your geometrical object. Definition @@ -151,19 +186,19 @@ else

     

    -

           

    +

           

     

    -

    See Also +

    See Also a sample TUI Script of a Defining Average Length hypothesis operation.  

     

    -

    +

    -

    Number of segments hypothesis

    +

    Number of segments hypothesis

    Number of segments hypothesis can be applied for meshing of edges composing your geometrical object. @@ -176,53 +211,60 @@ else

     

    -

    You can set the type of distribution for this +

    You can set the type of distribution for this hypothesis in the Hypothesis Construction dialog bog :

    -

     

    +

     

    + +

    Equidistant + Distribution - all segments will have the same length, you define + only the Number of Segments.

    -

    Equidistant - Distribution - all segments will have the same length

    +

     

    -

             

    +

             

     

    -

    Scale Distribution - each +

    Scale Distribution - each next segment differs from the previous according to the formula: Ai+1 = Ai - * k, where k is - Scale Factor

    + * k, where k is + a Scale Factor.

    -

    \

    +

    \

    -

     

    +

     

    -

    Distribution with Table Density - you - input a number of pairs t - F(t) and - the program computes the formula, which will rule the change of length - of segments.

    +

    Distribution with Table Density - you + input a number of pairs t - F(t), + where t ranges from 0 to 1, +  and + the module computes the formula, which will rule the change of length + of segments and shows the curve in the plot. You can select the Conversion + mode from Exponent + and Cut negative.

    -

     

    +

     

    -

    +

    -

     

    +

     

    -

    Distribution with Analytic Density - Distribution with Analytic Density - you input the formula, which will rule the - change of length of segments

    + change of length of segments and the module shows the curve in the plot.

    -

    +

    -

    See Also +

    See Also a sample TUI Script of a Defining Number of Segments hypothesis operation.  

     

    -

    Start and End Length hypothesis.

    +

    Start and End Length hypothesis.

    Start and End Length hypothesis allows to divide a geometrical edge into segments so that the first and @@ -233,15 +275,44 @@ else

     

    -

          

    +

          

    -

     

    +

     

    -

    See Also +

    See Also a sample TUI Script of a Defining Start and End Length  hypothesis operation.  

    +

     

    + +

    Automatic Length

    + +

    This hypothesis is automatically applied when you select Assign + a set of hypotheses option in Create Mesh menu.

    + +

     

    + +

    + +

     

    + +

    The dialog box prompts you to define the quality of the future mesh + by only one parameter, which is Fineness, + ranging from 0 (coarse mesh, low number of elements) to 1 (extremely fine + mesh, great number of elements). Compare one and the same object (sphere) + meshed with minimum and maximum value of this parameter.

    + +

     

    + +

       

    + +

     

    + +

     

    + +

     

    +

     

    + -

    Max Element Area hypothesis

    +

    2D Meshing Hypotheses

    -

    Max - Element Area hypothesis is applied for meshing of 2D faces composing - your geometrical object. Definition of this hypothesis consists of setting - the maximum area of meshing elements - (depending on the chosen meshing algorithm it can be triangles - or quadrangles), which will compose - the mesh of these 2D faces.

    + + +

    Max Element Area

    + +

    Max Element Area hypothesis + is applied for meshing of 2D faces composing your geometrical object. + Definition of this hypothesis consists of setting the maximum + area of meshing elements (depending on the chosen meshing algorithm + it can be triangles or quadrangles), + which will compose the mesh of these 2D faces.

     

    -

    +

    -

     

    +

     

    -

    See Also +

    See Also a sample TUI Script of a Maximum Element Area hypothesis operation.  

     

    -

    +

    + +

     

    + +

     

    + +

    Length from Edges

    + +

    Length from edges hypothesis + builds 1D mesh segments having a length calculated as an average edge + length for a given wire.

    + +

     

    + +

    See Also + a sample TUI Script of a Length + from Edges hypothesis operation.  

    + +

     

    + +

    Quadrangle Preference

    + +

    This algorithm can be used only together with Quadrangle (Mapping) algorithm. + It allows 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.

    + +

     

    + +

     

    Removing nodes and elements

    -

    In SMESH you can remove nodes and all types of cells of your mesh.

    +

    In MESH you can remove nodes and all types of cells of your mesh.

     

    -

    To remove a node:

    + + +

     

    + +

    To remove a node:

     

    -

    1. Select your mesh in the Object Browser +

    1. Select your mesh in the Object Browser or in the 3D viewer.

    -

     

    +

     

    -

    2. From the Modification +

    2. From the Modification menu choose Remove and from the associated submenu select the Remove - nodes, or just click icon in the toolbar. The + nodes, or just click icon in the toolbar. The following dialog box will appear:

     

    -

    +

    -

     

    +

     

    -

    In this dialog box you can specify one or +

    In this dialog box you can specify one or several nodes (with pressed Shift button) by choosing them in the 3D viewer.

    -

     

    +

     

    -

    3. Click OK +

    3. Click OK or Apply  to confirm deletion of the specified nodes.

    -

     

    +

     

    -

    Be careful while removing +

    Be careful while removing nodes because if you remove a definite node of your mesh all adjacent elements will be also deleted.

    -

     

    +

     

    - --+
    ++- - - + + +
    -

    		 -

    +

    		 +

    -

     

    +

     

     

    -

    To remove an element:

    +

    To remove an element:

     

    -

    1. Select your mesh in the Object Browser +

    1. Select your mesh in the Object Browser or in the 3D viewer.

    -

     

    +

     

    -

    2. From the Modification +

    2. From the Modification menu choose Remove and from the associated submenu select the Remove - elements, or just click icon in the toolbar. The + elements, or just click icon in the toolbar. The following dialog box will appear:

     

    -

    +

    -

     

    +

     

    -

    In this dialog box you can specify one or +

    In this dialog box you can specify one or several elements of your mesh (with pressed Shift button) by choosing them in the 3D viewer.

    -

     

    +

     

    -

    3. Click OK +

    3. Click OK or Apply  to confirm deletion of the specified elements.

    -

     

    +

     

    - --+
    ++- - - + + +
    -

    		 -

    +

    		 +

    -

     

    +

     

     

    diff --git a/doc/salome/gui/SMESH/files/renumbering_nodes_and_elements.htm b/doc/salome/gui/SMESH/files/renumbering_nodes_and_elements.htm index 49b0b0339..460da6f39 100755 --- a/doc/salome/gui/SMESH/files/renumbering_nodes_and_elements.htm +++ b/doc/salome/gui/SMESH/files/renumbering_nodes_and_elements.htm @@ -14,10 +14,12 @@ if (navigator.appName !="Netscape")

    Renumbering nodes and elements

    -

    In SMESH you can renumber the nodes and elements of your mesh.

    +

    In MESH you can renumber the nodes and elements of your mesh.

     

    -

    To renumber the nodes of your mesh:

    + + +

     

    + +

    To renumber the nodes of your mesh:

     

    -

    1. In the Modification +

    1. In the Modification menu select Renumbering submenu and choose the Nodes item or click - button in the toolbar. The following dialog box will + button in the toolbar. The following dialog box will appear:

    -

     

    +

     

    -

    +

    -

     

    +

     

    -

    2. Fill the Mesh +

    2. Fill the Mesh field by selecting your mesh in the Object Browser or in the 3D viewer.

    -

     

    +

     

    -

    3. Click the Apply +

    3. Click the Apply or OK button to perform the operation.

    -

     

    +

     

    -

     

    +

     

    -

    To renumber the elements of your mesh:

    +

    To renumber the elements of your + mesh:

     

    -

    1. In the Modification +

    1. In the Modification menu select Renumbering submenu and choose the Elements item or - click button in the toolbar. The following dialog box will + click button in the toolbar. The following dialog box will appear:

    -

     

    +

     

    -

    +

    -

     

    +

     

    -

    2. Fill the Mesh +

    2. Fill the Mesh field by selecting your mesh in the Object Browser or in the 3D viewer.

    -

     

    +

     

    -

    3. Click the Apply +

    3. Click the Apply or OK button to perform the operation.

    -

     

    +

     

      See Also a sample TUI Script of a Renumbering @@ -144,7 +159,7 @@ else

     

    -

     

    +

     

    + + + + + + + + +

    VTK 3D Viewer

    + +

    VTK + 3D viewer is the default viewer for Mesh Module, allowing to visualize + meshes. It is also used in Post-Pro module for all 3D presentations except + for Gauss Points.

    + +

     

    + +

    The functionalities of + VTK viewer are available via its Viewer Toolbar. Buttons marked with small + downward triangles have extended functionality which can be accessed by + locking on them with left mouse button.  

    + +

     

    + +

    + +
      + +

    • Dump View - exports + an object from the viewer in bmp, png, jpg or jpeg image format.

      • + +

    • Show/Hide Trihedron + - shows or hides coordinate axes.

      • + +

    •  Fit + all - allows to select a point to be the center of a scene representing + all displayed objects in the visible area. +

      • + +

    •   Fit area - resizes + the view to place in the visible area only the contents of a frame drawn + with pressed left mouse button.

      • + +

    • Zoom -  allows + to zoom in and out.

      • + +

    • Panning - if the + represented objects are greater that the visible area and you don't wish + to use Fit all functionality, + click on this button and you'll be able to drag the scene to see its remote + parts.

      • + +

    • Global panning - + represents all displayed objects in the visible area.

      • + +

    • Rotation - allows + to rotate the selected object using the mouse.

      • + +

    • These buttons orientate the scene strictly about coordinate + axes.

      • + +

    • Reset - restores + the default position (isometric) of objects in the scene.

      • + +

    • Scaling - represents + objects deformed (stretched or stuffed) along the axes of coordinates

      • + +

    •  Graduated axes - allows + to define parameters of axes and graduate them.

      • +
    + +

     

    + +

    + +
      + +

    • Axis name

      • + +

    • Is visible - if checked the axis name is displayed in + the viewer.

      • + +

    • Name + - allows to redefine the name of the axis.

      • + +

    • Font + - allows to define color and properties of the font of axis name.

      • + +

    • Labels +

      • + +

    • Is visible - if checked the labels are displayed in the + viewer.

      • + +

    • Number + - allows to define the number of labels.

      • + +

    • Offset + - allows to define the distance between labels.

      • + +

    • Font + - allows to define color and properties of the font of labels names.

      • + +

    • Tick marks

      • + +

    • Is visible - if checked the tick marks are displayed in + the viewer.

      • + +

    • Length + - allows to define the length of tick marks

      • + +

    • Is visible if + checked the axis is displayed in the viewer.

      • +
    + + + + diff --git a/doc/salome/gui/SMESH/free_borders.htm b/doc/salome/gui/SMESH/free_borders.htm index ebfcb53d4..6330ba381 100755 --- a/doc/salome/gui/SMESH/free_borders.htm +++ b/doc/salome/gui/SMESH/free_borders.htm @@ -15,15 +15,16 @@ if (navigator.appName !="Netscape") + + + + + + + +

    Merging Elements

    + +

    This functionality allows to merge coincident elements + of a mesh selectable in the dialog box.

    + +

    + +

    In this picture you see a triangle which coincides with one of the elements + of the mesh. After we apply Merge Elements + functionality, the triangle will be completely merged with the mesh.

    + +

    + +

      See + Also a sample TUI Script of a Merge + Elements operation.  

    + +

     

    + +

     

    + + + + diff --git a/doc/salome/gui/SMESH/modifying_meshes.htm b/doc/salome/gui/SMESH/modifying_meshes.htm index 8ba2b742c..2bf6951c3 100755 --- a/doc/salome/gui/SMESH/modifying_meshes.htm +++ b/doc/salome/gui/SMESH/modifying_meshes.htm @@ -14,11 +14,13 @@ LI.kadov-P { }

    Transparency

    -

    +

     

    diff --git a/doc/salome/gui/SMESH/volume.htm b/doc/salome/gui/SMESH/volume.htm new file mode 100755 index 000000000..ffc11759b --- /dev/null +++ b/doc/salome/gui/SMESH/volume.htm @@ -0,0 +1,118 @@ + + + + + +Volume + + + + + + + + + + +

    Volume

    + +

    Volume mesh quality + criterion reflects the volume of meshes of a 3D object.

    + +

    + +

    To + apply the Volume quality criterion to your mesh:

    + +

    1. Display your mesh in the viewer.

    + +

    2. Choose Controls + > Volume or click button in the toolbar. Your + mesh will be displayed in the viewer with its elements colored according + to the applied mesh quality control criterion:

    + +

    See Also + a sample TUI Script of a Volume quality control operation. +  

    + +

     

    + +

     

    + +

     

    + + + + diff --git a/doc/salome/gui/SMESH/whdata/whftdata0.htm b/doc/salome/gui/SMESH/whdata/whftdata0.htm index 3ecd68c6c..16b2b1b7d 100755 --- a/doc/salome/gui/SMESH/whdata/whftdata0.htm +++ b/doc/salome/gui/SMESH/whdata/whftdata0.htm @@ -13,6 +13,7 @@ diff --git a/doc/salome/gui/SMESH/whdata/whfts.htm b/doc/salome/gui/SMESH/whdata/whfts.htm index 1b6176ed0..15e5cf489 100755 --- a/doc/salome/gui/SMESH/whdata/whfts.htm +++ b/doc/salome/gui/SMESH/whdata/whfts.htm @@ -8,9 +8,9 @@ diff --git a/doc/salome/gui/SMESH/whdata/whfwdata0.htm b/doc/salome/gui/SMESH/whdata/whfwdata0.htm index dfe30b817..96f981b31 100755 --- a/doc/salome/gui/SMESH/whdata/whfwdata0.htm +++ b/doc/salome/gui/SMESH/whdata/whfwdata0.htm @@ -12,1136 +12,1305 @@ diff --git a/doc/salome/gui/SMESH/whdata/whtdata0.htm b/doc/salome/gui/SMESH/whdata/whtdata0.htm index 19d460aee..f1da36132 100755 --- a/doc/salome/gui/SMESH/whdata/whtdata0.htm +++ b/doc/salome/gui/SMESH/whdata/whtdata0.htm @@ -8,7 +8,7 @@