algunos cambios para tratar de obtener el estado segun los frames que envia el servidor.

diff --git a/Client/include/item.h b/Client/include/item.h
index c77df412cfcae4e1430466547bba192363e1cdb1..dd845d48099f689b52215e3d0d2fa6b937aa488d 100644 (file)
--- a/Client/include/item.h
+++ b/Client/include/item.h
@@ -16,10 +16,13 @@ public:
        Glib::ustring get_name();
        void set_position(int _x, int _y);
        void set_name(Glib::ustring _name);
        Glib::ustring get_name();
        void set_position(int _x, int _y);
        void set_name(Glib::ustring _name);

+       void set_actual_flow(float f) { actual_flow = f; }
+       std::string get_actual_flow();

 protected:
        Glib::ustring name;
        Gtk::Image image;
        int x, y;
 protected:
        Glib::ustring name;
        Gtk::Image image;
        int x, y;

+       float actual_flow;

 };
 
 #endif
 };
 
 #endif

diff --git a/Client/include/principal.h b/Client/include/principal.h
index 8cfe7f24d8e4d32df2e1a66bd6766b428136e798..c3f2d3234b46ea160ae09052cb66c654298edcd7 100644 (file)
--- a/Client/include/principal.h
+++ b/Client/include/principal.h
@@ -23,6 +23,9 @@ protected:
        // Simplemente lo busco como map["nombre"]
        std::map<const std::string, ViewItem *> mapItems;
 
        // Simplemente lo busco como map["nombre"]
        std::map<const std::string, ViewItem *> mapItems;
 

+       // Actualiza el estado de una planta
+       void read_status_xml(const std::string &frame);
+       float get_float_from_xml(xmlNodePtr nodo);

        // Funciones de carga del XML
        bool is_xml_loaded;
        void loadXML();
        // Funciones de carga del XML
        bool is_xml_loaded;
        void loadXML();

diff --git a/Client/src/item.cpp b/Client/src/item.cpp
index 418647ec589f1bccd80856d16504a7bd2e89af34..4ce5846dfa7d2904b2b4745e49977e42b0d45b26 100644 (file)
--- a/Client/src/item.cpp
+++ b/Client/src/item.cpp
@@ -1,10 +1,12 @@
 #include "item.h"
 #include "item.h"

-
+#include <sstream>
+#include <string>

 
 ViewItem::ViewItem(Glib::ustring _name):Gtk::EventBox(),image()
 {
        name = _name;
        set_events(Gdk::BUTTON_PRESS_MASK);
 
 ViewItem::ViewItem(Glib::ustring _name):Gtk::EventBox(),image()
 {
        name = _name;
        set_events(Gdk::BUTTON_PRESS_MASK);

+       actual_flow = -1;

        add(image);
 }
 
        add(image);
 }
 


@@ -35,3 +37,13 @@ Glib::ustring ViewItem::get_name()
        return name;
 }
 
        return name;
 }
 

+std::string ViewItem::get_actual_flow()
+{
+       std::stringstream ss;
+       std::string s;
+
+       ss << actual_flow;
+       ss >> s;
+       return s;
+}
+

diff --git a/Client/src/principal.cpp b/Client/src/principal.cpp
index 2b04e38ed2260a4a972cdf2ddf8361365e6ee446..0e965e331469f70bc7fe8c7b6e26bf06e3f1ef43 100644 (file)
--- a/Client/src/principal.cpp
+++ b/Client/src/principal.cpp
@@ -25,6 +25,7 @@ Principal::Principal(BaseObjectType *co, const Glib::RefPtr<Gnome::Glade::Xml> &
        lbl_nombre = lbl_color = lbl_flujo = 0;
 
        rg->get_widget("lbl_nombre", lbl_nombre);
        lbl_nombre = lbl_color = lbl_flujo = 0;
 
        rg->get_widget("lbl_nombre", lbl_nombre);

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


@@ -147,6 +148,7 @@ void Principal::on_mnu_help_about()
 bool Principal::on_item_clicked(GdkEventButton *e, ViewItem *i)
 {
        lbl_nombre->set_text(i->get_name());
 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");
        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");


@@ -165,7 +167,7 @@ void Principal::on_conexion_connected()
 
 void Principal::on_conexion_frame(const std::string &frame)
 {
 
 void Principal::on_conexion_frame(const std::string &frame)
 {

-       std::cout << "LLEGO : " << frame << std::endl;
+       read_status_xml(frame);

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


@@ -175,8 +177,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 */


@@ -185,7 +185,14 @@ void Principal::on_conexion_ok(const std::string &body)
                //loadXML(body);
                xml_body = body;
                load_xml_dispatch();
                //loadXML(body);
                xml_body = body;
                load_xml_dispatch();

+               // 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("");
+               c.add_arg("7528");
+               conexion->send(c);

        } else {
        } 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");


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

+

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


@@ -469,3 +477,49 @@ 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;
+
+       if (strcmp((char *)nodo->name, "plantastatus") == 0) {
+               items = nodo->children;
+               while (items != NULL) {
+                       tmp = -1;
+                       if (items->type == XML_ELEMENT_NODE) {
+                               if (xmlStrcmp(items->name, BAD_CAST"conduct")==0) {
+                                       tmp = get_float_from_xml(items->children);
+                                       item_name = (char *)xmlGetProp(nodo, BAD_CAST"nombre");
+                                       mapItems[item_name]->set_actual_flow(tmp);
+                               }
+                       }
+                       items = items->next;
+               }
+       }
+}
+
+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;
+}
+