- 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 2e8d7086b926a4994d5c5c9f05700280bb865834..868e050b1efcdb9315fc978e520f11dd15c76148 100644 (file)
--- a/Client/src/principal.cpp
+++ b/Client/src/principal.cpp
@@ -54,7 +54,8 @@ 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 ) );
 }
 
        load_xml_dispatch.connect( SigC::slot(*this, &Principal::loadXML ) );
 }
 


@@ -147,16 +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());
-       lbl_flujo->set_text(i->get_actual_flow());
-       lbl_extra->set_text(i->get_extra());
-
-       lbl_cap_flujo->set_text(i->get_cap_flow());
-       lbl_cap_extra->set_text(i->get_cap_extra());

        
        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()


@@ -174,7 +184,9 @@ void Principal::on_conexion_connected()
 
 void Principal::on_conexion_frame(const std::string &frame)
 {
 
 void Principal::on_conexion_frame(const std::string &frame)
 {

-       read_status_xml(frame);
+       if (conexion != NULL) {
+               read_status_xml(frame);
+       }

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


@@ -499,7 +511,6 @@ void Principal::read_status_xml(const std::string &frame)
        bool tmp_b;
 
        if (strcmp((char *)nodo->name, "plantstatus") == 0) {
        bool tmp_b;
 
        if (strcmp((char *)nodo->name, "plantstatus") == 0) {

-               std::cout << "LEGO EL XML!" << std::endl;

                items = nodo->children;
                while (items != NULL) {
                        if (items->type == XML_ELEMENT_NODE) {
                items = nodo->children;
                while (items != NULL) {
                        if (items->type == XML_ELEMENT_NODE) {


@@ -513,11 +524,33 @@ void Principal::read_status_xml(const std::string &frame)
                                        tmp_b = get_bool_from_xml(items->children);
                                        item_name = (char *)xmlGetProp(items, BAD_CAST"name");
                                        mapItems[item_name]->set_open(tmp_b);
                                        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;
                }
                        }
                        items = items->next;
                }

+
+               // Actualizo la UI
+               update_ui();

        }
 }
 
        }
 }