Commits

Pierre Surply  committed c89f9df

+ Chronometre

  • Participants
  • Parent commits 51ab794

Comments (0)

Files changed (6)

File src/calibration.cpp

   calibration.cpp
 
   Pierre Surply
-  Time-stamp: <2012-04-14 17:42:35 surply_p>
+  Time-stamp: <2012-04-16 21:01:37 surply_p>
  */
 
 #include "sensor.h"
       m_sensor->set_tpm(1);
       m_sensor->reset();
     }
+  else
+    {
+      m_sensor->set_tpm((float)m_sensor->get_distance_tot()/1000.0);
+      m_sensor->reset();
+    }
 }
 
 bool Calibr::is_running() const

File src/roadmaster.cpp

   RoadMaster.cpp
 
   Pierre Surply
-  Time-stamp: <2012-04-15 14:13:38 surply_p>
+  Time-stamp: <2012-04-16 21:51:58 surply_p>
  */
 
 #include "roadmaster.h"
 {
   m_sensor = new Sensor(this);
   m_calibr = new Calibr(m_sensor);
+  m_timer_vitesse = new QTimer(this);
+  m_timer = new QTimer(this);
+  //m_chrono = new QTime(0,0);
+
+  m_timer->start(1000, TRUE);
+  m_timer_vitesse->start(5000, TRUE);
+
+  this->update();
+  this->update_timer();
+  this->update_vitesse();
 
   connect(SetEta, SIGNAL(clicked()), this, SLOT(run_calibr()));
+  connect(IncrDist, SIGNAL(clicked()), this, SLOT(incr_distance()));
+  connect(DecrDist, SIGNAL(clicked()), this, SLOT(decr_distance()));
+  connect(ResetMoyen, SIGNAL(clicked()), this, SLOT(reset_vitesse()));
+
+  // timer
+  connect(m_timer, SIGNAL(timeout()), this, SLOT(update_timer()));
+  connect(m_timer_vitesse, SIGNAL(timeout()), this, SLOT(update_vitesse()));
 }
 
 RoadMaster::~RoadMaster()
   int tmp;
   char buf[256];
 
-
   if (m_calibr->is_running())
     {
       sprintf(buf, "%d", (m_sensor->get_distance_tot()/10));
     {
       // Distance tot
       tmp = m_sensor->get_distance_tot();
-      sprintf(buf, "%d.%d", tmp/1000, tmp % 1000);
+      sprintf(buf, "%d.%02d", tmp/1000, (tmp % 1000) / 10);
       DistanceTot->display(buf);
 
       // Distance Part
       tmp = m_sensor->get_distance_part();
-      sprintf(buf, "%d.%d", tmp/1000, tmp % 1000);
+      sprintf(buf, "%d.%02d", tmp/1000, (tmp % 1000) / 10);
       DistancePart->display(buf);
-
-      // Vitesse inst
-      tmp = m_sensor->get_vitesse_inst();
-      sprintf(buf, "%d.%d", tmp / 1000, (tmp % 1000) / 10);
-      VitesseInst->display(buf);
-
-      // Vitesse moy
-      tmp = m_sensor->get_vitesse_moy();
-      sprintf(buf, "%d.%d", tmp / 1000, (tmp % 1000) / 10);
-      VitesseMoy->display(buf);
     }
 }
 
   if (!m_calibr->is_running())
     {
       m_calibr->set(true);
-      SetEta->setText("Arreter l'etalonage");
+      SetEta->setText("Fin de zone");
     }
   else
     {
       m_calibr->set(false);
-      SetEta->setText("Recommencer l'etalonage");
+      SetEta->setText("Depart de zone");
     }
 }
+
+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);
+
+  // 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);
+}
+
+void RoadMaster::update_timer()
+{
+  Chrono->display(m_chrono.toString());
+  m_chrono = m_chrono.addSecs(1);
+  m_timer->start(1000, TRUE);
+}
+
+void RoadMaster::incr_distance()
+{
+  m_sensor->add_distance(10);
+}
+
+void RoadMaster::decr_distance()
+{
+  m_sensor->add_distance(-10);
+}
+
+void RoadMaster::reset_vitesse()
+{
+  m_sensor->reset_vitesse_moy();
+  this->update_vitesse();
+}

File src/roadmaster.h

   RoadMaster.h
 
   Pierre Surply
-  Time-stamp: <2012-04-12 22:21:47 surply_p>
+  Time-stamp: <2012-04-16 21:51:52 surply_p>
 */
 #ifndef ROADMASTER_H
 #define ROADMASTER_H
 
