Se leen bien los valores de punto flotante y la simulacion es mas coherente

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

diff --git a/Client/src/principal.cpp b/Client/src/principal.cpp
index d096f523c9b46604035fcbc6cbed896a20a50289..c3c553ad6789086f91dd171a778779367aceea90 100644 (file)
--- a/Client/src/principal.cpp
+++ b/Client/src/principal.cpp
@@ -21,6 +21,7 @@
 Principal::Principal(BaseObjectType *co, const Glib::RefPtr<Gnome::Glade::Xml> &rg):Gtk::Window(co),refXml(rg)
 {
        Gtk::MenuItem *conect=0, *exit=0, *about=0, *mnu_prop=0, *mnu_disconnect=0, *server_stop=0;
 Principal::Principal(BaseObjectType *co, const Glib::RefPtr<Gnome::Glade::Xml> &rg):Gtk::Window(co),refXml(rg)
 {
        Gtk::MenuItem *conect=0, *exit=0, *about=0, *mnu_prop=0, *mnu_disconnect=0, *server_stop=0;

+       Gtk::MenuItem *mnu_simular=0, *mnu_pausar=0;

        Gtk::Button *bar_connect=0, *close_about=0;
        Gtk::Image *plaqui_logo;
        Gtk::Label *lbl_plaqui_version;
        Gtk::Button *bar_connect=0, *close_about=0;
        Gtk::Image *plaqui_logo;
        Gtk::Label *lbl_plaqui_version;


@@ -49,17 +50,24 @@ Principal::Principal(BaseObjectType *co, const Glib::RefPtr<Gnome::Glade::Xml> &
        rg->get_widget("plaqui_logo", plaqui_logo);
        // Calculo número de revisión.
        std::string rev = "$Rev$";
        rg->get_widget("plaqui_logo", plaqui_logo);
        // Calculo número de revisión.
        std::string rev = "$Rev$";

-       //rev = rev.substr(6, rev.length() - 8);
+       rev = rev.substr(6, rev.length() - 8);

        std::string s = "PlaQui Client versión " VERSION " (revisión ";
        s += rev + ")"; 
        std::string s = "PlaQui Client versión " VERSION " (revisión ";
        s += rev + ")"; 

-       lbl_plaqui_version->set_text(Glib::locale_to_utf8(s));
+       try {
+               lbl_plaqui_version->set_text(Glib::locale_to_utf8(s));
+       }
+       catch (...) {
+               lbl_plaqui_version->set_text("PlaQui Client");
+       }

 
        rg->get_widget("anim_frames", anim);
        anim->set(anim_frames[current_frame]);
 
        rg->get_widget("close_about", close_about);
        rg->get_widget("dlgAbout", dlg_about);
 
        rg->get_widget("anim_frames", anim);
        anim->set(anim_frames[current_frame]);
 
        rg->get_widget("close_about", close_about);
        rg->get_widget("dlgAbout", dlg_about);

+       rg->get_widget("mnu_pausar", mnu_pausar);

        rg->get_widget("btn_pausa", btn_pause);
        rg->get_widget("btn_pausa", btn_pause);

+       rg->get_widget("mnu_simular", mnu_simular);

        rg->get_widget("btn_simular", btn_simulate);
        rg->get_widget("btn_activar", btn_activar);
        rg->get_widget("color_preview", color_preview);
        rg->get_widget("btn_simular", btn_simulate);
        rg->get_widget("btn_activar", btn_activar);
        rg->get_widget("color_preview", color_preview);


@@ -92,7 +100,9 @@ Principal::Principal(BaseObjectType *co, const Glib::RefPtr<Gnome::Glade::Xml> &
        exit->signal_activate().connect( SigC::slot(*this, &Principal::on_mnu_file_exit));
        about->signal_activate().connect( SigC::slot(*this, &Principal::on_mnu_help_about));
        btn_activar->signal_clicked().connect( SigC::slot(*this, &Principal::on_btn_activar_clicked) );
        exit->signal_activate().connect( SigC::slot(*this, &Principal::on_mnu_file_exit));
        about->signal_activate().connect( SigC::slot(*this, &Principal::on_mnu_help_about));
        btn_activar->signal_clicked().connect( SigC::slot(*this, &Principal::on_btn_activar_clicked) );

+       mnu_simular->signal_activate().connect( SigC::slot(*this, &Principal::on_btn_simulate_clicked) );

        btn_simulate->signal_clicked().connect( SigC::slot(*this, &Principal::on_btn_simulate_clicked) );
        btn_simulate->signal_clicked().connect( SigC::slot(*this, &Principal::on_btn_simulate_clicked) );

+       mnu_pausar->signal_activate().connect( SigC::slot(*this, &Principal::on_btn_pause_clicked) );

        btn_pause->signal_clicked().connect( SigC::slot(*this, &Principal::on_btn_pause_clicked) );
        close_about->signal_clicked().connect( SigC::slot(*dlg_about, &Gtk::Widget::hide) );
        
        btn_pause->signal_clicked().connect( SigC::slot(*this, &Principal::on_btn_pause_clicked) );
        close_about->signal_clicked().connect( SigC::slot(*dlg_about, &Gtk::Widget::hide) );
        


@@ -107,6 +117,7 @@ Principal::Principal(BaseObjectType *co, const Glib::RefPtr<Gnome::Glade::Xml> &
        color_high = Gdk::Color("red");
        Gtk::Widget::get_default_colormap()->alloc_color(color_low);
        Gtk::Widget::get_default_colormap()->alloc_color(color_high);
        color_high = Gdk::Color("red");
        Gtk::Widget::get_default_colormap()->alloc_color(color_low);
        Gtk::Widget::get_default_colormap()->alloc_color(color_high);

+       txt_view->set_editable(false);

 }
 
 Principal::~Principal()
 }
 
 Principal::~Principal()


@@ -206,10 +217,12 @@ void Principal::on_dlg_connect_ok()
                        conexion = new PlaQui::Server::ControlClient(dlg_conectar->get_server_name(), dlg_conectar->get_server_port());
                }
                catch (...) {
                        conexion = new PlaQui::Server::ControlClient(dlg_conectar->get_server_name(), dlg_conectar->get_server_port());
                }
                catch (...) {

-                       txt_view->get_buffer()->insert_at_cursor("NO SE PUDO CREAR OBJETO\n");
+                       txt_view->get_buffer()->insert(txt_view->get_buffer()->begin(), "NO SE PUDO CONECTAR\n");

                        //delete conexion; XXX Si no me equivoco, si falla el
                        //constructor, no se reserva la memoria (el delete no va).
                        //delete conexion; XXX Si no me equivoco, si falla el
                        //constructor, no se reserva la memoria (el delete no va).

+                       delete conexion;

                        conexion = NULL;
                        conexion = NULL;

+                       dlg_conectar->hide();

                        return;
                }
 
                        return;
                }
 


@@ -221,7 +234,7 @@ void Principal::on_dlg_connect_ok()
                conexion->signal_frame_received().connect(SigC::slot(*this, &Principal::on_conexion_frame));
                // Lanzo la conexion!
                conexion->run();
                conexion->signal_frame_received().connect(SigC::slot(*this, &Principal::on_conexion_frame));
                // Lanzo la conexion!
                conexion->run();

-               txt_view->get_buffer()->insert_at_cursor("CONNECTED\n");
+               txt_view->get_buffer()->insert(txt_view->get_buffer()->begin(),"CONNECTED\n");

                ico_conected->set( Gtk::Stock::YES , Gtk::IconSize(Gtk::ICON_SIZE_LARGE_TOOLBAR));
 
                // Pido la planta por defecto
                ico_conected->set( Gtk::Stock::YES , Gtk::IconSize(Gtk::ICON_SIZE_LARGE_TOOLBAR));
 
                // Pido la planta por defecto


@@ -302,10 +315,9 @@ void Principal::on_mnu_help_about()
 
 bool Principal::on_item_clicked(GdkEventButton *e, ViewItem *i)
 {
 
 bool Principal::on_item_clicked(GdkEventButton *e, ViewItem *i)
 {

-       
-       txt_view->get_buffer()->insert_at_cursor("Selecciono ");
-       txt_view->get_buffer()->insert_at_cursor(i->get_name());
-       txt_view->get_buffer()->insert_at_cursor("\n");
+       Glib::ustring s;
+       s = "Selecciono "+i->get_name()+"\n";
+       txt_view->get_buffer()->insert(txt_view->get_buffer()->begin(), s);

 
        last_selected = i;
        update_items_prop();
 
        last_selected = i;
        update_items_prop();


@@ -350,7 +362,7 @@ void Principal::on_conexion_frame(const std::string &frame)
 
 void Principal::on_conexion_finished()
 {
 
 void Principal::on_conexion_finished()
 {

-       txt_view->get_buffer()->insert_at_cursor("HANG UP\n");
+       txt_view->get_buffer()->insert(txt_view->get_buffer()->begin(),"HANG UP\n");

        ico_conected->set( Gtk::Stock::NO , Gtk::IconSize(Gtk::ICON_SIZE_LARGE_TOOLBAR));
        conexion = NULL;
        // Elimino la planta    
        ico_conected->set( Gtk::Stock::NO , Gtk::IconSize(Gtk::ICON_SIZE_LARGE_TOOLBAR));
        conexion = NULL;
        // Elimino la planta    


@@ -367,14 +379,17 @@ void Principal::on_conexion_ok(const std::string &body)
        /* lo paso a la carga del XML */
        /* verifico que body este completo */
        if ((body.find("</planta>")>0) && (body.find("<planta>")>0)) {
        /* lo paso a la carga del XML */
        /* verifico que body este completo */
        if ((body.find("</planta>")>0) && (body.find("<planta>")>0)) {

-               //loadXML(body);

                xml_body = body;
                load_xml_dispatch();
        } else {
                xml_body = body;
                load_xml_dispatch();
        } else {

-               std::cout << body << std::endl;
-               txt_view->get_buffer()->insert_at_cursor("<IN>\n");
-               txt_view->get_buffer()->insert_at_cursor(Glib::locale_to_utf8(body));
-               txt_view->get_buffer()->insert_at_cursor("</IN>\n");
+               Glib::ustring s;
+               try {
+                       s = "<IN>\n"+Glib::locale_to_utf8(body)+"\n</IN>\n";
+               }
+               catch (...) {
+                       s = "NO SE PUDO CONVERTIR MENSAJE A UTF8";
+               }
+               txt_view->get_buffer()->insert(txt_view->get_buffer()->begin(),s);

        }
 }
 
        }
 }
 


@@ -384,11 +399,9 @@ void Principal::on_conexion_fatal_error(const PlaQui::Server::ControlClient::Err
        std::string s;
        a << code;
        a >> s;
        std::string s;
        a << code;
        a >> s;

-       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(": ");
-       txt_view->get_buffer()->insert_at_cursor(desc);
-       txt_view->get_buffer()->insert_at_cursor("\n");
+       Glib::ustring st;
+       st = "Error de red nro. "+s+": "+desc+"\n";
+       txt_view->get_buffer()->insert(txt_view->get_buffer()->begin(),st);

 }
 
 void Principal::on_conexion_error(unsigned code, const std::string& desc)
 }
 
 void Principal::on_conexion_error(unsigned code, const std::string& desc)


@@ -397,11 +410,9 @@ void Principal::on_conexion_error(unsigned code, const std::string& desc)
        std::string s;
        a << code;
        a >> s;
        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");
+       Glib::ustring st;
+       st = "El server dice que hay error nro. "+s+": "+desc+"\n";
+       txt_view->get_buffer()->insert(txt_view->get_buffer()->begin(),st);

 }
 
 void Principal::loadXML()
 }
 
 void Principal::loadXML()


