Index: ChangeLog from Christophe Berger &lt;christophe(a)lrde.epita.fr&gt; * oln/appli/astro/graphical_interface/interface.pro: Modify interface appareance. * oln/appli/astro/graphical_interface/visualization_window.ui: likewise. * oln/appli/astro/graphical_interface/filterinterface.hh: likewise. filterinterface.hh | 11 ---- interface.pro | 2 visualization_window.ui | 117 ++++++++++++++++-------------------------------- 3 files changed, 44 insertions(+), 86 deletions(-) Index: oln/appli/astro/graphical_interface/visualization_window.ui --- oln/appli/astro/graphical_interface/visualization_window.ui (revision 215) +++ oln/appli/astro/graphical_interface/visualization_window.ui (working copy) @@ -272,47 +272,6 @@ </widget> <widget class="QSpinBox"> <property name="name"> - <cstring>value_area_max</cstring> - </property> - <property name="enabled"> - <bool>true</bool> - </property> - <property name="geometry"> - <rect> - <x>490</x> - <y>130</y> - <width>80</width> - <height>31</height> - </rect> - </property> - <property name="maxValue"> - <number>999999</number> - </property> - <property name="lineStep"> - <number>0</number> - </property> - <property name="value"> - <number>999999</number> - </property> - </widget> - <widget class="QLabel"> - <property name="name"> - <cstring>area_min_2</cstring> - </property> - <property name="geometry"> - <rect> - <x>450</x> - <y>130</y> - <width>30</width> - <height>31</height> - </rect> - </property> - <property name="text"> - <string>max</string> - </property> - </widget> - <widget class="QSpinBox"> - <property name="name"> <cstring>value_level</cstring> </property> <property name="enabled"> @@ -365,25 +324,9 @@ <string>%</string> </property> </widget> - <widget class="QLabel"> - <property name="name"> - <cstring>textLabel2</cstring> - </property> - <property name="geometry"> - <rect> - <x>440</x> - <y>280</y> - <width>20</width> - <height>30</height> - </rect> - </property> - <property name="text"> - <string>%</string> - </property> - </widget> <widget class="QSpinBox"> <property name="name"> - <cstring>value_center_point</cstring> + <cstring>value_circle</cstring> </property> <property name="enabled"> <bool>true</bool> @@ -391,7 +334,7 @@ <property name="geometry"> <rect> <x>350</x> - <y>280</y> + <y>230</y> <width>80</width> <height>31</height> </rect> @@ -399,21 +342,24 @@ <property name="maxValue"> <number>100</number> </property> + <property name="value"> + <number>90</number> + </property> </widget> <widget class="QLabel"> <property name="name"> - <cstring>textLabel2_2</cstring> + <cstring>area_min_2</cstring> </property> <property name="geometry"> <rect> - <x>500</x> - <y>330</y> - <width>20</width> - <height>30</height> + <x>440</x> + <y>130</y> + <width>30</width> + <height>31</height> </rect> </property> <property name="text"> - <string>%</string> + <string>max</string> </property> </widget> <widget class="QSpinBox"> @@ -422,7 +368,7 @@ </property> <property name="geometry"> <rect> - <x>420</x> + <x>430</x> <y>330</y> <width>70</width> <height>31</height> @@ -431,24 +377,49 @@ <property name="maxValue"> <number>100</number> </property> + <property name="value"> + <number>50</number> + </property> + </widget> + <widget class="QLabel"> + <property name="name"> + <cstring>textLabel2_2</cstring> + </property> + <property name="geometry"> + <rect> + <x>510</x> + <y>330</y> + <width>20</width> + <height>30</height> + </rect> + </property> + <property name="text"> + <string>%</string> + </property> </widget> <widget class="QSpinBox"> <property name="name"> - <cstring>value_circle</cstring> + <cstring>value_area_max</cstring> </property> <property name="enabled"> <bool>true</bool> </property> <property name="geometry"> <rect> - <x>350</x> - <y>230</y> + <x>490</x> + <y>130</y> <width>80</width> <height>31</height> </rect> </property> <property name="maxValue"> - <number>100</number> + <number>99999</number> + </property> + <property name="lineStep"> + <number>0</number> + </property> + <property name="value"> + <number>99999</number> </property> </widget> </widget> @@ -528,12 +499,6 @@ <slot>UpdateValues()</slot> </connection> <connection> - <sender>value_center_point</sender> - <signal>valueChanged(int)</signal> - <receiver>visualisation_window</receiver> - <slot>UpdateValues()</slot> - </connection> - <connection> <sender>value_height</sender> <signal>valueChanged(int)</signal> <receiver>visualisation_window</receiver> Index: oln/appli/astro/graphical_interface/interface.pro Index: oln/appli/astro/graphical_interface/filterinterface.hh --- oln/appli/astro/graphical_interface/filterinterface.hh (revision 215) +++ oln/appli/astro/graphical_interface/filterinterface.hh (working copy) @@ -62,7 +62,6 @@ mt_.set_level(value_level->value()); mt_.set_height(value_height->value()); mt_.set_circle(value_circle->value() / 100); - mt_.set_center_point(value_center_point->value() / 100); mt_.set_tower(value_tower->value() / 100); std::string out = "attributes value changed.";// area(" @@ -172,15 +171,9 @@ virtual void Attribute_center_point() { if (this->active_center_point->isChecked()) - { - this->value_center_point->setEnabled(true); mt_.center_p_tag_ = true; - } else - { mt_.center_p_tag_ = false; - this->value_center_point->setEnabled(false); - } } virtual void Attribute_tower()