+#include <qtimer.h>
+#include <qdatetime.h>
+
 #include "roadmaster_base.h"
 #include "calibration.h"
 #include "sensor.h"
   
  public slots:
   void run_calibr();
+  void update_vitesse();
+  void update_timer();
+  void incr_distance();
+  void decr_distance();
+  void reset_vitesse();
 
  private:
+  QTimer* m_timer;
+  QTimer* m_timer_vitesse;
+  QTime m_chrono;
   Sensor* m_sensor;
   Calibr* m_calibr;
 };

File src/roadmaster_base.ui

                 <x>0</x>
                 <y>5</y>
                 <width>240</width>
-                <height>290</height>
+                <height>300</height>
             </rect>
         </property>
         <widget>
                     <string>Distance (km)</string>
                 </property>
                 <widget>
-                    <class>QLCDNumber</class>
+                    <class>QPushButton</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>dist_totale</cstring>
+                        <cstring>IncrDist</cstring>
                     </property>
                     <property stdset="1">
                         <name>geometry</name>
                         <rect>
-                            <x>5</x>
-                            <y>15</y>
-                            <width>135</width>
-                            <height>55</height>
+                            <x>145</x>
+                            <y>50</y>
+                            <width>45</width>
+                            <height>45</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>
+                                    <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>
                                     <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>
                     <property stdset="1">
                         <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>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>plus10</cstring>
+                        <cstring>DecrDist</cstring>
                     </property>
                     <property stdset="1">
                         <name>geometry</name>
                         <rect>
-                            <x>145</x>
+                            <x>190</x>
                             <y>50</y>
                             <width>45</width>
                             <height>45</height>
                     <property stdset="1">
                         <name>font</name>
                         <font>
+                            <family>Helvetica</family>
                             <pointsize>12</pointsize>
                             <bold>1</bold>
                         </font>
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <string>+</string>
+                        <string>-</string>
                     </property>
                 </widget>
                 <widget>
-                    <class>QPushButton</class>
+                    <class>QLCDNumber</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>moins10</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>5</x>
+                            <y>15</y>
+                            <width>135</width>
+                            <height>55</height>
                         </rect>
                     </property>
                     <property stdset="1">
                                     <blue>0</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>148</red>
-                                    <green>255</green>
-                                    <blue>255</blue>
+                                    <red>223</red>
+                                    <green>223</green>
+                                    <blue>223</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>212</red>
+                                    <green>212</green>
+                                    <blue>212</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>212</red>
+                                    <green>212</green>
+                                    <blue>212</blue>
                                 </color>
                                 <color>
                                     <red>0</red>
                                     <blue>0</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>212</red>
+                                    <green>212</green>
+                                    <blue>212</blue>
                                 </color>
                                 <color>
                                     <red>0</red>
                         <name>font</name>
                         <font>
                             <family>Helvetica</family>
-                            <pointsize>12</pointsize>
+                            <pointsize>11</pointsize>
                             <bold>1</bold>
                         </font>
                     </property>
                     <property stdset="1">
-                        <name>text</name>
-                        <string>-</string>
+                        <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>
                     </property>
                 </widget>
                 <widget>
                         <rect>
                             <x>145</x>
                             <y>15</y>
-                            <width>90</width>
+                            <width>85</width>
                             <height>35</height>
                         </rect>
                     </property>
                     <class>QLCDNumber</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>resteaparcourir</cstring>
+                        <cstring>resteaparcourirspeciale</cstring>
                     </property>
                     <property stdset="1">
                         <name>enabled</name>
                     <property stdset="1">
                         <name>geometry</name>
                         <rect>
-                            <x>5</x>
+                            <x>80</x>
                             <y>70</y>
-                            <width>75</width>
+                            <width>60</width>
                             <height>25</height>
                         </rect>
                     </property>
                     </property>
                     <property stdset="1">
                         <name>numDigits</name>
-                        <number>6</number>
+                        <number>5</number>
                     </property>
                     <property stdset="1">
                         <name>segmentStyle</name>
                     <class>QLCDNumber</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>resteaparcourirspeciale</cstring>
+                        <cstring>resteaparcourir</cstring>
                     </property>
                     <property stdset="1">
                         <name>enabled</name>
                     <property stdset="1">
                         <name>geometry</name>
                         <rect>
-                            <x>80</x>
+                            <x>5</x>
                             <y>70</y>
-                            <width>60</width>
+                            <width>75</width>
                             <height>25</height>
                         </rect>
                     </property>
                     </property>
                     <property stdset="1">
                         <name>numDigits</name>
