- Se corrige el bug que hacia que no se deje de transmitir con el comando

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

diff --git a/Client/src/principal.cpp b/Client/src/principal.cpp
index 2b04e38ed2260a4a972cdf2ddf8361365e6ee446..868e050b1efcdb9315fc978e520f11dd15c76148 100644 (file)
--- a/Client/src/principal.cpp
+++ b/Client/src/principal.cpp
@@ -22,9 +22,13 @@ Principal::Principal(BaseObjectType *co, const Glib::RefPtr<Gnome::Glade::Xml> &
        txt_view = 0;
        txt_target = txt_command = txt_args = 0;
        work_place = 0;
        txt_view = 0;
        txt_target = txt_command = txt_args = 0;
        work_place = 0;

-       lbl_nombre = lbl_color = lbl_flujo = 0;
+       lbl_cap_flujo = lbl_cap_extra = lbl_extra = lbl_nombre = lbl_color = lbl_flujo = 0;

 
        rg->get_widget("lbl_nombre", lbl_nombre);
 
        rg->get_widget("lbl_nombre", lbl_nombre);

+       rg->get_widget("lbl_extra", lbl_extra);
+       rg->get_widget("lbl_cap_extra", lbl_cap_extra);
+       rg->get_widget("lbl_cap_flujo", lbl_cap_flujo);
+       rg->get_widget("lbl_flujo", lbl_flujo);

        rg->get_widget("mnu_file_connect", conect);
        rg->get_widget("mnu_file_disconnect", mnu_disconnect);
        rg->get_widget("mnu_file_exit", exit);
        rg->get_widget("mnu_file_connect", conect);
        rg->get_widget("mnu_file_disconnect", mnu_disconnect);
        rg->get_widget("mnu_file_exit", exit);


@@ -50,13 +54,15 @@ Principal::Principal(BaseObjectType *co, const Glib::RefPtr<Gnome::Glade::Xml> &
 
        conexion = NULL;
        is_xml_loaded = false;
 
        conexion = NULL;
        is_xml_loaded = false;

-
+       last_selected = NULL;
+       update_ui.connect( SigC::slot(*this, &Principal::update_items_prop ) );

        load_xml_dispatch.connect( SigC::slot(*this, &Principal::loadXML ) );
 }
 
 Principal::~Principal()
 {
        load_xml_dispatch.connect( SigC::slot(*this, &Principal::loadXML ) );
 }
 
 Principal::~Principal()
 {

-       delete conexion;
+       if (conexion != NULL)
+               delete conexion;

 }
 
 void Principal::on_dlg_connect_ok()
 }
 
 void Principal::on_dlg_connect_ok()


@@ -80,12 +86,7 @@ void Principal::on_dlg_connect_ok()
                conexion->signal_finished().connect( SigC::slot(*this, &Principal::on_conexion_finished) );
                conexion->signal_frame_received().connect(SigC::slot(*this, &Principal::on_conexion_frame));
                // Lanzo la conexion!
                conexion->signal_finished().connect( SigC::slot(*this, &Principal::on_conexion_finished) );
                conexion->signal_frame_received().connect(SigC::slot(*this, &Principal::on_conexion_frame));
                // Lanzo la conexion!

-               try {
-                       conexion->run();
-               }
-               catch (...) {
-                       txt_view->get_buffer()->insert_at_cursor("no se puede correr conexion->run()!!!\n");
-               }
+               conexion->run();

        } else {
                txt_view->get_buffer()->insert_at_cursor("YA ESTAS CONECTADO\n");
        }
        } else {
                txt_view->get_buffer()->insert_at_cursor("YA ESTAS CONECTADO\n");
        }


@@ -101,10 +102,11 @@ void Principal::on_mnu_file_disconnect()
 {
        if (conexion == NULL) return;
 
 {
        if (conexion == NULL) return;
 

-       PlaQui::Server::Command c("connection", "stop");
+       PlaQui::Server::Command c("transmission", "stop");

        c.add_arg(conexion->get_host());
        c.add_arg(conexion->get_host());

-       c.add_arg(conexion->get_port());
+       c.add_arg("7528");

        conexion->send(c);
        conexion->send(c);

+       conexion->finish();

 }
 
 void Principal::on_mnu_file_connect()
 }
 
 void Principal::on_mnu_file_connect()