@@ -413,7 +424,8 @@ void Principal::loadXML()
        xmlDocPtr document;
        document = xmlParseMemory(xml_body.c_str(),xml_body.size());
        if (document == NULL) {
        xmlDocPtr document;
        document = xmlParseMemory(xml_body.c_str(),xml_body.size());
        if (document == NULL) {

-               std::cout << "EEERRRRRRROOOOOOOOOO" << std::endl;
+               txt_view->get_buffer()->insert(txt_view->get_buffer()->begin(),"No se pudo cargar XML enviado por el servidor.");
+               is_xml_loaded = false;

                return;
        }
        is_xml_loaded = true;
                return;
        }
        is_xml_loaded = true;


@@ -800,13 +812,21 @@ void Principal::loadDrain(xmlNodePtr nodo)
        mapItems[name] = b;
 }
 
        mapItems[name] = b;
 }
 

-void Principal::read_status_xml(const std::string &frame)
+void Principal::read_status_xml(const std::string &_frame)

 {
        std::string item_name;
 {
        std::string item_name;

+       std::string frame = _frame;

        xmlDocPtr document;
        xmlDocPtr document;

+
+       // Cambio las , por . para evitar problemas de convercion 
+       for(int i=0; i<frame.size(); i++) {
+               if (frame[i] == ',') {
+                       frame[i] = '.';
+               }
+       }

        document = xmlParseMemory(frame.c_str(),frame.size());
        if (document == NULL) {
        document = xmlParseMemory(frame.c_str(),frame.size());
        if (document == NULL) {

-               std::cout << "read_status_xml::no se creo documento" << std::endl;
+               txt_view->get_buffer()->insert(txt_view->get_buffer()->begin(), "ERROR : No se pudo leer el último frame!\n");

                return;
        }
        
                return;
        }
        


@@ -824,6 +844,7 @@ void Principal::read_status_xml(const std::string &frame)
                                if (xmlStrcmp(items->name, BAD_CAST"float")==0) {
                                        tmp = get_float_from_xml(items->children);
                                        item_name = (char *)xmlGetProp(items, BAD_CAST"name");
                                if (xmlStrcmp(items->name, BAD_CAST"float")==0) {
                                        tmp = get_float_from_xml(items->children);
                                        item_name = (char *)xmlGetProp(items, BAD_CAST"name");

+                                       std::cout << item_name << " " << tmp << std::endl;

                                        mapItems[item_name]->set_actual_flow(tmp);
                                } else if (xmlStrcmp(items->name, BAD_CAST"exclusa")==0) {
                                        tmp_b = get_bool_from_xml(items->children);
                                        mapItems[item_name]->set_actual_flow(tmp);
                                } else if (xmlStrcmp(items->name, BAD_CAST"exclusa")==0) {
                                        tmp_b = get_bool_from_xml(items->children);


@@ -903,16 +924,21 @@ Gdk::Color Principal::get_rgb_from_xml(xmlNodePtr nodo)
 float Principal::get_float_from_xml(xmlNodePtr nodo)
 {
        float tmp = -1;
 float Principal::get_float_from_xml(xmlNodePtr nodo)
 {
        float tmp = -1;

+       std::string s;

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

-                               tmp = atof( (char *)XML_GET_CONTENT(nodo->children) );
+                               s = (char *)XML_GET_CONTENT(nodo->children);

                                break;
                        }
                }
                nodo = nodo->next;
        }
                                break;
                        }
                }
                nodo = nodo->next;
        }

+       std::stringstream ss;
+       ss << s;
+       ss >> tmp;

        if (tmp == INFINITO) tmp = 0;
        if (tmp == INFINITO) tmp = 0;

+

        return tmp;
 }
 
        return tmp;
 }