-                        <number>5</number>
+                        <number>6</number>
                     </property>
                     <property stdset="1">
                         <name>segmentStyle</name>
                     <string>Vitesse (km/h)</string>
                 </property>
                 <widget>
-                    <class>QPushButton</class>
+                    <class>QLCDNumber</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>Resetmoyen</cstring>
+                        <cstring>VitesseInst</cstring>
                     </property>
                     <property stdset="1">
                         <name>geometry</name>
                         <rect>
-                            <x>200</x>
-                            <y>50</y>
-                            <width>35</width>
-                            <height>35</height>
+                            <x>5</x>
+                            <y>20</y>
+                            <width>135</width>
+                            <height>55</height>
                         </rect>
                     </property>
                     <property stdset="1">
                                     <blue>0</blue>
                                 </color>
                                 <color>
-                                    <red>255</red>
-                                    <green>0</green>
-                                    <blue>0</blue>
+                                    <red>192</red>
+                                    <green>192</green>
+                                    <blue>192</blue>
                                 </color>
                                 <color>
                                     <red>255</red>
-                                    <green>127</green>
-                                    <blue>127</blue>
+                                    <green>255</green>
+                                    <blue>255</blue>
                                 </color>
                                 <color>
-                                    <red>255</red>
-                                    <green>63</green>
-                                    <blue>63</blue>
+                                    <red>223</red>
+                                    <green>223</green>
+                                    <blue>223</blue>
                                 </color>
                                 <color>
-                                    <red>127</red>
-                                    <green>0</green>
-                                    <blue>0</blue>
+                                    <red>96</red>
+                                    <green>96</green>
+                                    <blue>96</blue>
                                 </color>
                                 <color>
-                                    <red>170</red>
-                                    <green>0</green>
-                                    <blue>0</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>218</red>
+                                    <green>218</green>
+                                    <blue>218</blue>
                                 </color>
                                 <color>
                                     <red>0</red>
                                     <blue>128</blue>
                                 </color>
                                 <color>
-                                    <red>255</red>
-                                    <green>0</green>
-                                    <blue>0</blue>
+                                    <red>192</red>
+                                    <green>192</green>
+                                    <blue>192</blue>
                                 </color>
                                 <color>
                                     <red>255</red>
-                                    <green>127</green>
-                                    <blue>127</blue>
+                                    <green>255</green>
+                                    <blue>255</blue>
                                 </color>
                                 <color>
-                                    <red>255</red>
-                                    <green>38</green>
-                                    <blue>38</blue>
+                                    <red>220</red>
+                                    <green>220</green>
+                                    <blue>220</blue>
                                 </color>
                                 <color>
-                                    <red>127</red>
-                                    <green>0</green>
-                                    <blue>0</blue>
+                                    <red>96</red>
+                                    <green>96</green>
+                                    <blue>96</blue>
                                 </color>
                                 <color>
-                                    <red>170</red>
-                                    <green>0</green>
-                                    <blue>0</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>218</red>
+                                    <green>218</green>
+                                    <blue>218</blue>
                                 </color>
                                 <color>
                                     <red>0</red>
                                     <blue>0</blue>
                                 </color>
                                 <color>
-                                    <red>255</red>
-                                    <green>0</green>
-                                    <blue>0</blue>
+                                    <red>192</red>
+                                    <green>192</green>
+                                    <blue>192</blue>
                                 </color>
                                 <color>
                                     <red>255</red>
-                                    <green>127</green>
-                                    <blue>127</blue>
+                                    <green>255</green>
+                                    <blue>255</blue>
                                 </color>
                                 <color>
-                                    <red>255</red>
-                                    <green>38</green>
-                                    <blue>38</blue>
+                                    <red>220</red>
+                                    <green>220</green>
+                                    <blue>220</blue>
                                 </color>
                                 <color>
-                                    <red>127</red>
-                                    <green>0</green>
-                                    <blue>0</blue>
+                                    <red>96</red>
+                                    <green>96</green>
+                                    <blue>96</blue>
                                 </color>
                                 <color>
-                                    <red>170</red>
-                                    <green>0</green>
-                                    <blue>0</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>218</red>
+                                    <green>218</green>
+                                    <blue>218</blue>
                                 </color>
                                 <color>
                                     <red>0</red>
                         </palette>
                     </property>
                     <property stdset="1">
-                        <name>text</name>
-                        <string>RST</string>
+                        <name>font</name>
+                        <font>
+                            <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>
                     </property>
                 </widget>
                 <widget>
