From a64d2ab3183d438ff0aac5a0e708ebdca16969a9 Mon Sep 17 00:00:00 2001 From: pnoyret Date: Fri, 5 Apr 2013 09:12:37 +0000 Subject: [PATCH] minor bugs --- src/Tools/YamsPlug/YamsPlugDialog.ui | 763 ++++++++++++------------ src/Tools/YamsPlug/monYamsPlugDialog.py | 7 +- 2 files changed, 397 insertions(+), 373 deletions(-) diff --git a/src/Tools/YamsPlug/YamsPlugDialog.ui b/src/Tools/YamsPlug/YamsPlugDialog.ui index df7721e9f..0cc606e03 100644 --- a/src/Tools/YamsPlug/YamsPlugDialog.ui +++ b/src/Tools/YamsPlug/YamsPlugDialog.ui @@ -6,8 +6,8 @@ 0 0 - 799 - 602 + 927 + 700 @@ -115,9 +115,9 @@ 20 - 140 - 741 - 271 + 190 + 871 + 311 @@ -126,17 +126,23 @@ - 10 + 20 30 611 - 209 + 261 - - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> + + + + 17 + 25 + 585 + 23 + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> @@ -144,201 +150,341 @@ p, li { white-space: pre-wrap; } <tr> <td style="border: none;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Quality improvement</span> is done by point smoothing and edge swapping</p></td></tr></table></body></html> - - - Quality improvement Only (0) - - - true - - - - - - - the given surface triangulation is enriched (no coarsening at all) in such away that the distance + + + Quality improvement Only (0) + + + true + + + + + + 17 + 54 + 585 + 23 + + + + the given surface triangulation is enriched (no coarsening at all) in such away that the distance between the elements in the final mesh and those of the initial one is bounded by auser specified tolerance value. One should use this option, to enrich the mesh where purely geometrical features may be insuficiently fine, i.e. the resulting mesh will be least as fine as the input. Mesh and the geometric features will be refined if needed as specified by the other program parameters. The meshes obtained with those settings may not be suitable for computation. - - - Pure Geometry Enrichment (G) - - - false - - - - - - - a uniform subdivision of the given surface triangulation is performed : + + + Pure Geometry Enrichment (G) + + + false + + + + + + 17 + 83 + 585 + 23 + + + + a uniform subdivision of the given surface triangulation is performed : each triangle of the given surface triangulation is considered at and is divided into identical triangles. - - - Uniform Subdivision(U) - - - false - - - - - - - a surface sandpapering without shrinkage of the given surface + + + Uniform Subdivision(U) + + + false + + + + + + 17 + 112 + 585 + 23 + + + + a surface sandpapering without shrinkage of the given surface triangulation is performed, i.e., the high curvature variations of the given surface will be smoothed out without shrinking the volume in doing so. If ridges are defined, they will be kept as they are in the resulting mesh. This option modifies the goemetry. - - - Smoothing (S) - - - false - - - - - - - The given surface triangulation is modified in such a way that the distance between + + + Sand Papering (S) + + + false + + + + + + 17 + 141 + 585 + 23 + + + + The given surface triangulation is modified in such a way that the distance between the elements in the final mesh and those of the initial one is bounded by a user specfied tolerance value. One should use this option, to coarsen when a purely geometrical mesh is needed. (a mesh that keeps and obeys its geometric features only.) The meshes obtained with this option are usually not suitable for computation because anisotropic elements may be generated - - - Geometrical Mesh : Coarsening(-2) - - - - - - - The given surface triangulation is modified in such a way that the distance between + + + Geometrical Mesh : Coarsening(-2) + + + + + + 17 + 170 + 585 + 23 + + + + The given surface triangulation is modified in such a way that the distance between the elements in the final mesh and those of the initial one is bounded by a user specfied tolerance value. One should use this option, to coarsen and enrich when a purely geometrical mesh is needed. (a mesh that keeps and obeys its geometric features only.) The meshes obtained with this setting are usually not suitable for computation because anisotropic elements may be generated - - - Geometrical Mesh :Coarsening and Enrichment (2) - - - - - - - The given surface triangulation is modfied in accordance to a size map. + + + Geometrical Mesh : Coarsening and Enrichment (2) + + + + + + 17 + 199 + 585 + 23 + + + + The given surface triangulation is modfied in accordance to a size map. The latter can be either the intrinsic size map (computed automatically and based on the surface properties, i.e. the local curvatures), or on a given size map (which is then combined to the intrinsic size map). One should use this option to coarsen the mesh, when a regular mesh for computation purposes is desired, i.e. a mesh with good aspect ratios or good quality elements. - - - Mesh for finite element computation : Coarsening (-1) - - - - - - - The given surface triangulation is modfied in accordance to a size map. + + + Mesh for finite element computation : Coarsening (-1) + + + + + + 17 + 228 + 585 + 22 + + + + The given surface triangulation is modfied in accordance to a size map. The latter can be either the intrinsic size map (computed automatically and based on the surface properties, i.e. the local curvatures), or on a given size map (which is then combined to the intrinsic size map). One should use this option to coarsen and enrich the mesh, when a regular mesh for computation purposes is desired, i.e. a mesh with good aspect ratios or good quality elements - - - Mesh for finite element computation : Coarsening and Enrichment (1) - - - - + + + Mesh for finite element computation : Coarsening and Enrichment (1) + + - + - 20 - 420 - 301 - 71 + 10 + 20 + 871 + 161 - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> -<table border="0" style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;"> -<tr> -<td style="border: none;"> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p></td></tr></table></body></html> + + + 10 + - Units + Original Mesh - + 10 30 - 110 - 24 - - - - Values are expressed in the model units. - - - Absolute - - - false - - - - - - 160 - 30 - 110 - 24 + 861 + 101 - - Values are relative to the bounding box size. - - - Relative - - - true - + + + + + + 10 + false + + + + QFrame::Box + + + Smesh mesh + + + false + + + 0 + + + + + + + + + + + ../../../../../../../../SalomeSrc/SMESH_V6_main/src/Tools/YamsPlug/open.png../../../../../../../../SalomeSrc/SMESH_V6_main/src/Tools/YamsPlug/open.png + + + + 18 + 18 + + + + false + + + + + + + + 10 + + + + + + + + or + + + + + + + + 10 + + + + Mesh File (GMF format) + + + + + + + + 10 + + + + + - + - 410 - 430 - 351 - 71 + 430 + 540 + 111 + 31 + + + PreferDefault + + + + true + - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> + If the Units parameter is relative epsilon max correspond to 0.0001x s x tolerance parameter where s is the size of the bounding box of the domain. +If the Units parameter is absolute, the tolerance parameter is expressed in model units : +if P=2 and point coordinaters are givin in millimetre, it menas that the maximal chordal deviation is 2 mm + + + 100000.000000000000000 + + + 1.000000000000000 + + + 0.100000000000000 + + + + + + 30 + 500 + 801 + 37 + + + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<table border="0" style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;"> +<tr> +<td style="border: none;"> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p></td></tr></table></body></html> + + + Units + + + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> @@ -354,180 +500,59 @@ p, li { white-space: pre-wrap; } <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p></td></tr></table></body></html> - - - Chordal deviation Tolerance - - - - - 40 - 30 - 81 - 23 - - - - - PreferDefault - - - - true - - - If the Units parameter is relative epsilon max correspond to 0.0001x s x tolerance parameter where s is the size of the bounding box of the domain. -If the Units parameter is absolute, the tolerance parameter is expressed in model units : -if P=2 and point coordinaters are givin in millimetre, it menas that the maximal chordal deviation is 2 mm - - - 100000.000000000000000 - - - 1.000000000000000 - - - 0.100000000000000 - - + + + Chordal deviation Tolerance + + + + - + - 10 - 10 - 741 - 121 + 60 + 540 + 230 + 31 - - - 12 - - - - Original Mesh - - - - - 40 - 70 - 191 - 33 - - - - - 10 - - - - Mesh File (GMF format) - - - - - - 240 - 70 - 481 - 31 - - - - - 10 - - - - - - - 190 - 30 - 41 - 31 - - - - - - - - ../../../../../../../../SalomeSrc/SMESH_V6_main/src/Tools/YamsPlug/open.png../../../../../../../../SalomeSrc/SMESH_V6_main/src/Tools/YamsPlug/open.png - - - - 18 - 18 - - - - false - - - - - - 240 - 30 - 481 - 31 - - - - - 10 - - - - - - - 40 - 30 - 141 - 31 - - - - - 10 - false - - - - QFrame::Box - - - Smesh mesh - - - false - - - 0 - - - - - - 10 - 80 - 31 - 18 - - - - or - - + + + + + Values are expressed in the model units. + + + Absolute + + + false + + + + + + + Values are relative to the bounding box size. + + + Relative + + + true + + + + GBUnit GBTolerance_2 groupBox GBOptim + SP_Tolerance + RB_Relative + RB_Absolute @@ -595,9 +620,9 @@ or add vertices (refines) to change the mesh. 10 - 100 - 761 - 321 + 90 + 841 + 391 @@ -627,7 +652,7 @@ or add vertices (refines) to change the mesh. 120 20 - 631 + 731 61 @@ -652,21 +677,21 @@ faces . <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;"> +</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;"> <table border="0" style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;"> <tr> <td style="border: none;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Geometrical approximation : Maximum angle allowed between a face and a curve </p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">(not separated by a ridge).</span>)</p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p></td></tr></table></body></html> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif';">Geometrical approximation : Maximum angle (1-cos(angle)) allowed </span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif';">between a face and a curve </span><span style=" font-family:'Sans Serif'; font-size:8pt;">(not separated by a ridge).</span><span style=" font-family:'Sans Serif';">)</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif';"><br /></p></td></tr></table></body></html> 120 - 70 - 581 + 80 + 691 71 @@ -674,21 +699,21 @@ p, li { white-space: pre-wrap; } <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;"> +</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;"> <table border="0" style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;"> <tr> <td style="border: none;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Ridge angle:</p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">if the angle between the normal vectors of two adjacent faces exceeds</p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">this value, the edge common to the faces is a ridge</p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p></td></tr></table></body></html> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif';">Ridge angle:</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif';">if the angle between the normal vectors of two adjacent faces</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif';">exceeds this value, the edge common to the faces is a ridge</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif';"><br /></p></td></tr></table></body></html> 10 - 90 + 100 91 23 @@ -704,9 +729,9 @@ p, li { white-space: pre-wrap; } 120 - 140 - 521 - 41 + 160 + 681 + 61 @@ -734,9 +759,9 @@ p, li { white-space: pre-wrap; } 120 - 240 - 591 - 61 + 290 + 691 + 91 @@ -765,7 +790,7 @@ p, li { white-space: pre-wrap; } 10 - 250 + 300 91 23 @@ -781,7 +806,7 @@ p, li { white-space: pre-wrap; } 10 - 150 + 170 91 23 @@ -803,9 +828,9 @@ p, li { white-space: pre-wrap; } 120 - 190 - 521 - 41 + 230 + 661 + 51 @@ -833,7 +858,7 @@ p, li { white-space: pre-wrap; } 10 - 200 + 230 91 23 @@ -855,36 +880,36 @@ p, li { white-space: pre-wrap; } - 10 - 440 + 20 + 490 751 - 61 + 31 You can enable : - - - - 100 - 20 - 271 - 23 - - - - if set, Yams creates new vertices placed on the curved surface and adds them to elements. + + + + + 70 + 530 + 271 + 23 + + + + if set, Yams creates new vertices placed on the curved surface and adds them to elements. It means one extra vertex on edge (P2 or quadratic triangles). New created vertices are saved in the .mesh file under keyword section Vertices - - - split edge - - - false - - + + + split edge + + + false + @@ -909,7 +934,7 @@ New created vertices are saved in the .mesh file under keyword section Vertices 40 30 441 - 27 + 34 @@ -951,7 +976,7 @@ New created vertices are saved in the .mesh file under keyword section Vertices 40 70 441 - 27 + 34 diff --git a/src/Tools/YamsPlug/monYamsPlugDialog.py b/src/Tools/YamsPlug/monYamsPlugDialog.py index 21ee634fb..073526681 100644 --- a/src/Tools/YamsPlug/monYamsPlugDialog.py +++ b/src/Tools/YamsPlug/monYamsPlugDialog.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2013 EDF R&D +# Copyright (C) 2007-2013 EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -17,7 +17,6 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # - # Modules Python # Modules Eficas @@ -265,8 +264,8 @@ class MonYamsPlugDialog(Ui_YamsPlugDialog,QWidget): else : self.commande+=' -Drelative' self.commande+=',tolerance=%f'%self.SP_Tolerance.value() - if self.CB_Ridge.isChecked()==False : self.commande+=',nr' - if self.CB_Point.isChecked()==False : self.commande+=',ns' + if self.CB_Ridge.isChecked()==False : self.commande+=',-nr' + if self.CB_Point.isChecked()==False : self.commande+=',-ns' if self.SP_Geomapp.value()!=0.04 : self.commande+=',geomapp=%f'%self.SP_Geomapp.value() if self.SP_Ridge.value()!=45.0 : self.commande+=',ridge=%f'%self.SP_Ridge.value() if self.SP_MaxSize.value()!=100 : self.commande+=',maxsize=%f'%self.SP_MaxSize.value() -- 2.39.2