cambio la sintaxis XML de las compuertas

[z.facultad/75.42/plaqui.git] / Client / src / principal.cpp

diff --git a/Client/src/principal.cpp b/Client/src/principal.cpp
index 96093c185613b40ab81b3fcf320fbc0e05e8bee3..c73f2c81088ed7b9e484bc102521a18ce2636390 100644 (file)
--- a/Client/src/principal.cpp
+++ b/Client/src/principal.cpp
@@ -80,7 +80,7 @@ Principal::~Principal()
        }
        // Espera a que termine realmente.
        while (conexion) {
        }
        // Espera a que termine realmente.
        while (conexion) {

-               Glib::usleep(10000); // 10 milisegundos
+               Glib::usleep(100000); // 0,1 segundo

        }
 }
 
        }
 }
 


@@ -155,6 +155,7 @@ void Principal::on_dlg_connect_ok()
 
                // Conecto las señales
                conexion->signal_ok_received().connect( SigC::slot(*this, &Principal::on_conexion_ok) );
 
                // Conecto las señales
                conexion->signal_ok_received().connect( SigC::slot(*this, &Principal::on_conexion_ok) );

+               conexion->signal_error().connect( SigC::slot(*this, &Principal::on_conexion_fatal_error) );

                conexion->signal_error_received().connect( SigC::slot(*this, &Principal::on_conexion_error) );
                conexion->signal_finished().connect( SigC::slot(*this, &Principal::on_conexion_finished) );
                conexion->signal_frame_received().connect(SigC::slot(*this, &Principal::on_conexion_frame));
                conexion->signal_error_received().connect( SigC::slot(*this, &Principal::on_conexion_error) );
                conexion->signal_finished().connect( SigC::slot(*this, &Principal::on_conexion_finished) );
                conexion->signal_frame_received().connect(SigC::slot(*this, &Principal::on_conexion_frame));


@@ -321,14 +322,29 @@ void Principal::on_conexion_ok(const std::string &body)
        }
 }
 
        }
 }
 

-void Principal::on_conexion_error(unsigned code)
+void Principal::on_conexion_fatal_error(const PlaQui::Server::ControlClient::Error& code, const std::string& desc)

 {
        std::stringstream a;
        std::string s;
        a << code;
        a >> s;
 {
        std::stringstream a;
        std::string s;
        a << code;
        a >> s;

-       txt_view->get_buffer()->insert_at_cursor("El server dice que hay error : ");
+       txt_view->get_buffer()->insert_at_cursor("Error de red nro. ");

        txt_view->get_buffer()->insert_at_cursor(s);
        txt_view->get_buffer()->insert_at_cursor(s);

+       txt_view->get_buffer()->insert_at_cursor(": ");
+       txt_view->get_buffer()->insert_at_cursor(desc);
+       txt_view->get_buffer()->insert_at_cursor("\n");
+}
+
+void Principal::on_conexion_error(unsigned code, const std::string& desc)
+{
+       std::stringstream a;
+       std::string s;
+       a << code;
+       a >> s;
+       txt_view->get_buffer()->insert_at_cursor("El server dice que hay error nro. ");
+       txt_view->get_buffer()->insert_at_cursor(s);
+       txt_view->get_buffer()->insert_at_cursor(": ");
+       txt_view->get_buffer()->insert_at_cursor(desc);

        txt_view->get_buffer()->insert_at_cursor("\n");
 }
 
        txt_view->get_buffer()->insert_at_cursor("\n");
 }
 


@@ -783,7 +799,7 @@ void Principal::read_status_xml(const std::string &frame)
 
 Gdk::Color Principal::get_rgb_from_xml(xmlNodePtr nodo)
 {
 
 Gdk::Color Principal::get_rgb_from_xml(xmlNodePtr nodo)
 {

-       unsigned r,g,b;
+       gushort r,g,b;

        while (nodo != NULL) {
                if (nodo->type == XML_ELEMENT_NODE) {
                        if (xmlStrcmp(nodo->name, BAD_CAST"r")==0)
        while (nodo != NULL) {
                if (nodo->type == XML_ELEMENT_NODE) {
                        if (xmlStrcmp(nodo->name, BAD_CAST"r")==0)


@@ -795,14 +811,15 @@ Gdk::Color Principal::get_rgb_from_xml(xmlNodePtr nodo)
                }
                nodo = nodo->next;
        }
                }
                nodo = nodo->next;
        }

-       r = 65535 * r / 255;
-       g = 65535 * g / 255;
-       b = 65535 * b / 255;
+       r = static_cast<gushort>(65535 * (r / 255.0f));
+       g = static_cast<gushort>(65535 * (g / 255.0f));
+       b = static_cast<gushort>(65535 * (b / 255.0f));

        Gdk::Color c;
        c.set_rgb(r,g,b);
 
        return c;
 }
        Gdk::Color c;
        c.set_rgb(r,g,b);
 
        return c;
 }

+

 float Principal::get_float_from_xml(xmlNodePtr nodo)
 {
        float tmp = -1;
 float Principal::get_float_from_xml(xmlNodePtr nodo)
 {
        float tmp = -1;