-                    <class>QLCDNumber</class>
+                    <class>QPushButton</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>Vitesseinst</cstring>
+                        <cstring>ResetMoyen</cstring>
                     </property>
                     <property stdset="1">
                         <name>geometry</name>
                         <rect>
-                            <x>5</x>
-                            <y>20</y>
-                            <width>135</width>
-                            <height>55</height>
+                            <x>202</x>
+                            <y>52</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>255</red>
+                                    <green>0</green>
+                                    <blue>0</blue>
                                 </color>
                                 <color>
                                     <red>255</red>
-                                    <green>255</green>
-                                    <blue>255</blue>
+                                    <green>127</green>
+                                    <blue>127</blue>
                                 </color>
                                 <color>
-                                    <red>223</red>
-                                    <green>223</green>
-                                    <blue>223</blue>
+                                    <red>255</red>
+                                    <green>63</green>
+                                    <blue>63</blue>
                                 </color>
                                 <color>
-                                    <red>96</red>
-                                    <green>96</green>
-                                    <blue>96</blue>
+                                    <red>127</red>
+                                    <green>0</green>
+                                    <blue>0</blue>
                                 </color>
                                 <color>
-                                    <red>128</red>
-                                    <green>128</green>
-                                    <blue>128</blue>
+                                    <red>170</red>
+                                    <green>0</green>
+                                    <blue>0</blue>
                                 </color>
                                 <color>
                                     <red>0</red>
                                     <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>128</blue>
                                 </color>
                                 <color>
-                                    <red>192</red>
-                                    <green>192</green>
-                                    <blue>192</blue>
+                                    <red>255</red>
+                                    <green>0</green>
+                                    <blue>0</blue>
                                 </color>
                                 <color>
                                     <red>255</red>
-                                    <green>255</green>
-                                    <blue>255</blue>
+                                    <green>127</green>
+                                    <blue>127</blue>
                                 </color>
                                 <color>
-                                    <red>220</red>
-                                    <green>220</green>
-                                    <blue>220</blue>
+                                    <red>255</red>
+                                    <green>38</green>
+                                    <blue>38</blue>
                                 </color>
                                 <color>
-                                    <red>96</red>
-                                    <green>96</green>
-                                    <blue>96</blue>
+                                    <red>127</red>
+                                    <green>0</green>
+                                    <blue>0</blue>
                                 </color>
                                 <color>
-                                    <red>128</red>
-                                    <green>128</green>
-                                    <blue>128</blue>
+                                    <red>170</red>
+                                    <green>0</green>
+                                    <blue>0</blue>
                                 </color>
                                 <color>
                                     <red>0</red>
                                     <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>0</blue>
                                 </color>
                                 <color>
-                                    <red>192</red>
-                                    <green>192</green>
-                                    <blue>192</blue>
+                                    <red>255</red>
+                                    <green>0</green>
+                                    <blue>0</blue>
                                 </color>
                                 <color>
                                     <red>255</red>
-                                    <green>255</green>
-                                    <blue>255</blue>
+                                    <green>127</green>
+                                    <blue>127</blue>
                                 </color>
                                 <color>
-                                    <red>220</red>
-                                    <green>220</green>
-                                    <blue>220</blue>
+                                    <red>255</red>
+                                    <green>38</green>
+                                    <blue>38</blue>
                                 </color>
                                 <color>
-                                    <red>96</red>
-                                    <green>96</green>
-                                    <blue>96</blue>
+                                    <red>127</red>
+                                    <green>0</green>
+                                    <blue>0</blue>
                                 </color>
                                 <color>
-                                    <red>128</red>
-                                    <green>128</green>
-                                    <blue>128</blue>
+                                    <red>170</red>
+                                    <green>0</green>
+                                    <blue>0</blue>
                                 </color>
                                 <color>
                                     <red>0</red>
                                     <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>
                         </palette>
                     </property>
                     <property stdset="1">
-                        <name>font</name>
-                        <font>
-                            <bold>1</bold>
-                        </font>
+                        <name>text</name>
+                        <string>rst</string>
                     </property>
+                </widget>
+                <widget>
+                    <class>QLCDNumber</class>
                     <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>
-                    </property>
-                </widget>
-                <widget>
-                    <class>QLCDNumber</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>Vitessemoy</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>geometry</name>
-                        <rect>
-                            <x>145</x>
-                            <y>20</y>
-                            <width>85</width>
-                            <height>30</height>
-                        </rect>
-                    </property>
-                    <property stdset="1">
-                        <name>numDigits</name>
-                        <number>5</number>
-                    </property>
-                    <property stdset="1">
-                        <name>segmentStyle</name>
-                        <enum>Flat</enum>
-                    </property>
-                </widget>
-                <widget>
-                    <class>QLCDNumber</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>moyobjectifspeciale</cstring>
+                        <name>name</name>
+                        <cstring>moyobjectifspeciale</cstring>
                     </property>
                     <property stdset="1">
                         <name>enabled</name>
                         <enum>Flat</enum>
                     </property>
                 </widget>