@@ -146,10 +148,25 @@ void Principal::on_mnu_help_about()
 
 bool Principal::on_item_clicked(GdkEventButton *e, ViewItem *i)
 {
 
 bool Principal::on_item_clicked(GdkEventButton *e, ViewItem *i)
 {

-       lbl_nombre->set_text(i->get_name());
+       

        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");
        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");

+
+       last_selected = i;
+       update_items_prop();
+}
+
+void Principal::update_items_prop()
+{
+       if (last_selected == NULL) return;
+
+       lbl_nombre->set_text(last_selected->get_name());
+       lbl_flujo->set_text(last_selected->get_actual_flow());
+       lbl_extra->set_text(last_selected->get_extra());
+
+       lbl_cap_flujo->set_text(last_selected->get_cap_flow());
+       lbl_cap_extra->set_text(last_selected->get_cap_extra());

 }
 
 void Principal::on_conexion_connected()
 }
 
 void Principal::on_conexion_connected()


@@ -158,14 +175,18 @@ void Principal::on_conexion_connected()
        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

-       PlaQui::Server::Command c("plant", "get");
-       c.add_arg("default");
-       conexion->send(c);
+       if (conexion != NULL) {
+               PlaQui::Server::Command c("plant", "get");
+               c.add_arg("default");
+               conexion->send(c);
+       }

 }
 
 void Principal::on_conexion_frame(const std::string &frame)
 {
 }
 
 void Principal::on_conexion_frame(const std::string &frame)
 {

-       std::cout << "LLEGO : " << frame << std::endl;
+       if (conexion != NULL) {
+               read_status_xml(frame);
+       }

 }
 
 void Principal::on_conexion_finished()
 }
 
 void Principal::on_conexion_finished()


@@ -175,8 +196,6 @@ void Principal::on_conexion_finished()
        conexion = NULL;
 }
 
        conexion = NULL;
 }
 

-#include <gdk/gdk.h>
-

 void Principal::on_conexion_ok(const std::string &body)
 {
        /* lo paso a la carga del XML */
 void Principal::on_conexion_ok(const std::string &body)
 {
        /* lo paso a la carga del XML */


@@ -186,6 +205,7 @@ void Principal::on_conexion_ok(const std::string &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");
                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");


@@ -201,7 +221,6 @@ void Principal::on_conexion_error(unsigned code)
        txt_view->get_buffer()->insert_at_cursor("El server dice que hay error : ");
        txt_view->get_buffer()->insert_at_cursor(s);
        txt_view->get_buffer()->insert_at_cursor("\n");
        txt_view->get_buffer()->insert_at_cursor("El server dice que hay error : ");
        txt_view->get_buffer()->insert_at_cursor(s);
        txt_view->get_buffer()->insert_at_cursor("\n");

-       

 }
 
 void Principal::on_get_clicked()
 }
 
 void Principal::on_get_clicked()


@@ -210,7 +229,6 @@ void Principal::on_get_clicked()
                txt_view->get_buffer()->insert_at_cursor("SIN CONEXION\n");
                return;
        }
                txt_view->get_buffer()->insert_at_cursor("SIN CONEXION\n");
                return;
        }

-

        
        PlaQui::Server::Command command(txt_target->get_text(), txt_command->get_text());
        command.add_arg( txt_args->get_text() );
        
        PlaQui::Server::Command command(txt_target->get_text(), txt_command->get_text());
        command.add_arg( txt_args->get_text() );


@@ -265,6 +283,13 @@ void Principal::loadXML()
                        items = items->next;
                }
        }
                        items = items->next;
                }
        }

