ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-02-22 02:15:38 +05:00
Code Issues Packages Projects Releases Wiki Activity

minor bugs -)

Browse Source
This commit is contained in:
pnoyret 2012-10-29 13:02:14 +00:00
parent 6a54fa6046
commit fc55c41f6c
3 changed files with 169 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/Tools/YamsPlug/Tolerance.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 21 KiB

103
src/Tools/YamsPlug/YamsPlugDialog.ui
View File

@ -105,7 +105,7 @@
</font>
</property>
<property name="currentIndex">
<number>0</number>
<number>1</number>
</property>
<widget class="QWidget" name="simple">
<attribute name="title">
@ -349,17 +349,10 @@ p, li { white-space: pre-wrap; }
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;This parameter enables the user to bound the maximal chordal deviation allowed,&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;that is, the maximal distance allowed between the detected curve and the plane P&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;of the corresponding mesh face.&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;il faut mettre ici le png&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;Definitions: chordal deviation epsilon; curvature r; bounding box s; angles alpha and beta&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;In other words, it avoids having faces too far away from the curve &lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;they represent (or should represent).&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;This parameter enables the user to specify the maximal chordal deviation epsilon max.&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Following that criterion:&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;- if the chordal deviation epsilon is smaller than epsilon max, it is acceptable &lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt; to remove the considered point.&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;- if the chordal deviation epsilon is greater than epsilon max, the considered mesh face should be &lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt; redifined by adding a point on the curve.&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="title">
@ -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 </string>
</property>
<property name="maximum">
<double>10000.000000000000000</double>
<double>100000.000000000000000</double>
</property>
<property name="singleStep">
<double>1.000000000000000</double>
</property>
<property name="value">
<double>1.000000000000000</double>
<double>0.100000000000000</double>
</property>
</widget>
</widget>
@ -664,7 +657,7 @@ p, li { white-space: pre-wrap; }
&lt;tr&gt;
&lt;td style=&quot;border: none;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Geometrical approximation : Maximum angle allowed between a face and a curve &lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;(not separated by a ridge). &lt;/span&gt;0.04 corresponds to 16.26 degrees (arccos(1-0.04))&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;(not separated by a ridge).&lt;/span&gt;)&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
@ -794,13 +787,16 @@ p, li { white-space: pre-wrap; }
</rect>
</property>
<property name="minimum">
<double>-100.000000000000000</double>
</property>
<property name="singleStep">
<double>0.010000000000000</double>
</property>
<property name="maximum">
<double>100.000000000000000</double>
</property>
<property name="singleStep">
<double>0.100000000000000</double>
</property>
<property name="value">
<double>-2.000000000000000</double>
<double>100.000000000000000</double>
</property>
</widget>
<widget class="QLabel" name="label_9">
@ -843,13 +839,16 @@ p, li { white-space: pre-wrap; }
</rect>
</property>
<property name="minimum">
<double>-100.000000000000000</double>
<double>0.000000000000000</double>
</property>
<property name="maximum">
<double>100.000000000000000</double>
</property>
<property name="singleStep">
<double>0.010000000000000</double>
<double>0.100000000000000</double>
</property>
<property name="value">
<double>-2.000000000000000</double>
<double>5.000000000000000</double>
</property>
</widget>
</widget>
@ -892,11 +891,23 @@ New created vertices are saved in the .mesh file under keyword section Vertices
<attribute name="title">
<string>Generic Options</string>
</attribute>
<widget class="QGroupBox" name="groupBox_4">
<property name="geometry">
<rect>
<x>10</x>
<y>30</y>
<width>741</width>
<height>131</height>
</rect>
</property>
<property name="title">
<string>Yams Generic Options</string>
</property>
<widget class="QWidget" name="layoutWidget">
<property name="geometry">
<rect>
<x>40</x>
<y>160</y>
<y>30</y>
<width>441</width>
<height>27</height>
</rect>
@ -928,7 +939,7 @@ New created vertices are saved in the .mesh file under keyword section Vertices
<number>10</number>
</property>
<property name="value">
<number>3</number>
<number>7</number>
</property>
</widget>
</item>
@ -938,7 +949,7 @@ New created vertices are saved in the .mesh file under keyword section Vertices
<property name="geometry">
<rect>
<x>40</x>
<y>210</y>
<y>70</y>
<width>441</width>
<height>27</height>
</rect>
@ -1004,11 +1015,37 @@ exceeds the machine capabilities, the tool will stop because of insufficient mem
</item>
</layout>
</widget>
</widget>
<widget class="QGroupBox" name="groupBox_6">
<property name="geometry">
<rect>
<x>10</x>
<y>230</y>
<width>741</width>
<height>141</height>
</rect>
</property>
<property name="title">
<string>Plug-In Generic Options</string>
</property>
<widget class="QLabel" name="label_10">
<property name="geometry">
<rect>
<x>20</x>
<y>40</y>
<width>391</width>
<height>18</height>
</rect>
</property>
<property name="text">
<string>File used to save Yams Params :</string>
</property>
</widget>
<widget class="QPushButton" name="PB_ParamsFileExplorer">
<property name="geometry">
<rect>
<x>40</x>
<y>40</y>
<x>20</x>
<y>70</y>
<width>30</width>
<height>31</height>
</rect>
@ -1024,25 +1061,13 @@ exceeds the machine capabilities, the tool will stop because of insufficient mem
<widget class="QLineEdit" name="LE_ParamsFile">
<property name="geometry">
<rect>
<x>80</x>
<y>40</y>
<x>60</x>
<y>70</y>
<width>661</width>
<height>31</height>
</rect>
</property>
</widget>
<widget class="QLabel" name="label_10">
<property name="geometry">
<rect>
<x>40</x>
<y>10</y>
<width>391</width>
<height>18</height>
</rect>
</property>
<property name="text">
<string>File used to save Yams Params :</string>
</property>
</widget>
</widget>
</widget>

8
src/Tools/YamsPlug/monYamsPlugDialog.py
View File

@ -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)