Commits

Pierre Surply committed 8865a57

Fix vitesse

Comments (0)

Files changed (8)

src/calibration.cpp

-/*o
-  calibration.cpp
-
-  Pierre Surply
-  Time-stamp: <2012-04-18 16:24:11 surply_p>
- */
+//
+// calibration.cpp for RoadMaster in /home/surply_p
+// 
+// Made by Pierre Surply
+// <pierre.surply@gmail.com>
+// 
+// Started on  Thu Apr 19 18:00:37 2012 Pierre Surply
+// Last update Sun May 13 14:42:30 2012 Pierre Surply
+//
 
 #include "sensor.h"
 #include "calibration.h"
   m_run = false;
   m_sensor = sensor;
   m_distance_parc = 1000;
+  m_nbr_imp = 1000;
 }
 
 Calibr::~Calibr()
 {
 }
 
-void Calibr::set(const bool run)
+void	Calibr::set(const bool run)
 {
   m_run = run;
   if (m_run)
     {
       m_sensor->set_tpm(1);
+      m_nbr_imp = 0;
       m_sensor->reset();
     }
   else
     {
-      m_sensor->set_tpm((float)m_sensor->get_distance_tot()/(float) m_distance_parc);
+      m_nbr_imp = m_sensor->get_distance_tot();
+      this->set_tpm();
       m_sensor->reset();
     }
 }
 
-bool Calibr::is_running() const
+void	Calibr::set_tpm()
+{
+  m_sensor->set_tpm((float)m_nbr_imp/(float) m_distance_parc);
+}
+
+bool	Calibr::is_running() const
 {
   return m_run;
 }
 
-void Calibr::incr_distance_parc(const int step)
+void	Calibr::incr_distance_parc(const int step)
 {
   m_distance_parc += step;
   if (m_distance_parc < DISTANCE_MIN)
     m_distance_parc = DISTANCE_MIN;
   else if (m_distance_parc > DISTANCE_MAX)
   m_distance_parc = DISTANCE_MAX;
+  this->set_tpm();
 }
 
-int Calibr::get_distance_parc() const
+int	Calibr::get_distance_parc() const
 {
   return m_distance_parc;
 }
+
+void	Calibr::save()
+{
+  
+}

src/calibration.h

 ** <pierre.surply@gmail.com>
 ** 
 ** Started on  Thu Apr 19 18:02:11 2012 Pierre Surply
-** Last update Thu Apr 19 18:02:15 2012 Pierre Surply
+** Last update Sun May 13 14:47:14 2012 Pierre Surply
 */
 
-#ifndef CAL_H
-#define CAL_H
+#ifndef CAL_H_
+#define CAL_H_
 
-#define DISTANCE_MIN 500
-#define DISTANCE_MAX 1500
+#define DISTANCE_MIN	500
+#define DISTANCE_MAX	1500
 
 class Sensor;
 
  public:
   Calibr(Sensor* sensor);
   ~Calibr();
-  void set(const bool run);
-  bool is_running() const;
-  void incr_distance_parc(const int step);
-  int get_distance_parc() const;
+  void		set(const bool run);
+  bool		is_running() const;
+  void		incr_distance_parc(const int step);
+  int		get_distance_parc() const;
+  void		set_tpm();
+  void		save();
 
  private:
-  bool m_run;
-  Sensor* m_sensor;
-  int m_distance_parc; //m
+  bool		m_run;
+  Sensor*	m_sensor;
+  int		m_nbr_imp;
+  int		m_distance_parc; //m
 };
 
-#endif
+#endif /* CAL_H_ */
 ** <pierre.surply@gmail.com>
 ** 
 ** Started on  Thu Apr 19 18:02:29 2012 Pierre Surply
-** Last update Thu Apr 19 18:02:32 2012 Pierre Surply
+** Last update Thu Apr 19 21:59:54 2012 Pierre Surply
 */
 
-#ifndef GPIO_H
-#define GPIO_H
+#ifndef GPIO_H_
+#define GPIO_H_
 
 #include <stdio.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/mman.h>
 
-#define MAP_SIZE   4094UL
-#define MAP_MASK   (MAP_SIZE - 1)
+#define MAP_SIZE	4094UL
+#define MAP_MASK	(MAP_SIZE - 1)
 
-#define GPIO_BASE  0x56000000
-#define GPF        (0x54)
-#define GPG        (0x64)
+#define GPIO_BASE	0x56000000
+#define GPF		(0x54)
+#define GPG		(0x64)
 
-#endif // GPIO_H
+#endif /* GPIO_H_ */

src/roadmaster.cpp

 // <pierre.surply@gmail.com>
 // 
 // Started on  Thu Apr 19 18:01:22 2012 Pierre Surply
-// Last update Thu Apr 19 18:01:29 2012 Pierre Surply
+// Last update Sun May 13 14:43:41 2012 Pierre Surply
 //
 
 #include "roadmaster.h"
   m_tps_part = QTime();
 
   m_timer->start(1000, TRUE);
-  m_timer_vitesse->start(5000, TRUE);
+  m_timer_vitesse->start(DELTA_T, TRUE);
 
   m_pause_chrono = false;
   m_distance_begin_part= 0;
 {
 }
 
-void RoadMaster::update()
+void	RoadMaster::update()
 {
-  int tmp;
-  char buf[256];
+  int	tmp;
+  char	buf[256];
 
   if (m_calibr->is_running())
     {
     }
 }
 
-void RoadMaster::run_calibr()
+void	RoadMaster::run_calibr()
 {
   if (!m_calibr->is_running())
     {
     }
 }
 
-void RoadMaster::update_vitesse()
+void	RoadMaster::update_vitesse()
 {
-  int tmp;
-  char buf[256];
-
-  // Vitesse inst
-  tmp = m_sensor->get_vitesse_inst();
-  sprintf(buf, "%d.%d", tmp / 1000, (tmp % 1000) / 100);
-  VitesseInst->display(buf);
+  int	tmp;
+  char	buf[256];
 
   // Vitesse moy
   tmp = m_sensor->get_vitesse_moy();
   sprintf(buf, "%d.%d", tmp / 1000, (tmp % 1000) / 100);
   VitesseMoy->display(buf);
 
-  m_timer_vitesse->start(5000, TRUE);
+  m_timer_vitesse->start(DELTA_T, TRUE);
+}
+
+void	RoadMaster::print_vit_inst(int vit)
+{
+  char buf[256];
+
+  // Vitesse inst
+  sprintf(buf, "%d.%d", vit / 1000, (vit % 1000) / 100);
+  VitesseInst->display(buf);
 }
 
