display-qt : Some files and function were renamed (only).

[eurobot/public.git] / src / display-qt / main.cpp

diff --git a/src/display-qt/main.cpp b/src/display-qt/main.cpp
index 2def011f00de3a49f51cd92912d1ff9103b2b2bb..50c4231639be7eadf72499b52a86ab881da94e6b 100644 (file)
--- a/src/display-qt/main.cpp
+++ b/src/display-qt/main.cpp
@@ -1,61 +1,38 @@
 #include <QtGui>
-#include "displej.h"
-#include "ortedisplay.h"
-
-#include "promene.h"
-
-
-
-#include <orte.h>
-#include <roboorte_robottype.h>
-#include <robottype.h>
-
-
-//#include "form.h"
-
-//#include <orte.h>
-//#include <roboorte_robottype.h>
-
 #include <QObject>
-
-
-
+#include "displayqt.h"
+#include "ortesignals.h"
 
 
 int main(int argc, char *argv[])
 {
-    QApplication a(argc, argv);
-
-
+       QApplication a(argc, argv);
 
+       DisplayQT disp;
+       disp.show();
 
-    Displej disp;
-    disp.show();
-       
-       Ortedisplay ortik;
+       OrteSignals ortesig;
 
-       
-qRegisterMetaType<UDE_fsm_t>("UDE_fsm_t");
-qRegisterMetaType<UDE_fsm_t>("UDE_component_t");
-qRegisterMetaType<UDE_fsm_t>("UDE_hw_status_t");
 
-    //QObject::connect(&forma, SIGNAL(zijusig(void)), &disp, SLOT(ziju(void)));
-    //QObject::connect(&forma, SIGNAL(teamColorsig(int)), &disp, SLOT(setTeamColor(int)));
-    //QObject::connect(&forma, SIGNAL(positionsig(double,double,double)), &disp, SLOT(setPosition(double,double,double)));
-    //QObject::connect(&forma, SIGNAL(komponentovysignal(UDE_component_t,UDE_hw_status_t)), &disp, SLOT(display_status(UDE_component_t,UDE_hw_status_t)));
-    //QObject::connect(&forma, SIGNAL(sigfsm(UDE_fsm_t,QString)), &disp, SLOT(display_fsm(UDE_fsm_t,QString)));
-    //QObject::connect(&forma, SIGNAL(sigvoltage(double,double,double,double)), &disp, SLOT(display_voltage(double,double,double,double)));
+       qRegisterMetaType<UDE_fsm_t>("UDE_fsm_t");
+       qRegisterMetaType<UDE_fsm_t>("UDE_component_t");
+       qRegisterMetaType<UDE_fsm_t>("UDE_hw_status_t");
 
-       QObject::connect(&ortik, SIGNAL(fsm_sig(UDE_fsm_t, QString)), &disp, SLOT(display_fsm(UDE_fsm_t, QString)));
-       QObject::connect(&ortik, SIGNAL(status_sig(UDE_component_t, UDE_hw_status_t)), &disp, SLOT(display_status(UDE_component_t, UDE_hw_status_t)));
-       QObject::connect(&ortik, SIGNAL(position_sig(double, double, double)), &disp, SLOT(setPosition(double, double, double)));
-       QObject::connect(&ortik, SIGNAL(pwr_sig(double, double, double, double)), &disp, SLOT(display_voltage(double, double, double, double)));
-       QObject::connect(&ortik, SIGNAL(color_sig(char)), &disp, SLOT(setTeamColor(char)));
 
+       QObject::connect(&ortesig, SIGNAL(fsm_sig(UDE_fsm_t, QString)),
+                                       &disp, SLOT(display_fsm(UDE_fsm_t, QString)));
 
+       QObject::connect(&ortesig, SIGNAL(status_sig(UDE_component_t, UDE_hw_status_t)),
+                                       &disp, SLOT(display_status(UDE_component_t, UDE_hw_status_t)));
 
+       QObject::connect(&ortesig, SIGNAL(position_sig(double, double, double)),
+                                       &disp, SLOT(setPosition(double, double, double)));
 
+       QObject::connect(&ortesig, SIGNAL(pwr_sig(double, double, double, double)),
+                                       &disp, SLOT(display_voltage(double, double, double, double)));
 
+       QObject::connect(&ortesig, SIGNAL(color_sig(char)),
+                                       &disp, SLOT(setTeamColor(char)));
 
 
     return a.exec();