+                <widget>
+                    <class>QLCDNumber</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>VitesseMoy</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>geometry</name>
+                        <rect>
+                            <x>145</x>
+                            <y>20</y>
+                            <width>85</width>
+                            <height>30</height>
+                        </rect>
+                    </property>
+                    <property stdset="1">
+                        <name>numDigits</name>
+                        <number>5</number>
+                    </property>
+                    <property stdset="1">
+                        <name>segmentStyle</name>
+                        <enum>Flat</enum>
+                    </property>
+                </widget>
             </widget>
             <widget>
                 <class>QGroupBox</class>
                     <name>geometry</name>
                     <rect>
                         <x>0</x>
-                        <y>185</y>
+                        <y>190</y>
                         <width>241</width>
-                        <height>65</height>
+                        <height>70</height>
                     </rect>
                 </property>
                 <property stdset="1">
                     <string>Temps</string>
                 </property>
                 <widget>
-                    <class>QPushButton</class>
+                    <class>QLCDNumber</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>resetchrono</cstring>
+                        <cstring>Chrono</cstring>
                     </property>
                     <property stdset="1">
                         <name>geometry</name>
                         <rect>
-                            <x>130</x>
-                            <y>35</y>
-                            <width>55</width>
-                            <height>30</height>
+                            <x>5</x>
+                            <y>15</y>
+                            <width>125</width>
+                            <height>45</height>
                         </rect>
                     </property>
                     <property stdset="1">
                                     <blue>0</blue>
                                 </color>
                                 <color>
-                                    <red>255</red>
-                                    <green>0</green>
-                                    <blue>0</blue>
+                                    <red>192</red>
+                                    <green>192</green>
+                                    <blue>192</blue>
                                 </color>
                                 <color>
                                     <red>255</red>
-                                    <green>127</green>
-                                    <blue>127</blue>
+                                    <green>255</green>
+                                    <blue>255</blue>
                                 </color>
                                 <color>
-                                    <red>255</red>
-                                    <green>63</green>
-                                    <blue>63</blue>
+                                    <red>223</red>
+                                    <green>223</green>
+                                    <blue>223</blue>
                                 </color>
                                 <color>
-                                    <red>127</red>
-                                    <green>0</green>
-                                    <blue>0</blue>
+                                    <red>96</red>
+                                    <green>96</green>
+                                    <blue>96</blue>
                                 </color>
                                 <color>
-                                    <red>170</red>
-                                    <green>0</green>
-                                    <blue>0</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>220</red>
+                                    <green>220</green>
+                                    <blue>220</blue>
                                 </color>
                                 <color>
                                     <red>0</red>
                                     <blue>128</blue>
                                 </color>
                                 <color>
-                                    <red>255</red>
-                                    <green>0</green>
-                                    <blue>0</blue>
+                                    <red>192</red>
+                                    <green>192</green>
+                                    <blue>192</blue>
                                 </color>
                                 <color>
                                     <red>255</red>
-                                    <green>127</green>
-                                    <blue>127</blue>
+                                    <green>255</green>
+                                    <blue>255</blue>
                                 </color>
                                 <color>
-                                    <red>255</red>
-                                    <green>38</green>
-                                    <blue>38</blue>
+                                    <red>220</red>
+                                    <green>220</green>
+                                    <blue>220</blue>
                                 </color>
                                 <color>
-                                    <red>127</red>
-                                    <green>0</green>
-                                    <blue>0</blue>
+                                    <red>96</red>
+                                    <green>96</green>
+                                    <blue>96</blue>
                                 </color>
                                 <color>
-                                    <red>170</red>
-                                    <green>0</green>
-                                    <blue>0</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>220</red>
+                                    <green>220</green>
+                                    <blue>220</blue>
                                 </color>
                                 <color>
                                     <red>0</red>
                                     <blue>0</blue>
                                 </color>
                                 <color>
-                                    <red>255</red>
-                                    <green>0</green>
-                                    <blue>0</blue>
+                                    <red>192</red>
+                                    <green>192</green>
+                                    <blue>192</blue>
                                 </color>
                                 <color>
                                     <red>255</red>
-                                    <green>127</green>
-                                    <blue>127</blue>
+                                    <green>255</green>
+                                    <blue>255</blue>
                                 </color>
                                 <color>