+
+       // Ya cargado el XML, mando un msg para empezar a recibir los frames!
+       PlaQui::Server::Command c("transmission", "start");
+       c.add_arg("default");
+       c.add_arg(conexion->get_host());
+       c.add_arg("7528");
+       conexion->send(c);

 }
 
 void Principal::loadBomba(xmlNodePtr nodo)
 }
 
 void Principal::loadBomba(xmlNodePtr nodo)


@@ -469,3 +494,93 @@ void Principal::loadDrain(xmlNodePtr nodo)
        // los agrego al hash
        mapItems[name] = b;
 }
        // los agrego al hash
        mapItems[name] = b;
 }

+
+void Principal::read_status_xml(const std::string &frame)
+{
+       std::string item_name;
+       xmlDocPtr document;
+       document = xmlParseMemory(frame.c_str(),frame.size());
+       if (document == NULL) {
+               std::cout << "read_status_xml::no se creo documento" << std::endl;
+               return;
+       }
+       
+       xmlNodePtr nodo, items, props;
+       nodo = document->children;
+       float tmp;
+       bool tmp_b;
+
+       if (strcmp((char *)nodo->name, "plantstatus") == 0) {
+               items = nodo->children;
+               while (items != NULL) {
+                       if (items->type == XML_ELEMENT_NODE) {
+                               tmp = -1;
+                               item_name = "";
+                               if (xmlStrcmp(items->name, BAD_CAST"float")==0) {
+                                       tmp = get_float_from_xml(items->children);
+                                       item_name = (char *)xmlGetProp(items, BAD_CAST"name");
+                                       mapItems[item_name]->set_actual_flow(tmp);
+                               } else if (xmlStrcmp(items->name, BAD_CAST"exclusa")==0) {
+                                       tmp_b = get_bool_from_xml(items->children);
+                                       item_name = (char *)xmlGetProp(items, BAD_CAST"name");
+                                       mapItems[item_name]->set_open(tmp_b);
+                               } else if (xmlStrcmp(items->name, BAD_CAST"pump")==0) {
+                                       tmp_b = get_bool_from_xml(items->children);
+                                       item_name = (char *)xmlGetProp(items, BAD_CAST"name");
+                                       mapItems[item_name]->set_open(tmp_b);
+                               } else if (xmlStrcmp(items->name, BAD_CAST"tank")==0) {
+                                       xmlNodePtr nodo_tmp = items->children;
+                                       float cap, lit;
+                                       cap = lit = -1;
+                                       while (nodo_tmp != NULL) {
+                                               if (nodo_tmp->type == XML_ELEMENT_NODE) {
+                                                       if (xmlStrcmp(nodo_tmp->name, BAD_CAST"capacity")==0)
+                                                               cap = atof( (char *)XML_GET_CONTENT(nodo_tmp->children) );
+                                                       else if (xmlStrcmp(nodo_tmp->name, BAD_CAST"litros")==0)
+                                                               lit= atof( (char *)XML_GET_CONTENT(nodo_tmp->children) );
+                                               }
+                                               nodo_tmp = nodo_tmp->next;
+                                       }
+                                       item_name = (char *)xmlGetProp(items, BAD_CAST"name");
+                                       mapItems[item_name]->set_actual_flow(cap);
+                                       mapItems[item_name]->set_extra(lit);
+                               }
+                       }
+                       items = items->next;
+               }
+
+               // Actualizo la UI
+               update_ui();
+       }
+}
+
+float Principal::get_float_from_xml(xmlNodePtr nodo)
+{
+       float tmp = -1;
+       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) );
+                               break;
+                       }
+               }
+               nodo = nodo->next;
+       }
+       return tmp;
+}
+
+bool Principal::get_bool_from_xml(xmlNodePtr nodo)
+{
+       std::string tmp;
+       while (nodo != NULL) {
+               if (nodo->type == XML_ELEMENT_NODE) {
+                       if (xmlStrcmp(nodo->name, BAD_CAST"active")==0) {
+                               tmp = (char *)XML_GET_CONTENT(nodo->children);
+                               break;
+                       }
+               }
+               nodo = nodo->next;
+       }
+       return tmp == "true";
+}
+