-void RoadMaster::update_timer()
+void	RoadMaster::update_timer()
 {
   if (!m_pause_chrono)
     {
   m_timer->start(1000, TRUE);
 }
 
-void RoadMaster::incr_distance()
+void	RoadMaster::incr_distance()
 {
   m_sensor->add_distance(10);
   this->update();
 }
 
-void RoadMaster::decr_distance()
+void	RoadMaster::decr_distance()
 {
   m_sensor->add_distance(-10);
   this->update();
 }
 
-void RoadMaster::reset_vitesse()
+void	RoadMaster::reset_vitesse()
 {
   m_sensor->reset_vitesse_moy();
   this->update_vitesse();
 }
 
-void RoadMaster::reset_chrono()
+void	RoadMaster::reset_chrono()
 {
   m_chrono = QTime(0,0,0);
   Chrono->display(m_chrono.toString());
   Minuterie->display(m_tps_part.toString());
 }
 
-void RoadMaster::pause_chrono()
+void	RoadMaster::pause_chrono()
 {
   m_pause_chrono = !m_pause_chrono;
 }
 
-void RoadMaster::incr_distance_eta()
+void	RoadMaster::incr_distance_eta()
 {
   this->set_distance_eta(10);
 }
 
-void RoadMaster::decr_distance_eta()
+void	RoadMaster::decr_distance_eta()
 {
   this->set_distance_eta(-10);
 }
 
-void RoadMaster::set_distance_eta(const int step)
+void	RoadMaster::set_distance_eta(const int step)
 {
-  char buf[256];
-  int tmp;
+  char	buf[256];
+  int	tmp;
 
   m_calibr->incr_distance_parc(step);
   
   Etalonnage->setTitle(buf);
 }
 
-void RoadMaster::set_distance_epr(int dist)
+void	RoadMaster::set_distance_epr(int dist)
 {
   m_distance_epr = dist;
   SetDistEpr->setValue(m_distance_epr);
 }
 
-void RoadMaster::set_distance_part(int dist)
+void	RoadMaster::set_distance_part(int dist)
 {
   m_distance_part = dist;
   SetDistPart->setValue(m_distance_part);
 }
 
-void RoadMaster::set_vitesse_part(int vit)
+void	RoadMaster::set_vitesse_part(int vit)
 {
   m_vitesse_part = vit;
   SetVitessPart->setValue(m_vitesse_part);
   ObjVitessMoy->display(m_vitesse_part);
 }
 
-void RoadMaster::set_tps_part_hour(int hour)
+void	RoadMaster::set_tps_part_hour(int hour)
 {
   m_tps_part = QTime(hour, 
 		     m_tps_part.minute(),
   SetTpsPartHour->setValue(hour);
 }
 
-void RoadMaster::set_tps_part_min(int min)
+void	RoadMaster::set_tps_part_min(int min)
 {
   m_tps_part = QTime(m_tps_part.hour(), 
 		     min,
   SetTpsPartMin->setValue(min);
 }
 
-void RoadMaster::set_tps_part_sec(int sec)
+void	RoadMaster::set_tps_part_sec(int sec)
 {
   m_tps_part = QTime(m_tps_part.hour(), 
 		     m_tps_part.minute(),
   SetTpsPartSec->setValue(sec);
 }
 
-void RoadMaster::calc_distance_part()
+void	RoadMaster::calc_distance_part()
 {
   this->set_distance_part((m_vitesse_part)*
 			  (m_tps_part.hour()*3600 +
 			   m_tps_part.second())/3600);
 }
 
-void RoadMaster::calc_vitesse_part()
+void	RoadMaster::calc_vitesse_part()
 {
   this->set_vitesse_part(m_distance_part /
 			 (float)((m_tps_part.hour()*3600 +
 				  m_tps_part.second())/3600.0));
 }
 
-void RoadMaster::calc_tps_part()
+void	RoadMaster::calc_tps_part()
 {
-  int tps = (int)((float)((float)m_distance_part / (float)m_vitesse_part) * 3600.0);
-  int h = tps / 3600;
-  int m = (tps % 3600) / 60;
-  int s = tps % 60;
+  int	tps;
+  int	h;
+  int	m;
+  int	s;
+  tps = (int)((float)((float)m_distance_part / (float)m_vitesse_part) * 3600.0);
+  h = tps / 3600;
+  m = (tps % 3600) / 60;
+  s = tps % 60;
   
   this->set_tps_part_hour(h);
   this->set_tps_part_min(m);
   this->set_tps_part_sec(s);
 }
 
-void RoadMaster::begin_partiel()
+void	RoadMaster::begin_partiel()
 {
   m_distance_begin_part = m_sensor->get_distance_tot();
 }
 ** <pierre.surply@gmail.com>
 ** 
 ** Started on  Thu Apr 19 18:02:49 2012 Pierre Surply
-** Last update Thu Apr 19 18:02:53 2012 Pierre Surply
+** Last update Sun May 13 14:29:53 2012 Pierre Surply
 */
 
-#ifndef ROADMASTER_H
-#define ROADMASTER_H
+#ifndef ROADMASTER_H_
+#define ROADMASTER_H_
 
 #include <qtimer.h>
 #include <qdatetime.h>
 #include "calibration.h"
 #include "sensor.h"
 
+#define DELTA_T	       2500
+
 class RoadMaster : public RoadMasterBase
 {
   Q_OBJECT
  public:
   RoadMaster(QWidget* parent = 0, const char* name = 0, WFlags fl = 0);
   ~RoadMaster();
-  void update();
-  void begin_partiel();
+  void	update();
+  void	begin_partiel();
   
  public slots:
   // home
-  void update_vitesse();
-  void update_timer();
-  void incr_distance();
-  void decr_distance();
-  void reset_vitesse();
-  void reset_chrono();
-  void pause_chrono();
+  void	update_vitesse();
+  void	print_vit_inst(int vit);
+  void	update_timer();
+  void	incr_distance();
+  void	decr_distance();
+  void	reset_vitesse();
+  void	reset_chrono();
+  void	pause_chrono();
 
   // Calibration
-  void run_calibr();
-  void incr_distance_eta();
-  void decr_distance_eta();
+  void	run_calibr();
+  void	incr_distance_eta();
+  void	decr_distance_eta();
   
   // Settings
-  void set_distance_epr(int dist);
-  void set_distance_part(int dist);
-  void set_vitesse_part(int vit);
-  void set_tps_part_hour(int hour);
-  void set_tps_part_min(int min);
-  void set_tps_part_sec(int sec);
-  void calc_distance_part();
-  void calc_vitesse_part();
-  void calc_tps_part();
+  void	set_distance_epr(int dist);
+  void	set_distance_part(int dist);
+  void	set_vitesse_part(int vit);
+  void	set_tps_part_hour(int hour);
+  void	set_tps_part_min(int min);
+  void	set_tps_part_sec(int sec);
+  void	calc_distance_part();
+  void	calc_vitesse_part();
+  void	calc_tps_part();
 
  private:
-  void set_distance_eta(const int step);
+  void		set_distance_eta(const int step);
   
-  Sensor* m_sensor;
-  Calibr* m_calibr;
+  Sensor*	m_sensor;
+  Calibr*	m_calibr;
 
-  QTimer* m_timer;
-  QTimer* m_timer_vitesse;
+  QTimer*	m_timer;
+  QTimer*	m_timer_vitesse;
 
   // Chrono
-  QTime m_chrono;
-  bool m_pause_chrono;
+  QTime		m_chrono;
+  bool		m_pause_chrono;
 
   // Settings
-  int m_distance_epr; //km
-  int m_distance_part;
-  int m_vitesse_part;
-  QTime m_tps_part;
+  int		m_distance_epr; //km
+  int		m_distance_part;
+  int		m_vitesse_part;
+  QTime		m_tps_part;
 
   // Epreuve Partiel
-  int m_distance_begin_part;
+  int		m_distance_begin_part;
 };
 
-#endif
+#endif /* ROADMASTER_H_ */

src/roadmaster_base.ui

         <rect>
             <x>0</x>
             <y>0</y>
-            <width>386</width>
+            <width>366</width>
             <height>428</height>
         </rect>
     </property>
                 <property stdset="1">
                     <name>geometry</name>
                     <rect>
-                        <x>3</x>
+                        <x>-17</x>
                         <y>8</y>
-                        <width>230</width>
+                        <width>260</width>
                         <height>85</height>
                     </rect>
                 </property>
                 </property>
                 <property stdset="1">
                     <name>numDigits</name>
-                    <number>5</number>
+                    <number>3</number>
                 </property>
                 <property stdset="1">
                     <name>segmentStyle</name>
                 <property stdset="1">
                     <name>geometry</name>
                     <rect>
-                        <x>3</x>
-                        <y>200</y>
-                        <width>230</width>
-                        <height>60</height>
+                        <x>-10</x>
+                        <y>188</y>
+                        <width>250</width>
+                        <height>70</height>
                     </rect>
                 </property>
                 <property stdset="1">
+                    <name>sizePolicy</name>
+                    <sizepolicy>
+                        <hsizetype>4</hsizetype>
+                        <vsizetype>4</vsizetype>
+                    </sizepolicy>
+                </property>
+                <property stdset="1">
                     <name>palette</name>
                     <palette>
                         <active>
                 </property>
                 <property stdset="1">
                     <name>numDigits</name>
-                    <number>5</number>
+                    <number>8</number>
                 </property>
                 <property stdset="1">
                     <name>segmentStyle</name>
                 <property stdset="1">
                     <name>geometry</name>
                     <rect>
-                        <x>10</x>
-                        <y>95</y>
-                        <width>216</width>
+                        <x>-4</x>
+                        <y>90</y>
+                        <width>244</width>
                         <height>105</height>
                     </rect>
                 </property>
                 <class>QGroupBox</class>
                 <property stdset="1">
                     <name>name</name>
-                    <cstring>Distance</cstring>
+                    <cstring>Time</cstring>
                 </property>
                 <property stdset="1">
                     <name>geometry</name>
                     <rect>
                         <x>0</x>
-                        <y>0</y>
+                        <y>190</y>
                         <width>240</width>
-                        <height>100</height>
+                        <height>70</height>
                     </rect>
                 </property>
                 <property stdset="1">
                 </property>
                 <property stdset="1">
                     <name>title</name>
-                    <string>Distance (km)</string>
+                    <string>Temps</string>
                 </property>
                 <widget>
+                    <class>QLCDNumber</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>Minuterie</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>geometry</name>
+                        <rect>
+                            <x>135</x>
+                            <y>10</y>
+                            <width>95</width>
+                            <height>25</height>
+                        </rect>
+                    </property>
+                    <property stdset="1">
+                        <name>numDigits</name>
+                        <number>9</number>
+                    </property>
+                    <property stdset="1">
+                        <name>segmentStyle</name>
+                        <enum>Flat</enum>
+                    </property>
+                </widget>
+                <widget>
                     <class>QPushButton</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>IncrDist</cstring>
+                        <cstring>ResetChrono</cstring>
                     </property>
                     <property stdset="1">
                         <name>geometry</name>
                         <rect>
-                            <x>145</x>
-                            <y>50</y>
-                            <width>45</width>
-                            <height>45</height>
+                            <x>150</x>
+                            <y>35</y>
+                            <width>30</width>
+                            <height>28</height>
                         </rect>
                     </property>
                     <property stdset="1">
                                     <blue>0</blue>
                                 </color>
                                 <color>
-                                    <red>85</red>
-                                    <green>255</green>
-                                    <blue>255</blue>
+                                    <red>255</red>
+                                    <green>0</green>
+                                    <blue>0</blue>
                                 </color>
                                 <color>
-                                    <red>212</red>
-                                    <green>255</green>
-                                    <blue>255</blue>
+                                    <red>255</red>
+                                    <green>127</green>
+                                    <blue>127</blue>
                                 </color>
                                 <color>
-                                    <red>148</red>
-                                    <green>255</green>
-                                    <blue>255</blue>
+                                    <red>255</red>
+                                    <green>63</green>
+                                    <blue>63</blue>
                                 </color>
                                 <color>
-                                    <red>42</red>
-                                    <green>127</green>
-                                    <blue>127</blue>
+                                    <red>127</red>
+                                    <green>0</green>
+                                    <blue>0</blue>
                                 </color>
                                 <color>
-                                    <red>57</red>
-                                    <green>170</green>
-                                    <blue>170</blue>
+                                    <red>170</red>
+                                    <green>0</green>
+                                    <blue>0</blue>
                                 </color>
                                 <color>
                                     <red>0</red>
                                     <blue>128</blue>
                                 </color>
                                 <color>
-                                    <red>85</red>
-                                    <green>255</green>
-                                    <blue>255</blue>
+                                    <red>255</red>
+                                    <green>0</green>
+                                    <blue>0</blue>
                                 </color>
                                 <color>
-                                    <red>212</red>
-                                    <green>255</green>
-                                    <blue>255</blue>
+                                    <red>255</red>
+                                    <green>127</green>
+                                    <blue>127</blue>
                                 </color>
                                 <color>
-                                    <red>123</red>
-                                    <green>255</green>
-                                    <blue>255</blue>
+                                    <red>255</red>
+                                    <green>38</green>
+                                    <blue>38</blue>
                                 </color>
                                 <color>
-                                    <red>42</red>
-                                    <green>127</green>
-                                    <blue>127</blue>
+                                    <red>127</red>
+                                    <green>0</green>
+                                    <blue>0</blue>
                                 </color>
                                 <color>
-                                    <red>57</red>
-                                    <green>170</green>
-                                    <blue>170</blue>
+                                    <red>170</red>
+                                    <green>0</green>
+                                    <blue>0</blue>
                                 </color>
                                 <color>
                                     <red>0</red>
                                     <blue>0</blue>
                                 </color>
                                 <color>
-                                    <red>85</red>
-                                    <green>255</green>
-                                    <blue>255</blue>
+                                    <red>255</red>
+                                    <green>0</green>
+                                    <blue>0</blue>
                                 </color>
                                 <color>
-                                    <red>212</red>
-                                    <green>255</green>
-                                    <blue>255</blue>
+                                    <red>255</red>
+                                    <green>127</green>
+                                    <blue>127</blue>
                                 </color>
                                 <color>
-                                    <red>123</red>
-                                    <green>255</green>
-                                    <blue>255</blue>
+                                    <red>255</red>
+                                    <green>38</green>
+                                    <blue>38</blue>
                                 </color>
                                 <color>
-                                    <red>42</red>
-                                    <green>127</green>
-                                    <blue>127</blue>
+                                    <red>127</red>
+                                    <green>0</green>
+                                    <blue>0</blue>
                                 </color>
                                 <color>
-                                    <red>57</red>
-                                    <green>170</green>
-                                    <blue>170</blue>
+                                    <red>170</red>
+                                    <green>0</green>
+                                    <blue>0</blue>
                                 </color>
                                 <color>
                                     <red>0</red>
                         </palette>
                     </property>
                     <property stdset="1">
-                        <name>font</name>
-                        <font>
-                            <pointsize>12</pointsize>
-                            <bold>1</bold>
-                        </font>
+                        <name>text</name>
+                        <string>rst</string>
+                    </property>
+                </widget>
+                <widget>
+                    <class>QPushButton</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>PauseChrono</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>geometry</name>
+                        <rect>
+                            <x>190</x>
+                            <y>35</y>
+                            <width>30</width>
+                            <height>28</height>
+                        </rect>
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <string>+</string>
+                        <string>ll</string>
                     </property>
                 </widget>
                 <widget>
                     <class>QLCDNumber</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>DistRestTot</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>enabled</name>
-                        <bool>true</bool>
+                        <cstring>Chrono</cstring>
                     </property>
                     <property stdset="1">
                         <name>geometry</name>
                         <rect>
-                            <x>5</x>
-                            <y>70</y>
-                            <width>75</width>
-                            <height>25</height>
+                            <x>1</x>
+                            <y>15</y>
+                            <width>129</width>
+                            <height>45</height>
                         </rect>
                     </property>
                     <property stdset="1">
-                        <name>sizePolicy</name>
-                        <sizepolicy>
-                            <hsizetype>4</hsizetype>
-                            <vsizetype>4</vsizetype>
-                        </sizepolicy>
-                    </property>
-                    <property stdset="1">
                         <name>palette</name>
                         <palette>
                             <active>
                                 <color>
-                                    <red>0</red>
-                                    <green>0</green>
-                                    <blue>0</blue>
+                                    <red>255</red>
+                                    <green>255</green>
+                                    <blue>255</blue>
                                 </color>
                                 <color>
                                     <red>192</red>
                                     <blue>192</blue>
                                 </color>
                                 <color>
-                                    <red>236</red>
-                                    <green>236</green>
-                                    <blue>236</blue>
+                                    <red>255</red>
+                                    <green>255</green>
+                                    <blue>255</blue>
                                 </color>
                                 <color>
                                     <red>223</red>
                                     <blue>223</blue>
                                 </color>
                                 <color>
+                                    <red>96</red>
+                                    <green>96</green>
+                                    <blue>96</blue>
+                                </color>
+                                <color>
                                     <red>128</red>
                                     <green>128</green>
                                     <blue>128</blue>
                                 </color>
                                 <color>
-                                    <red>160</red>
-                                    <green>160</green>
-                                    <blue>164</blue>
-                                </color>
-                                <color>
                                     <red>0</red>
                                     <green>0</green>
                                     <blue>0</blue>
                                     <blue>255</blue>
                                 </color>
                                 <color>
-                                    <red>192</red>
-                                    <green>192</green>
-                                    <blue>192</blue>
+                                    <red>0</red>
+                                    <green>0</green>
+                                    <blue>0</blue>
                                 </color>
                                 <color>
                                     <red>0</red>
                                     <blue>192</blue>
                                 </color>
                                 <color>
-                                    <red>236</red>
-                                    <green>236</green>
-                                    <blue>236</blue>
-                                </color>
-                                <color>
-                                    <red>223</red>
-                                    <green>223</green>
-                                    <blue>223</blue>
+                                    <red>255</red>
+                                    <green>255</green>
+                                    <blue>255</blue>
                                 </color>
                                 <color>
-                                    <red>128</red>
-                                    <green>128</green>
-                                    <blue>128</blue>
+                                    <red>220</red>
+                                    <green>220</green>
+                                    <blue>220</blue>
                                 </color>
                                 <color>
-                                    <red>160</red>
-                                    <green>160</green>
-                                    <blue>164</blue>
+                                    <red>96</red>
+                                    <green>96</green>
+                                    <blue>96</blue>
                                 </color>
                                 <color>
                                     <red>128</red>
                                     <blue>128</blue>
                                 </color>
                                 <color>
+                                    <red>0</red>
+                                    <green>0</green>
+                                    <blue>0</blue>
+                                </color>
+                                <color>
                                     <red>255</red>
                                     <green>255</green>
                                     <blue>255</blue>
                                     <blue>128</blue>
                                 </color>
                                 <color>
-                                    <red>192</red>
-                                    <green>192</green>
-                                    <blue>192</blue>
+                                    <red>255</red>
+                                    <green>255</green>
+                                    <blue>255</blue>
                                 </color>
                                 <color>
-                                    <red>192</red>
-                                    <green>192</green>
-                                    <blue>192</blue>
+                                    <red>0</red>
+                                    <green>0</green>
+                                    <blue>0</blue>
                                 </color>
                                 <color>
                                     <red>0</red>
                                     <blue>0</blue>
                                 </color>
                                 <color>
-                                    <red>128</red>
-                                    <green>128</green>
-                                    <blue>128</blue>
+                                    <red>0</red>
+                                    <green>0</green>
+                                    <blue>0</blue>
                                 </color>
                                 <color>
-                                    <red>192</red>
-                                    <green>192</green>
-                                    <blue>192</blue>
+                                    <red>255</red>
+                                    <green>255</green>
+                                    <blue>255</blue>
                                 </color>
                             </disabled>
                             <inactive>
                                 <color>
-                                    <red>0</red>
-                                    <green>0</green>
-                                    <blue>0</blue>
+                                    <red>255</red>
+                                    <green>255</green>
+                                    <blue>255</blue>
                                 </color>
                                 <color>
                                     <red>192</red>
                                     <blue>192</blue>
                                 </color>
                                 <color>
-                                    <red>236</red>
-                                    <green>236</green>
-                                    <blue>236</blue>
+                                    <red>255</red>
+                                    <green>255</green>
+                                    <blue>255</blue>
                                 </color>
                                 <color>
-                                    <red>223</red>
-                                    <green>223</green>
-                                    <blue>223</blue>
+                                    <red>220</red>
+                                    <green>220</green>
+                                    <blue>220</blue>
+                                </color>
+                                <color>
+                                    <red>96</red>
+                                    <green>96</green>
+                                    <blue>96</blue>
                                 </color>
                                 <color>
                                     <red>128</red>
                                     <blue>128</blue>
                                 </color>
                                 <color>
-                                    <red>160</red>
-                                    <green>160</green>
-                                    <blue>164</blue>
-                                </color>
-                                <color>
                                     <red>0</red>
                                     <green>0</green>
                                     <blue>0</blue>
                                     <blue>255</blue>
                                 </color>
                                 <color>
-                                    <red>192</red>
-                                    <green>192</green>
-                                    <blue>192</blue>
+                                    <red>0</red>
+                                    <green>0</green>
+                                    <blue>0</blue>
                                 </color>
                                 <color>
                                     <red>0</red>
                         </palette>
                     </property>
                     <property stdset="1">
-                        <name>smallDecimalPoint</name>
-                        <bool>true</bool>
-                    </property>
-                    <property stdset="1">
                         <name>numDigits</name>
-                        <number>6</number>
+                        <number>8</number>
                     </property>
                     <property stdset="1">
                         <name>segmentStyle</name>
                         <enum>Flat</enum>
                     </property>
                 </widget>
+            </widget>
+            <widget>
+                <class>QGroupBox</class>
+                <property stdset="1">
+                    <name>name</name>
+                    <cstring>Distance</cstring>
+                </property>
+                <property stdset="1">
+                    <name>geometry</name>
+                    <rect>
+                        <x>0</x>
+                        <y>0</y>
+                        <width>240</width>
+                        <height>110</height>
+                    </rect>
+                </property>
+                <property stdset="1">
+                    <name>font</name>
+                    <font>
+                        <family>helvetica</family>
+                        <pointsize>9</pointsize>
+                    </font>
+                </property>
+                <property stdset="1">
+                    <name>title</name>
+                    <string></string>
+                </property>
                 <widget>
-                    <class>QLCDNumber</class>
+                    <class>QPushButton</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>DistRestPart</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>enabled</name>
-                        <bool>true</bool>
+                        <cstring>IncrDist</cstring>
                     </property>
                     <property stdset="1">
                         <name>geometry</name>
                         <rect>
-                            <x>80</x>
-                            <y>70</y>
-                            <width>60</width>
-                            <height>25</height>
+                            <x>210</x>
+                            <y>0</y>
+                            <width>30</width>
+                            <height>30</height>
                         </rect>
                     </property>
                     <property stdset="1">
-                        <name>sizePolicy</name>
-                        <sizepolicy>
-                            <hsizetype>4</hsizetype>
-                            <vsizetype>4</vsizetype>
-                        </sizepolicy>
-                    </property>
-                    <property stdset="1">
                         <name>palette</name>
                         <palette>
                             <active>
                                     <blue>0</blue>
                                 </color>
                                 <color>
-                                    <red>192</red>
-                                    <green>192</green>
-                                    <blue>192</blue>
+                                    <red>85</red>
+                                    <green>255</green>
+                                    <blue>255</blue>
                                 </color>
                                 <color>
-                                    <red>236</red>
-                                    <green>236</green>
-                                    <blue>236</blue>
+                                    <red>212</red>
+                                    <green>255</green>
+                                    <blue>255</blue>
                                 </color>
                                 <color>
-                                    <red>223</red>
-                                    <green>223</green>
-                                    <blue>223</blue>
+                                    <red>148</red>
+                                    <green>255</green>
+                                    <blue>255</blue>
                                 </color>
                                 <color>
-                                    <red>128</red>
-                                    <green>128</green>
-                                    <blue>128</blue>
+                                    <red>42</red>
+                                    <green>127</green>
+                                    <blue>127</blue>
                                 </color>
                                 <color>
-                                    <red>160</red>
-                                    <green>160</green>
-                                    <blue>164</blue>
+                                    <red>57</red>
+                                    <green>170</green>
+                                    <blue>170</blue>
                                 </color>
                                 <color>
                                     <red>0</red>
                                     <blue>128</blue>
                                 </color>
                                 <color>
-                                    <red>192</red>
-                                    <green>192</green>
-                                    <blue>192</blue>
+                                    <red>85</red>
+                                    <green>255</green>
+                                    <blue>255</blue>
                                 </color>
                                 <color>
-                                    <red>236</red>
-                                    <green>236</green>
-                                    <blue>236</blue>
+                                    <red>212</red>
+                                    <green>255</green>
+                                    <blue>255</blue>
                                 </color>
                                 <color>
-                                    <red>223</red>
-                                    <green>223</green>
-                                    <blue>223</blue>
+                                    <red>123</red>
+                                    <green>255</green>
+                                    <blue>255</blue>
                                 </color>
                                 <color>
-                                    <red>128</red>
-                                    <green>128</green>
-                                    <blue>128</blue>
+                                    <red>42</red>
+                                    <green>127</green>
+                                    <blue>127</blue>
                                 </color>
                                 <color>
-                                    <red>160</red>
-                                    <green>160</green>
-                                    <blue>164</blue>
+                                    <red>57</red>
+                                    <green>170</green>
+                                    <blue>170</blue>
                                 </color>
                                 <color>
-                                    <red>128</red>
-                                    <green>128</green>
-                                    <blue>128</blue>
+                                    <red>0</red>
+                                    <green>0</green>
+                                    <blue>0</blue>
                                 </color>
                                 <color>
                                     <red>255</red>
                                     <blue>128</blue>
                                 </color>
                                 <color>
-                                    <red>192</red>
-                                    <green>192</green>
-                                    <blue>192</blue>
+                                    <red>255</red>
+                                    <green>255</green>
+                                    <blue>255</blue>
                                 </color>
                                 <color>
                                     <red>192</red>
                                     <blue>0</blue>
                                 </color>
                                 <color>
-                                    <red>128</red>
-                                    <green>128</green>
-                                    <blue>128</blue>
+                                    <red>0</red>
+                                    <green>0</green>
+                                    <blue>0</blue>
                                 </color>
                                 <color>
-                                    <red>192</red>
-                                    <green>192</green>
-                                    <blue>192</blue>
+                                    <red>255</red>
+                                    <green>255</green>
+                                    <blue>255</blue>
                                 </color>
                             </disabled>
                             <inactive>
                                     <blue>0</blue>
                                 </color>
                                 <color>
-                                    <red>192</red>
-                                    <green>192</green>
-                                    <blue>192</blue>
+                                    <red>85</red>
+                                    <green>255</green>
+                                    <blue>255</blue>
                                 </color>
                                 <color>
-                                    <red>236</red>
-                                    <green>236</green>
-                                    <blue>236</blue>
+                                    <red>212</red>
+                                    <green>255</green>
+                                    <blue>255</blue>
                                 </color>
                                 <color>
-                                    <red>223</red>
-                                    <green>223</green>
-                                    <blue>223</blue>
+                                    <red>123</red>
+                                    <green>255</green>
+                                    <blue>255</blue>
                                 </color>
                                 <color>
-                                    <red>128</red>
-                                    <green>128</green>
-                                    <blue>128</blue>
+                                    <red>42</red>
+                                    <green>127</green>
+                                    <blue>127</blue>
                                 </color>
                                 <color>
-                                    <red>160</red>
-                                    <green>160</green>
-                                    <blue>164</blue>
+                                    <red>57</red>
+                                    <green>170</green>
+                                    <blue>170</blue>
                                 </color>
                                 <color>
                                     <red>0</red>
                         </palette>
                     </property>
                     <property stdset="1">
-                        <name>smallDecimalPoint</name>
-                        <bool>true</bool>
-                    </property>
-                    <property stdset="1">
-                        <name>numDigits</name>
-                        <number>5</number>
+                        <name>font</name>
+                        <font>
+                            <pointsize>12</pointsize>
+                            <bold>1</bold>
+                        </font>
                     </property>
                     <property stdset="1">
-                        <name>segmentStyle</name>
-                        <enum>Flat</enum>
+                        <name>text</name>
+                        <string>+</string>
                     </property>
                 </widget>
                 <widget>
-                    <class>QLCDNumber</class>
+                    <class>QPushButton</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>DistanceTot</cstring>
+                        <cstring>DecrDist</cstring>
                     </property>
                     <property stdset="1">
                         <name>geometry</name>
                         <rect>
-                            <x>5</x>
-                            <y>15</y>
-                            <width>135</width>
-                            <height>55</height>
+                            <x>210</x>
+                            <y>30</y>
+                            <width>30</width>
+                            <height>30</height>
                         </rect>
                     </property>
                     <property stdset="1">
                                     <blue>0</blue>
                                 </color>
                                 <color>
-                                    <red>192</red>
-                                    <green>192</green>
-                                    <blue>192</blue>
+                                    <red>85</red>
+                                    <green>255</green>
+                                    <blue>255</blue>
                                 </color>
                                 <color>
-                                    <red>255</red>
+                                    <red>212</red>
                                     <green>255</green>
                                     <blue>255</blue>
                                 </color>
                                 <color>
-                                    <red>223</red>
-                                    <green>223</green>
-                                    <blue>223</blue>
+                                    <red>148</red>
+                                    <green>255</green>
+                                    <blue>255</blue>
                                 </color>
                                 <color>
-                                    <red>96</red>
-                                    <green>96</green>
-                                    <blue>96</blue>
+                                    <red>42</red>
+                                    <green>127</green>
+                                    <blue>127</blue>
                                 </color>
                                 <color>
-                                    <red>128</red>
-                                    <green>128</green>
-                                    <blue>128</blue>
+                                    <red>57</red>
+                                    <green>170</green>
+                                    <blue>170</blue>
                                 </color>
                                 <color>
                                     <red>0</red>
                                     <blue>255</blue>
                                 </color>
                                 <color>
-                                    <red>212</red>
-                                    <green>212</green>
-                                    <blue>212</blue>
+                                    <red>192</red>
+                                    <green>192</green>
+                                    <blue>192</blue>
                                 </color>
                                 <color>
                                     <red>0</red>
                                     <blue>128</blue>
                                 </color>
                                 <color>
-                                    <red>192</red>
-                                    <green>192</green>
-                                    <blue>192</blue>
-                                </color>
-                                <color>
-                                    <red>255</red>
+                                    <red>85</red>
                                     <green>255</green>
                                     <blue>255</blue>
                                 </color>
                                 <color>
-                                    <red>220</red>
-                                    <green>220</green>
-                                    <blue>220</blue>
+                                    <red>212</red>
+                                    <green>255</green>
+                                    <blue>255</blue>
                                 </color>
                                 <color>
-                                    <red>96</red>
-                                    <green>96</green>
-                                    <blue>96</blue>
+                                    <red>123</red>
+                                    <green>255</green>
+                                    <blue>255</blue>
                                 </color>
                                 <color>
-                                    <red>128</red>
-                                    <green>128</green>
-                                    <blue>128</blue>
+                                    <red>42</red>
+                                    <green>127</green>
+                                    <blue>127</blue>
+                                </color>
+                                <color>
+                                    <red>57</red>
+                                    <green>170</green>
+                                    <blue>170</blue>
                                 </color>
                                 <color>
                                     <red>0</red>
                                     <blue>255</blue>
                                 </color>
                                 <color>
-                                    <red>212</red>
-                                    <green>212</green>
-                                    <blue>212</blue>
+                                    <red>192</red>
+                                    <green>192</green>
+                                    <blue>192</blue>
                                 </color>
                                 <color>
                                     <red>0</red>
                                     <blue>0</blue>
                                 </color>
                                 <color>
-                                    <red>192</red>
-                                    <green>192</green>
-                                    <blue>192</blue>
+                                    <red>85</red>
+                                    <green>255</green>
+                                    <blue>255</blue>
                                 </color>
                                 <color>
-                                    <red>255</red>
+                                    <red>212</red>
                                     <green>255</green>
                                     <blue>255</blue>
                                 </color>
                                 <color>
-                                    <red>220</red>
-                                    <green>220</green>
-                                    <blue>220</blue>
+                                    <red>123</red>
+                                    <green>255</green>
+                                    <blue>255</blue>
                                 </color>
                                 <color>
-                                    <red>96</red>
-                                    <green>96</green>
-                                    <blue>96</blue>
+                                    <red>42</red>
+                                    <green>127</green>
+                                    <blue>127</blue>
                                 </color>
                                 <color>
-                                    <red>128</red>
-                                    <green>128</green>
-                                    <blue>128</blue>
+                                    <red>57</red>
+                                    <green>170</green>
+                                    <blue>170</blue>
                                 </color>
                                 <color>
                                     <red>0</red>
                                     <blue>255</blue>
                                 </color>
                                 <color>
-                                    <red>212</red>
-                                    <green>212</green>
-                                    <blue>212</blue>
+                                    <red>192</red>
+                                    <green>192</green>
+                                    <blue>192</blue>
                                 </color>
                                 <color>
                                     <red>0</red>
                         <name>font</name>
                         <font>
                             <family>Helvetica</family>
-                            <pointsize>11</pointsize>
+                            <pointsize>12</pointsize>
                             <bold>1</bold>
                         </font>
                     </property>
                     <property stdset="1">
-                        <name>smallDecimalPoint</name>
-                        <bool>true</bool>
-                    </property>
-                    <property stdset="1">
-                        <name>numDigits</name>
-                        <number>5</number>
-                    </property>
-                    <property stdset="1">
-                        <name>segmentStyle</name>
-                        <enum>Flat</enum>
+                        <name>text</name>
+                        <string>-</string>
                     </property>
                 </widget>
                 <widget>
-                    <class>QPushButton</class>
+                    <class>QLCDNumber</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>DecrDist</cstring>
+                        <cstring>DistanceTot</cstring>
                     </property>
                     <property stdset="1">
                         <name>geometry</name>
                         <rect>
-                            <x>190</x>
-                            <y>50</y>
-                            <width>45</width>
-                            <height>45</height>
+                            <x>1</x>
+                            <y>0</y>
+                            <width>205</width>
+                            <height>60</height>
                         </rect>
                     </property>
                     <property stdset="1">
                         <palette>
                             <active>
                                 <color>
-                                    <red>0</red>
-                                    <green>0</green>
-                                    <blue>0</blue>
-                                </color>
-                                <color>
-                                    <red>85</red>
+                                    <red>255</red>
                                     <green>255</green>
                                     <blue>255</blue>
                                 </color>
                                 <color>
-                                    <red>212</red>
-                                    <green>255</green>
-                                    <blue>255</blue>
+                                    <red>192</red>
+                                    <green>192</green>
+                                    <blue>192</blue>
                                 </color>
                                 <color>
-                                    <red>148</red>
+                                    <red>255</red>
                                     <green>255</green>
                                     <blue>255</blue>
                                 </color>
                                 <color>
-                                    <red>42</red>
-                                    <green>127</green>
-                                    <blue>127</blue>
+                                    <red>223</red>
+                                    <green>223</green>
+                                    <blue>223</blue>
                                 </color>
                                 <color>
-                                    <red>57</red>
-                                    <green>170</green>
-                                    <blue>170</blue>
+                                    <red>96</red>
+                                    <green>96</green>
+                                    <blue>96</blue>
+                                </color>
+                                <color>
+                                    <red>128</red>
+                                    <green>128</green>
+                                    <blue>128</blue>
                                 </color>
                                 <color>
                                     <red>0</red>
                                     <blue>255</blue>
                                 </color>
                                 <color>
-                                    <red>192</red>
-                                    <green>192</green>
-                                    <blue>192</blue>
+                                    <red>0</red>
+                                    <green>0</green>
+                                    <blue>0</blue>
                                 </color>
                                 <color>
                                     <red>0</red>
                                     <blue>128</blue>
                                 </color>
                                 <color>
-                                    <red>85</red>
-                                    <green>255</green>
-                                    <blue>255</blue>
+                                    <red>192</red>
+                                    <green>192</green>
+                                    <blue>192</blue>
                                 </color>
                                 <color>
-                                    <red>212</red>
+                                    <red>255</red>
                                     <green>255</green>
                                     <blue>255</blue>
                                 </color>
                                 <color>
-                                    <red>123</red>
-                                    <green>255</green>
-                                    <blue>255</blue>
+                                    <red>220</red>
+                                    <green>220</green>
+                                    <blue>220</blue>
                                 </color>
                                 <color>
-                                    <red>42</red>
-                                    <green>127</green>
-                                    <blue>127</blue>
+                                    <red>96</red>
+                                    <green>96</green>
+                                    <blue>96</blue>
                                 </color>
                                 <color>
-                                    <red>57</red>
-                                    <green>170</green>
-                                    <blue>170</blue>
+                                    <red>128</red>
+                                    <green>128</green>
+                                    <blue>128</blue>
                                 </color>
                                 <color>
                                     <red>0</red>
                                     <blue>255</blue>
                                 </color>
                                 <color>
-                                    <red>192</red>
-                                    <green>192</green>
-                                    <blue>192</blue>
+                                    <red>0</red>
+                                    <green>0</green>
+                                    <blue>0</blue>
                                 </color>
                                 <color>
                                     <red>0</red>
                             </disabled>
                             <inactive>
                                 <color>
-                                    <red>0</red>
-                                    <green>0</green>
-                                    <blue>0</blue>
-                                </color>
-                                <color>
-                                    <red>85</red>
+                                    <red>255</red>
                                     <green>255</green>
                                     <blue>255</blue>
                                 </color>
                                 <color>
-                                    <red>212</red>
-                                    <green>255</green>
-                                    <blue>255</blue>
+                                    <red>192</red>
+                                    <green>192</green>
+                                    <blue>192</blue>
                                 </color>
                                 <color>
-                                    <red>123</red>
+                                    <red>255</red>
                                     <green>255</green>
                                     <blue>255</blue>
                                 </color>
                                 <color>
-                                    <red>42</red>
-                                    <green>127</green>
-                                    <blue>127</blue>
+                                    <red>220</red>
+                                    <green>220</green>
+                                    <blue>220</blue>
                                 </color>
                                 <color>
-                                    <red>57</red>
-                                    <green>170</green>
-                                    <blue>170</blue>
+                                    <red>96</red>
+                                    <green>96</green>
+                                    <blue>96</blue>
+                                </color>
+                                <color>
+                                    <red>128</red>
+                                    <green>128</green>
+                                    <blue>128</blue>
                                 </color>
                                 <color>
                                     <red>0</red>
                                     <blue>255</blue>
                                 </color>
                                 <color>
-                                    <red>192</red>
-                                    <green>192</green>
-                                    <blue>192</blue>
+                                    <red>0</red>
+                                    <green>0</green>
+                                    <blue>0</blue>
                                 </color>
                                 <color>
                                     <red>0</red>
                         </font>
                     </property>
                     <property stdset="1">
-                        <name>text</name>
-                        <string>-</string>
+                        <name>smallDecimalPoint</name>
+                        <bool>true</bool>
+                    </property>
+                    <property stdset="1">
+                        <name>numDigits</name>
+                        <number>6</number>
+                    </property>
+                    <property stdset="1">
+                        <name>segmentStyle</name>
+                        <enum>Flat</enum>
                     </property>
                 </widget>
                 <widget>
                         <name>geometry</name>
                         <rect>
                             <x>145</x>
-                            <y>15</y>
-                            <width>85</width>
-                            <height>35</height>
+                            <y>60</y>
+                            <width>91</width>
+                            <height>40</height>
                         </rect>
                     </property>
                     <property stdset="1">
                         <palette>
                             <active>
                                 <color>
-                                    <red>0</red>
-                                    <green>0</green>
-                                    <blue>0</blue>
+                                    <red>255</red>
+                                    <green>255</green>
+                                    <blue>255</blue>
                                 </color>
                                 <color>
                                     <red>192</red>
                                     <blue>255</blue>
                                 </color>
                                 <color>
-                                    <red>220</red>
-                                    <green>220</green>
-                                    <blue>220</blue>
+                                    <red>0</red>
+                                    <green>0</green>
+                                    <blue>0</blue>
                                 </color>
                                 <color>
                                     <red>0</red>
                                     <blue>255</blue>
                                 </color>
                                 <color>
-                                    <red>220</red>
-                                    <green>220</green>
-                                    <blue>220</blue>
+                                    <red>0</red>
+                                    <green>0</green>
+                                    <blue>0</blue>
                                 </color>
                                 <color>
                                     <red>0</red>
                             </disabled>
                             <inactive>
                                 <color>
-                                    <red>0</red>
-                                    <green>0</green>
-                                    <blue>0</blue>
+                                    <red>255</red>
+                                    <green>255</green>
+                                    <blue>255</blue>
                                 </color>
                                 <color>
                                     <red>192</red>
                                     <blue>255</blue>
                                 </color>
                                 <color>
-                                    <red>220</red>
-                                    <green>220</green>
-                                    <blue>220</blue>
+                                    <red>0</red>
+                                    <green>0</green>
+                                    <blue>0</blue>
                                 </color>
                                 <color>
                                     <red>0</red>
                         <enum>Flat</enum>
                     </property>
                 </widget>
-            </widget>
-            <widget>
-                <class>QGroupBox</class>
-                <property stdset="1">
-                    <name>name</name>
-                    <cstring>Vitesse</cstring>
-                </property>
-                <property stdset="1">
-                    <name>geometry</name>
-                    <rect>
-                        <x>0</x>
-                        <y>100</y>
-                        <width>240</width>
-                        <height>85</height>
-                    </rect>
-                </property>
-                <property stdset="1">
-                    <name>font</name>
-                    <font>
-                        <family>helvetica</family>
-                        <pointsize>9</pointsize>
-                    </font>
-                </property>
-                <property stdset="1">
-                    <name>title</name>
-                    <string>Vitesse (km/h)</string>
-                </property>
                 <widget>
                     <class>QLCDNumber</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>VitesseInst</cstring>
+                        <cstring>DistRestPart</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>enabled</name>
+                        <bool>true</bool>
                     </property>
                     <property stdset="1">
                         <name>geometry</name>
                         <rect>
-                            <x>5</x>
-                            <y>20</y>
-                            <width>135</width>
-                            <height>55</height>
+                            <x>75</x>
+                            <y>68</y>
+                            <width>65</width>
+                            <height>30</height>
                         </rect>
                     </property>
                     <property stdset="1">
+                        <name>sizePolicy</name>
+                        <sizepolicy>
+                            <hsizetype>4</hsizetype>
+                            <vsizetype>4</vsizetype>
+                        </sizepolicy>
+                    </property>
+                    <property stdset="1">
                         <name>palette</name>
                         <palette>
                             <active>
                                     <blue>192</blue>
                                 </color>
                                 <color>
-                                    <red>255</red>
-                                    <green>255</green>
-                                    <blue>255</blue>
+                                    <red>236</red>
+                                    <green>236</green>
+                                    <blue>236</blue>
                                 </color>
                                 <color>
                                     <red>223</red>
                                     <blue>223</blue>
                                 </color>
                                 <color>
-                                    <red>96</red>
-                                    <green>96</green>
-                                    <blue>96</blue>
-                                </color>
-                                <color>
                                     <red>128</red>
                                     <green>128</green>
                                     <blue>128</blue>
                                 </color>
                                 <color>
+                                    <red>160</red>
+                                    <green>160</green>
+                                    <blue>164</blue>
+                                </color>
+                                <color>
                                     <red>0</red>
                                     <green>0</green>
                                     <blue>0</blue>
                                     <blue>255</blue>
                                 </color>
                                 <color>
-                                    <red>218</red>
-                                    <green>218</green>
-                                    <blue>218</blue>
+                                    <red>192</red>
+                                    <green>192</green>
+                                    <blue>192</blue>
                                 </color>
                                 <color>
                                     <red>0</red>
                                     <blue>192</blue>
                                 </color>
                                 <color>
+                                    <red>236</red>
+                                    <green>236</green>
+                                    <blue>236</blue>
+                                </color>
+                                <color>
+                                    <red>223</red>
+                                    <green>223</green>
+                                    <blue>223</blue>
+                                </color>
+                                <color>
+                                    <red>128</red>
+                                    <green>128</green>
+                                    <blue>128</blue>
+                                </color>
+                                <color>
+                                    <red>160</red>
+                                    <green>160</green>
+                                    <blue>164</blue>
+                                </color>
+                                <color>
+                                    <red>128</red>
+                                    <green>128</green>
+                                    <blue>128</blue>
+                                </color>
+                                <color>
                                     <red>255</red>
                                     <green>255</green>
                                     <blue>255</blue>
                                 </color>
                                 <color>
-                                    <red>220</red>
-                                    <green>220</green>
-                                    <blue>220</blue>
+                                    <red>128</red>
+                                    <green>128</green>
+                                    <blue>128</blue>
                                 </color>
                                 <color>
-                                    <red>96</red>
-                                    <green>96</green>
-                                    <blue>96</blue>
+                                    <red>192</red>
+                                    <green>192</green>
+                                    <blue>192</blue>
+                                </color>
+                                <color>
+                                    <red>192</red>
+                                    <green>192</green>
+                                    <blue>192</blue>
+                                </color>
+                                <color>
+                                    <red>0</red>
+                                    <green>0</green>
+                                    <blue>0</blue>
                                 </color>
                                 <color>
                                     <red>128</red>
                                     <blue>128</blue>
                                 </color>
                                 <color>
+                                    <red>192</red>
+                                    <green>192</green>
+                                    <blue>192</blue>
+                                </color>
+                            </disabled>
+                            <inactive>
+                                <color>
                                     <red>0</red>
                                     <green>0</green>
                                     <blue>0</blue>
                                 </color>
                                 <color>
-                                    <red>255</red>
-                                    <green>255</green>
-                                    <blue>255</blue>
+                                    <red>192</red>