-                                    <red>255</red>
-                                    <green>38</green>
-                                    <blue>38</blue>
+                                    <red>220</red>
+                                    <green>220</green>
+                                    <blue>220</blue>
                                 </color>
                                 <color>
-                                    <red>127</red>
-                                    <green>0</green>
-                                    <blue>0</blue>
+                                    <red>96</red>
+                                    <green>96</green>
+                                    <blue>96</blue>
                                 </color>
                                 <color>
-                                    <red>170</red>
-                                    <green>0</green>
-                                    <blue>0</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>220</red>
+                                    <green>220</green>
+                                    <blue>220</blue>
                                 </color>
                                 <color>
                                     <red>0</red>
                         </palette>
                     </property>
                     <property stdset="1">
-                        <name>text</name>
-                        <string>reset</string>
+                        <name>numDigits</name>
+                        <number>8</number>
+                    </property>
+                    <property stdset="1">
+                        <name>segmentStyle</name>
+                        <enum>Flat</enum>
                     </property>
                 </widget>
                 <widget>
-                    <class>QLCDNumber</class>
+                    <class>QPushButton</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>chono</cstring>
+                        <cstring>resetchrono</cstring>
                     </property>
                     <property stdset="1">
                         <name>geometry</name>
                         <rect>
-                            <x>5</x>
-                            <y>15</y>
-                            <width>125</width>
-                            <height>45</height>
+                            <x>150</x>
+                            <y>35</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>255</red>
+                                    <green>0</green>
+                                    <blue>0</blue>
                                 </color>
                                 <color>
                                     <red>255</red>
-                                    <green>255</green>
-                                    <blue>255</blue>
+                                    <green>127</green>
+                                    <blue>127</blue>
                                 </color>
                                 <color>
-                                    <red>223</red>
-                                    <green>223</green>
-                                    <blue>223</blue>
+                                    <red>255</red>
+                                    <green>63</green>
+                                    <blue>63</blue>
                                 </color>
                                 <color>
-                                    <red>96</red>
-                                    <green>96</green>
-                                    <blue>96</blue>
+                                    <red>127</red>
+                                    <green>0</green>
+                                    <blue>0</blue>
                                 </color>
                                 <color>
-                                    <red>128</red>
-                                    <green>128</green>
-                                    <blue>128</blue>
+                                    <red>170</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>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>
+                                    <red>255</red>
+                                    <green>0</green>
+                                    <blue>0</blue>
                                 </color>
                                 <color>
                                     <red>255</red>
-                                    <green>255</green>
-                                    <blue>255</blue>
+                                    <green>127</green>
+                                    <blue>127</blue>
                                 </color>
                                 <color>
-                                    <red>220</red>
-                                    <green>220</green>
-                                    <blue>220</blue>
+                                    <red>255</red>
+                                    <green>38</green>
+                                    <blue>38</blue>
                                 </color>
                                 <color>
-                                    <red>96</red>
-                                    <green>96</green>
-                                    <blue>96</blue>
+                                    <red>127</red>
+                                    <green>0</green>
+                                    <blue>0</blue>
                                 </color>
                                 <color>
-                                    <red>128</red>
-                                    <green>128</green>
-                                    <blue>128</blue>
+                                    <red>170</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>
-                                </color>
-                                <color>
+                                    <red>192</red>
+                                    <green>192</green>
+                                    <blue>192</blue>
+                                </color>
+                                <color>
                                     <red>0</red>
                                     <green>0</green>
                                     <blue>0</blue>
                                     <blue>0</blue>
                                 </color>
                                 <color>
-                                    <red>192</red>
-                                    <green>192</green>
-                                    <blue>192</blue>
+                                    <red>255</red>
+                                    <green>0</green>
+                                    <blue>0</blue>
                                 </color>
                                 <color>
                                     <red>255</red>
-                                    <green>255</green>
-                                    <blue>255</blue>
+                                    <green>127</green>
+                                    <blue>127</blue>
                                 </color>
                                 <color>
-                                    <red>220</red>
-                                    <green>220</green>
-                                    <blue>220</blue>
+                                    <red>255</red>
+                                    <green>38</green>
+                                    <blue>38</blue>
                                 </color>
                                 <color>
-                                    <red>96</red>
-                                    <green>96</green>
-                                    <blue>96</blue>
+                                    <red>127</red>
+                                    <green>0</green>
+                                    <blue>0</blue>
                                 </color>
                                 <color>
