From: pnoyret Date: Mon, 29 Oct 2012 13:02:14 +0000 (+0000) Subject: minor bugs -) X-Git-Tag: pluginMGCleaner~278 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=fc55c41f6c5b8830d12c07300038c0aa6be2586c;p=modules%2Fsmesh.git minor bugs -) --- diff --git a/src/Tools/YamsPlug/Tolerance.png b/src/Tools/YamsPlug/Tolerance.png new file mode 100644 index 000000000..d8fb16238 Binary files /dev/null and b/src/Tools/YamsPlug/Tolerance.png differ diff --git a/src/Tools/YamsPlug/YamsPlugDialog.ui b/src/Tools/YamsPlug/YamsPlugDialog.ui index 0113a1bb1..b2bc9a6eb 100644 --- a/src/Tools/YamsPlug/YamsPlugDialog.ui +++ b/src/Tools/YamsPlug/YamsPlugDialog.ui @@ -105,7 +105,7 @@ - 0 + 1 @@ -349,17 +349,10 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">This parameter enables the user to bound the maximal chordal deviation allowed,</p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">that is, the maximal distance allowed between the detected curve and the plane P</p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">of the corresponding mesh face.</p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">il faut mettre ici le png</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-style:italic;">Definitions: chordal deviation epsilon; curvature r; bounding box s; angles alpha and beta</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> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">In other words, it avoids having faces too far away from the curve </p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">they represent (or should represent).</p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">This parameter enables the user to specify the maximal chordal deviation epsilon max.</p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Following that criterion:</p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">- if the chordal deviation epsilon is smaller than epsilon max, it is acceptable </p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> to remove the considered point.</p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">- if the chordal deviation epsilon is greater than epsilon max, the considered mesh face should be </p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> redifined by adding a point on the curve.</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> <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> @@ -388,13 +381,13 @@ If the Units parameter is absolute, the tolerance parameter is expressed in mode if P=2 and point coordinaters are givin in millimetre, it menas that the maximal chordal deviation is 2 mm - 10000.000000000000000 + 100000.000000000000000 1.000000000000000 - 1.000000000000000 + 0.100000000000000 @@ -664,7 +657,7 @@ 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;">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>0.04 corresponds to 16.26 degrees (arccos(1-0.04))</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> @@ -794,13 +787,16 @@ p, li { white-space: pre-wrap; } - -100.000000000000000 + 0.010000000000000 + + + 100.000000000000000 - 0.010000000000000 + 0.100000000000000 - -2.000000000000000 + 100.000000000000000 @@ -843,13 +839,16 @@ p, li { white-space: pre-wrap; } - -100.000000000000000 + 0.000000000000000 + + + 100.000000000000000 - 0.010000000000000 + 0.100000000000000 - -2.000000000000000 + 5.000000000000000 @@ -892,68 +891,80 @@ New created vertices are saved in the .mesh file under keyword section Vertices Generic Options - + - 40 - 160 - 441 - 27 + 10 + 30 + 741 + 131 - - - - - Verbosity Level - - - - - - - Qt::Horizontal - - - - 28 - 20 - - - - - - - - 10 - - - 3 - - - - - - - - - 40 - 210 - 441 - 27 - + + Yams Generic Options - - - - - - 225 - 25 - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> + + + + 40 + 30 + 441 + 27 + + + + + + + Verbosity Level + + + + + + + Qt::Horizontal + + + + 28 + 20 + + + + + + + + 10 + + + 7 + + + + + + + + + 40 + 70 + 441 + 27 + + + + + + + + 225 + 25 + + + + <!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;"> @@ -961,26 +972,26 @@ 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;">Memory size (in Mbytes)</p></td></tr></table></body></html> - - - - - - - Qt::Horizontal - - - - 28 - 20 - - - - - - - - The program requires roughly about 370 bytes per point. It is thus possible to estimate a priori + + + + + + + Qt::Horizontal + + + + 28 + 20 + + + + + + + + The program requires roughly about 370 bytes per point. It is thus possible to estimate a priori the required memory size to complete a job. As an example of memory space needed, a mesh of 543,652 points (1,087,716 triangles) requires 182 Mbytes (about 351 bytes per point). Conversely, a workstation having 512 Mbytes of memory can handle a mesh of about 2,750,000 points. @@ -993,56 +1004,70 @@ Specify the memory if: - you want to limit the amount of memory used by the program. If the input mesh size requires more memory than requested or if the allocated memory (user defined or not) exceeds the machine capabilities, the tool will stop because of insufficient memory. - - - 100000 - - - 0 - - - - - - - - - 40 - 40 - 30 - 31 - - - - - - - - ../../../../../../../../SalomeSrc/SMESH_V6_main/src/Tools/YamsPlug/open.png../../../../../../../../SalomeSrc/SMESH_V6_main/src/Tools/YamsPlug/open.png - - - - - - 80 - 40 - 661 - 31 - - + + + 100000 + + + 0 + + + + + - + - 40 - 10 - 391 - 18 + 10 + 230 + 741 + 141 - - File used to save Yams Params : + + Plug-In Generic Options + + + + 20 + 40 + 391 + 18 + + + + File used to save Yams Params : + + + + + + 20 + 70 + 30 + 31 + + + + + + + + ../../../../../../../../SalomeSrc/SMESH_V6_main/src/Tools/YamsPlug/open.png../../../../../../../../SalomeSrc/SMESH_V6_main/src/Tools/YamsPlug/open.png + + + + + + 60 + 70 + 661 + 31 + + + diff --git a/src/Tools/YamsPlug/monYamsPlugDialog.py b/src/Tools/YamsPlug/monYamsPlugDialog.py index 3e995c21a..653644e21 100644 --- a/src/Tools/YamsPlug/monYamsPlugDialog.py +++ b/src/Tools/YamsPlug/monYamsPlugDialog.py @@ -268,8 +268,8 @@ class MonYamsPlugDialog(Ui_YamsPlugDialog,QWidget): 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()!=-2 : self.commande+=',maxsize=%f'%self.SP_MaxSize.value() - if self.SP_MinSize.value()!=-2 : self.commande+=',minsize=%f'%self.SP_MinSize.value() + if self.SP_MaxSize.value()!=100 : self.commande+=',maxsize=%f'%self.SP_MaxSize.value() + if self.SP_MinSize.value()!=5 : self.commande+=',minsize=%f'%self.SP_MinSize.value() if self.SP_Gradation.value()!=1.3 : self.commande+=',gradation=%f'%self.SP_MaxSize.value() if self.CB_SplitEdge.isChecked()==True : self.commande+=',splitedge=1' @@ -285,12 +285,10 @@ class MonYamsPlugDialog(Ui_YamsPlugDialog,QWidget): self.RB_U.setChecked(False) self.RB_S.setChecked(False) self.RB_2.setChecked(False) - self.RB__2.setChecked(False) self.RB_1.setChecked(False) - self.RB__1.setChecked(False) self.RB_Absolute.setChecked(False) self.RB_Relative.setChecked(True) - self.SP_Tolerance.setProperty("value", 1.0) + self.SP_Tolerance.setProperty("value", 0.1) self.SP_Geomapp.setProperty("value", 0.04) self.SP_Ridge.setProperty("value", 45.0) self.SP_Gradation.setProperty("value", 1.3)