- 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 297354396344d69604cc100720afbc99c9d23b47..868e050b1efcdb9315fc978e520f11dd15c76148 100644 (file)
--- a/Client/src/principal.cpp
+++ b/Client/src/principal.cpp
@@ -22,9 +22,12 @@ Principal::Principal(BaseObjectType *co, const Glib::RefPtr<Gnome::Glade::Xml> &
        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_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);
@@ -51,13 +54,15 @@ Principal::Principal(BaseObjectType *co, const Glib::RefPtr<Gnome::Glade::Xml> &
 
        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()
 {
-       delete conexion;
+       if (conexion != NULL)
+               delete conexion;
 }
 
 void Principal::on_dlg_connect_ok()
@@ -97,6 +102,10 @@ void Principal::on_mnu_file_disconnect()
 {
        if (conexion == NULL) return;
 
+       PlaQui::Server::Command c("transmission", "stop");
+       c.add_arg(conexion->get_host());
+       c.add_arg("7528");
+       conexion->send(c);
        conexion->finish();
 }
 
@@ -139,11 +148,25 @@ void Principal::on_mnu_help_about()
 
 bool Principal::on_item_clicked(GdkEventButton *e, ViewItem *i)
 {
-       lbl_nombre->set_text(i->get_name());
-       lbl_flujo->set_text(i->get_actual_flow());
+       
        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()
@@ -152,15 +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
-       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)
 {
-       std::cout << "FRAME" << std::endl;
-       read_status_xml(frame);
+       if (conexion != NULL) {
+               read_status_xml(frame);
+       }
 }
 
 void Principal::on_conexion_finished()
@@ -482,22 +508,49 @@ void Principal::read_status_xml(const std::string &frame)
        xmlNodePtr nodo, items, props;
        nodo = document->children;
        float tmp;
+       bool tmp_b;
 
        if (strcmp((char *)nodo->name, "plantstatus") == 0) {
-               std::cout << "LEGO EL XML!" << std::endl;
                items = nodo->children;
                while (items != NULL) {
-                       tmp = -1;
                        if (items->type == XML_ELEMENT_NODE) {
-                               if (xmlStrcmp(items->name, BAD_CAST"conduct")==0) {
+                               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");
-                                       std::cout << "CONDUCT :: " << 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);
+                                       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();
        }
 }
 
@@ -513,7 +566,21 @@ float Principal::get_float_from_xml(xmlNodePtr nodo)
                }
                nodo = nodo->next;
        }
-       std::cout << "get_float == " << tmp << std::endl;
        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";
+}
+