-                                    <red>128</red>
-                                    <green>128</green>
-                                    <blue>128</blue>
+                                    <red>170</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>192</red>
+                                    <green>192</green>
+                                    <blue>192</blue>
                                 </color>
                                 <color>
                                     <red>0</red>
                         </palette>
                     </property>
                     <property stdset="1">
-                        <name>segmentStyle</name>
-                        <enum>Flat</enum>
+                        <name>text</name>
+                        <string>rst</string>
                     </property>
                 </widget>
                 <widget>
                     <property stdset="1">
                         <name>geometry</name>
                         <rect>
-                            <x>180</x>
+                            <x>190</x>
                             <y>35</y>
-                            <width>55</width>
+                            <width>30</width>
                             <height>30</height>
                         </rect>
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <string>pause</string>
+                        <string></string>
                     </property>
                 </widget>
                 <widget>
                 <class>QGroupBox</class>
                 <property stdset="1">
                     <name>name</name>
-                    <cstring>Etalonnage_sur_1_Km</cstring>
+                    <cstring>GroupBox5</cstring>
                 </property>
                 <property stdset="1">
                     <name>geometry</name>
                     <rect>
-                        <x>3</x>
-                        <y>-2</y>
-                        <width>230</width>
-                        <height>120</height>
+                        <x>5</x>
+                        <y>130</y>
+                        <width>231</width>
+                        <height>96</height>
                     </rect>
                 </property>
                 <property stdset="1">
                     <name>title</name>
-                    <string>Etalonnage sur 1 Km</string>
+                    <string>Ajustements par Km</string>
                 </property>
                 <widget>
-                    <class>QLCDNumber</class>
+                    <class>QPushButton</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>NbrImpuls</cstring>
+                        <cstring>plus10parkilo</cstring>
                     </property>
                     <property stdset="1">
                         <name>geometry</name>
                         <rect>
                             <x>10</x>
-                            <y>20</y>
-                            <width>210</width>
-                            <height>41</height>
+                            <y>25</y>
+                            <width>100</width>
+                            <height>55</height>
                         </rect>
                     </property>
                     <property stdset="1">
-                        <name>numDigits</name>
-                        <number>12</number>
-                    </property>
-                    <property stdset="1">
-                        <name>segmentStyle</name>
-                        <enum>Flat</enum>
+                        <name>text</name>
+                        <string>+ 10 metres</string>
                     </property>
                 </widget>
                 <widget>
                     <class>QPushButton</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>SetEta</cstring>
+                        <cstring>moins10parkilo</cstring>
                     </property>
                     <property stdset="1">
                         <name>geometry</name>
                         <rect>
-                            <x>10</x>
-                            <y>65</y>
-                            <width>210</width>
-                            <height>50</height>
+                            <x>115</x>
+                            <y>25</y>
+                            <width>100</width>
+                            <height>55</height>
                         </rect>
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <string>Depart de zone</string>
+                        <string>- 10 metres</string>
                     </property>
                 </widget>
             </widget>
                 <class>QGroupBox</class>
                 <property stdset="1">
                     <name>name</name>
-                    <cstring>GroupBox5</cstring>
+                    <cstring>Etalonnage_sur_1_Km</cstring>
                 </property>
                 <property stdset="1">
                     <name>geometry</name>
                     <rect>
-                        <x>5</x>
-                        <y>130</y>
-                        <width>231</width>
-                        <height>96</height>
+                        <x>0</x>
+                        <y>10</y>
+                        <width>240</width>
+                        <height>120</height>
                     </rect>
                 </property>
                 <property stdset="1">
                     <name>title</name>
-                    <string>Ajustements par Km</string>
+                    <string>Etalonnage sur 1 Km</string>
                 </property>
                 <widget>
                     <class>QPushButton</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>plus10parkilo</cstring>
+                        <cstring>SetEta</cstring>
                     </property>
                     <property stdset="1">
                         <name>geometry</name>
                         <rect>
                             <x>10</x>
-                            <y>25</y>
-                            <width>100</width>
-                            <height>55</height>
+                            <y>65</y>
+                            <width>210</width>
+                            <height>50</height>
                         </rect>
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <string>+ 10 metres</string>
+                        <string>Depart de zone</string>
                     </property>
                 </widget>
                 <widget>
-                    <class>QPushButton</class>
+                    <class>QLCDNumber</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>moins10parkilo</cstring>
+                        <cstring>NbrImpuls</cstring>
                     </property>
                     <property stdset="1">
                         <name>geometry</name>
                         <rect>
-                            <x>115</x>
-                            <y>25</y>
-                            <width>100</width>
-                            <height>55</height>
+                            <x>10</x>
+                            <y>20</y>
+                            <width>210</width>
+                            <height>41</height>
                         </rect>
                     </property>
                     <property stdset="1">
-                        <name>text</name>
-                        <string>- 10 metres</string>
+                        <name>numDigits</name>
+                        <number>12</number>
+                    </property>
+                    <property stdset="1">
+                        <name>segmentStyle</name>
+                        <enum>Flat</enum>
                     </property>
                 </widget>
             </widget>
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <string> </string>
+                        <string></string>
                     </property>
                 </widget>
             </widget>
                     <string>Tempts partiel</string>
                 </property>
                 <widget>
+                    <class>QLineEdit</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>LineEdit1_5_2</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>geometry</name>
+                        <rect>
+                            <x>5</x>
+                            <y>20</y>
+                            <width>90</width>
+                            <height>25</height>
+                        </rect>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string></string>
+                    </property>
+                </widget>
+                <widget>
                     <class>QLCDNumber</class>
                     <property stdset="1">
                         <name>name</name>
                         <number>8</number>
                     </property>
                 </widget>
-                <widget>
-                    <class>QLineEdit</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>LineEdit1_5_2</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>geometry</name>
-                        <rect>
-                            <x>5</x>
-                            <y>20</y>
-                            <width>90</width>
-                            <height>25</height>
-                        </rect>
-                    </property>
-                    <property stdset="1">
-                        <name>text</name>
-                        <string></string>
-                    </property>
-                </widget>
-                <widget>
-                    <class>QPushButton</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>PushButton14</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>geometry</name>
-                        <rect>
-                            <x>176</x>
-                            <y>-4</y>
-                            <width>60</width>
-                            <height>60</height>
-                        </rect>
-                    </property>
-                    <property stdset="1">
-                        <name>palette</name>
-                        <palette>
-                            <active>
-                                <color>
-                                    <red>0</red>
-                                    <green>0</green>
-                                    <blue>0</blue>
-                                </color>
-                                <color>
-                                    <red>0</red>
-                                    <green>255</green>
-                                    <blue>0</blue>
-                                </color>
-                                <color>
-                                    <red>127</red>
-                                    <green>255</green>
-                                    <blue>127</blue>
-                                </color>
-                                <color>
-                                    <red>63</red>
-                                    <green>255</green>
-                                    <blue>63</blue>
-                                </color>
-                                <color>
-                                    <red>0</red>
-                                    <green>127</green>
-                                    <blue>0</blue>
-                                </color>
-                                <color>
-                                    <red>0</red>
-                                    <green>170</green>
-                                    <blue>0</blue>
-                                </color>
-                                <color>
-                                    <red>0</red>
-                                    <green>0</green>
-                                    <blue>0</blue>
-                                </color>
-                                <color>
-                                    <red>255</red>
-                                    <green>255</green>
-                                    <blue>255</blue>
-                                </color>
-                                <color>
-                                    <red>0</red>
-                                    <green>0</green>
-                                    <blue>0</blue>
-                                </color>
-                                <color>
-                                    <red>255</red>
-                                    <green>255</green>
-                                    <blue>255</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>0</red>
-                                    <green>0</green>
-                                    <blue>0</blue>
-                                </color>
-                                <color>
-                                    <red>255</red>
-                                    <green>255</green>
-                                    <blue>255</blue>
-                                </color>
-                            </active>
-                            <disabled>
-                                <color>
-                                    <red>128</red>
-                                    <green>128</green>
-                                    <blue>128</blue>
-                                </color>
-                                <color>
-                                    <red>0</red>
-                                    <green>255</green>
-                                    <blue>0</blue>
-                                </color>
-                                <color>
-                                    <red>127</red>
-                                    <green>255</green>
-                                    <blue>127</blue>
-                                </color>
-                                <color>
-                                    <red>38</red>
-                                    <green>255</green>
-                                    <blue>38</blue>
-                                </color>
-                                <color>
-                                    <red>0</red>
-                                    <green>127</green>
-                                    <blue>0</blue>
-                                </color>
-                                <color>
-                                    <red>0</red>
-                                    <green>170</green>
-                                    <blue>0</blue>
-                                </color>
-                                <color>
-                                    <red>0</red>
-                                    <green>0</green>
-                                    <blue>0</blue>
-                                </color>
-                                <color>
-                                    <red>255</red>
-                                    <green>255</green>
-                                    <blue>255</blue>
-                                </color>
-                                <color>
-                                    <red>128</red>
-                                    <green>128</green>
-                                    <blue>128</blue>
-                                </color>
-                                <color>
-                                    <red>255</red>