Se agrega un archivo que falto subir en el ultimo commit XD

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

diff --git a/Client/src/principal.cpp b/Client/src/principal.cpp
index 05387367d5175332da9cf58f1344afae9c392f0f..46ec40b3cb913471c37403fb829c9e620a916f80 100644 (file)
--- a/Client/src/principal.cpp
+++ b/Client/src/principal.cpp
@@ -1,6 +1,4 @@
 
 

-
-

 #include "principal.h"
 #include <iostream>
 #include <sstream>
 #include "principal.h"
 #include <iostream>
 #include <sstream>


@@ -11,21 +9,38 @@
 #include "item_tank.h"
 #include "item_pump.h"
 #include "item_union.h"
 #include "item_tank.h"
 #include "item_pump.h"
 #include "item_union.h"

+#include "item_drain.h"
+#include "item_not.h"
+#include "item_or.h"
+#include "item_and.h"
+#include <unistd.h>
+#include <glibmm/thread.h>

 
 Principal::Principal(BaseObjectType *co, const Glib::RefPtr<Gnome::Glade::Xml> &rg):Gtk::Window(co),refXml(rg)
 {
 
 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;
+       Gtk::MenuItem *conect=0, *exit=0, *about=0, *mnu_prop=0, *mnu_disconnect=0;

        Gtk::Button *btn_get=0, *bar_connect=0;
        txt_view = 0;
        txt_target = txt_command = txt_args = 0;
        work_place = 0;
        Gtk::Button *btn_get=0, *bar_connect=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;
+       btn_simulate = btn_pause = 0;

 
 

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

        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_connect", conect);

+       rg->get_widget("mnu_file_disconnect", mnu_disconnect);

        rg->get_widget("mnu_file_exit", exit);
        rg->get_widget("mnu_help_about", about);
        rg->get_widget("mnu_prop", mnu_prop);
        rg->get_widget("mnu_file_exit", exit);
        rg->get_widget("mnu_help_about", about);
        rg->get_widget("mnu_prop", mnu_prop);

+       rg->get_widget_derived("dlg_property", dlg_property);

        rg->get_widget_derived("dlgConectar", dlg_conectar);
        rg->get_widget("btn_get", btn_get);
        rg->get_widget("txt_view", txt_view);
        rg->get_widget_derived("dlgConectar", dlg_conectar);
        rg->get_widget("btn_get", btn_get);
        rg->get_widget("txt_view", txt_view);


@@ -36,20 +51,91 @@ Principal::Principal(BaseObjectType *co, const Glib::RefPtr<Gnome::Glade::Xml> &
        rg->get_widget("work_place", work_place);
        rg->get_widget("ico_conected", ico_conected);
 
        rg->get_widget("work_place", work_place);
        rg->get_widget("ico_conected", ico_conected);
 

+       work_place->signal_expose_event().connect( SigC::slot(*this, &Principal::on_workplace_expose_event) );
+       dlg_property->get_ok_button()->signal_clicked().connect( SigC::slot(*this, &Principal::on_dlg_property_ok) );

        dlg_conectar->get_ok_button()->signal_clicked().connect( SigC::slot(*this, &Principal::on_dlg_connect_ok) );
        dlg_conectar->get_ok_button()->signal_clicked().connect( SigC::slot(*this, &Principal::on_dlg_connect_ok) );

-       mnu_prop->signal_activate().connect( SigC::slot(*this, &Principal::on_mnu_prop));
+       mnu_prop->signal_activate().connect( SigC::slot(*this, &Principal::on_mnu_property));
+       mnu_disconnect->signal_activate().connect( SigC::slot(*this, &Principal::on_mnu_file_disconnect));

        conect->signal_activate().connect( SigC::slot(*this, &Principal::on_mnu_file_connect));
        bar_connect->signal_clicked().connect( SigC::slot(*this, &Principal::on_mnu_file_connect));
        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_get->signal_clicked().connect( SigC::slot(*this, &Principal::on_get_clicked) );
        conect->signal_activate().connect( SigC::slot(*this, &Principal::on_mnu_file_connect));
        bar_connect->signal_clicked().connect( SigC::slot(*this, &Principal::on_mnu_file_connect));
        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_get->signal_clicked().connect( SigC::slot(*this, &Principal::on_get_clicked) );

-
+       btn_activar->signal_clicked().connect( SigC::slot(*this, &Principal::on_btn_activar_clicked) );
+       btn_simulate->signal_clicked().connect( SigC::slot(*this, &Principal::on_btn_simulate_clicked) );
+       btn_pause->signal_clicked().connect( SigC::slot(*this, &Principal::on_btn_pause_clicked) );
+       

        conexion = NULL;
        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 ) );
+       gc = Gdk::GC::create(get_window());

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

-       delete conexion;
+       if (conexion) {
+               conexion->finish();
+       }
+       // Espera a que termine realmente.
+       while (conexion) {
+               Glib::usleep(10000); // 10 milisegundos
+       }
+}
+
+void Principal::on_realize()
+{
+       Gtk::Window::on_realize();
+}
+
+bool Principal::on_workplace_expose_event(GdkEventExpose *e)
+{
+       Glib::RefPtr<Gdk::Window> window = work_place->get_window();
+
+       int x1, y1, x2, y2;
+       // Dibujo las lineas
+       std::map<const std::string, ViewItem *>::iterator i;
+       for(i=mapItems.begin(); i!=mapItems.end(); i++) {
+               if (dynamic_cast<ViewAnd *>(i->second) || dynamic_cast<ViewOr *>(i->second) || dynamic_cast<ViewNot *>(i->second)) {
+                       x1 = i->second->x + i->second->in_x;
+                       y1 = i->second->y + i->second->in_y;
+                       std::list<std::string>::iterator linea;
+                       for(linea=i->second->in_lines.begin(); linea!=i->second->in_lines.end(); linea++) {
+                               ViewItem *tmp = find_item(*linea);
+                               x2 = tmp->x + tmp->out_x;
+                               y2 = tmp->y + tmp->out_y;
+                               gc->set_line_attributes(3, Gdk::LINE_SOLID, Gdk::CAP_NOT_LAST, Gdk::JOIN_MITER);
+                               window->draw_line(gc, x2+tmp->item_offset_x, y2+tmp->item_offset_y, x2+tmp->item_offset_x, y1+i->second->offset_y);
+                               window->draw_line(gc, x2+tmp->item_offset_x, y1+i->second->offset_y, x1+i->second->offset_x, y1+i->second->offset_y);
+                               window->draw_line(gc, x1, y1, x1+i->second->offset_x, y1+i->second->offset_y);
+                               window->draw_line(gc, x2, y2, x2+tmp->item_offset_x, y2+tmp->item_offset_y);
+                       }
+                       x1 = i->second->x + i->second->out_x;
+                       y1 = i->second->y + i->second->out_y;
+                       for(linea=i->second->out_lines.begin(); linea!=i->second->out_lines.end(); linea++) {
+                               ViewItem *tmp = find_item(*linea);
+                               x2 = tmp->x + tmp->in_x;
+                               y2 = tmp->y + tmp->in_y;
+                               gc->set_line_attributes(3, Gdk::LINE_SOLID, Gdk::CAP_NOT_LAST, Gdk::JOIN_MITER);
+                               window->draw_line(gc, x1+i->second->offset_x, y1+i->second->offset_y, x1+i->second->offset_x, y2+tmp->item_offset_y);
+                               window->draw_line(gc, x1+i->second->offset_x, y2+tmp->item_offset_y, x2+tmp->item_offset_x, y2+tmp->item_offset_y);
+                               window->draw_line(gc, x1, y1, x1+i->second->offset_x, y1+i->second->offset_y);
+                               window->draw_line(gc, x2, y2, x2+tmp->item_offset_x, y2+tmp->item_offset_y);
+                       }
+               }
+       }
+}
+
+ViewItem *Principal::find_item(std::string &_name)
+{
+       std::map<const std::string, ViewItem *>::iterator i;
+       for(i=mapItems.begin(); i!=mapItems.end(); i++) {
+               if (i->second->get_name() == _name) {
+                       return i->second;
+               }
+       }
+       return NULL;

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


@@ -61,25 +147,26 @@ void Principal::on_dlg_connect_ok()
                }
                catch (...) {
                        txt_view->get_buffer()->insert_at_cursor("NO SE PUDO CREAR OBJETO\n");
                }
                catch (...) {
                        txt_view->get_buffer()->insert_at_cursor("NO SE PUDO CREAR OBJETO\n");

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

                        return;
                }
 
                // Conecto las señales
                conexion->signal_ok_received().connect( SigC::slot(*this, &Principal::on_conexion_ok) );
                conexion->signal_error_received().connect( SigC::slot(*this, &Principal::on_conexion_error) );
                        return;
                }
 
                // Conecto las señales
                conexion->signal_ok_received().connect( SigC::slot(*this, &Principal::on_conexion_ok) );
                conexion->signal_error_received().connect( SigC::slot(*this, &Principal::on_conexion_error) );

-               conexion->signal_connected().connect( SigC::slot(*this, &Principal::on_conexion_connected) );

                conexion->signal_finished().connect( SigC::slot(*this, &Principal::on_conexion_finished) );
                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!
                // Lanzo la conexion!

-               try {
-                       conexion->run();
-               }
-               catch (...) {
-                       txt_view->get_buffer()->insert_at_cursor("no se puede correr conexion->run()!!!\n");
-               }
-       } else {
-               txt_view->get_buffer()->insert_at_cursor("YA ESTAS CONECTADO\n");
+               conexion->run();
+               txt_view->get_buffer()->insert_at_cursor("CONNECTED\n");
+               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);

        }
        dlg_conectar->hide();
 }
        }
        dlg_conectar->hide();
 }


@@ -89,6 +176,38 @@ void Principal::on_mnu_file_exit()
        Gtk::Main::quit();
 }
 
        Gtk::Main::quit();
 }
 

+void Principal::on_btn_activar_clicked()
+{
+       if ((conexion == NULL) || (last_selected == NULL)) return;
+
+       PlaQui::Server::Command c("plant", "set");
+       c.add_arg("default");
+       c.add_arg(last_selected->get_name());
+       c.add_arg("open");
+       
+       if (last_selected->get_open())
+               c.add_arg("false");
+       else
+               c.add_arg("true");
+
+       conexion->send(c);
+}
+
+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);
+       PlaQui::Server::Command c2("connection", "stop");
+       c2.add_arg(conexion->get_host());
+       c2.add_arg(conexion->get_port());
+       conexion->send(c2);
+
+}
+

 void Principal::on_mnu_file_connect()
 {
        dlg_conectar->show();
 void Principal::on_mnu_file_connect()
 {
        dlg_conectar->show();


@@ -128,16 +247,42 @@ 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::on_conexion_connected()
+void Principal::update_items_prop()

 {
 {

-       txt_view->get_buffer()->insert_at_cursor("CONNECTED\n");
-       ico_conected->set( Gtk::Stock::YES , Gtk::IconSize(Gtk::ICON_SIZE_LARGE_TOOLBAR));
+       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());
+
+       color_preview->modify_bg(Gtk::STATE_NORMAL, last_selected->get_color());
+       color_preview->queue_draw();
+
+       // Mando a redibujar a todos los items
+       std::map<const std::string, ViewItem *>::iterator i;
+       for(i=mapItems.begin(); i!=mapItems.end(); i++) {
+               i->second->queue_draw();
+       }
+
+}
+
+void Principal::on_conexion_frame(const std::string &frame)
+{
+       if (conexion != NULL) {
+               read_status_xml(frame);
+       }

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


@@ -145,11 +290,28 @@ void Principal::on_conexion_finished()
        txt_view->get_buffer()->insert_at_cursor("HANG UP\n");
        ico_conected->set( Gtk::Stock::NO , Gtk::IconSize(Gtk::ICON_SIZE_LARGE_TOOLBAR));
        conexion = NULL;
        txt_view->get_buffer()->insert_at_cursor("HANG UP\n");
        ico_conected->set( Gtk::Stock::NO , Gtk::IconSize(Gtk::ICON_SIZE_LARGE_TOOLBAR));
        conexion = NULL;

+       // Elimino la planta    
+       std::map<const std::string, ViewItem *>::iterator i;
+       for(i=mapItems.begin(); i!=mapItems.end(); i++) {
+               delete i->second;
+       }
+       mapItems.clear();

 }
 
 }
 

-void Principal::on_conexion_ok()
+void Principal::on_conexion_ok(const std::string &body)

 {
 {

-       txt_view->get_buffer()->insert_at_cursor("El server dice que ta' todo ok!\n");
+       /* 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 {
+               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");
+       }

 }
 
 void Principal::on_conexion_error(unsigned code)
 }
 
 void Principal::on_conexion_error(unsigned code)


@@ -161,15 +323,14 @@ 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()
 {
        if (conexion == NULL) {
                txt_view->get_buffer()->insert_at_cursor("SIN CONEXION\n");
 }
 
 void Principal::on_get_clicked()
 {
        if (conexion == NULL) {
                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() );


@@ -183,15 +344,19 @@ void Principal::on_get_clicked()
 
 }
 
 
 }
 

-void Principal::on_mnu_prop()
+void Principal::loadXML()

 {
 {

+       // ya lo cargue
+       if (is_xml_loaded) return;
+

        /* Parseo de ejemplo de un XML desde archivo */
        xmlDocPtr document;
        /* Parseo de ejemplo de un XML desde archivo */
        xmlDocPtr document;

-       document = xmlParseFile("test.xml");
+       document = xmlParseMemory(xml_body.c_str(),xml_body.size());

        if (document == NULL) {
        if (document == NULL) {

+               std::cout << "EEERRRRRRROOOOOOOOOO" << std::endl;

                return;
        }
                return;
        }

-
+       is_xml_loaded = true;

        /* bien, el archivo se parseo bien! */
        xmlNodePtr nodo, items;
        nodo = document->children;
        /* bien, el archivo se parseo bien! */
        xmlNodePtr nodo, items;
        nodo = document->children;


@@ -212,11 +377,135 @@ void Principal::on_mnu_prop()
                                        loadTank(items);
                                } else if (xmlStrcmp(items->name, BAD_CAST"empalme")==0) {
                                        loadUnion(items);
                                        loadTank(items);
                                } else if (xmlStrcmp(items->name, BAD_CAST"empalme")==0) {
                                        loadUnion(items);

+                               } else if (xmlStrcmp(items->name, BAD_CAST"drenaje")==0) {
+                                       loadDrain(items);
+                               } else if (xmlStrcmp(items->name, BAD_CAST"and")==0) {
+                                       loadAnd(items);
+                               } else if (xmlStrcmp(items->name, BAD_CAST"or")==0) {
+                                       loadOr(items);
+                               } else if (xmlStrcmp(items->name, BAD_CAST"not")==0) {
+                                       loadNot(items);

                                }
                                }

+

                        }
                        items = items->next;
                }
        }
                        }
                        items = items->next;
                }
        }

+
+       xmlFreeDoc(document);
+
+       // 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::loadNot(xmlNodePtr nodo)
+{
+       std::string name = (char *)xmlGetProp(nodo, BAD_CAST"nombre");
+       std::string id = (char *)xmlGetProp(nodo, BAD_CAST"id");
+       int orientacion=0, x, y;
+
+       ViewNot *p;
+       nodo = nodo->children;
+       while (nodo != NULL) {
+               if (nodo->type == XML_ELEMENT_NODE) {
+                       if (xmlStrcmp(nodo->name, BAD_CAST"orientacion") == 0) {
+                               orientacion = atoi( (char *)XML_GET_CONTENT(nodo->children) );
+                               p = new ViewNot(name, orientacion);
+                       } else if (xmlStrcmp(nodo->name, BAD_CAST"x") == 0) {
+                               x = atoi( (char *)XML_GET_CONTENT(nodo->children) );
+                       } else if (xmlStrcmp(nodo->name, BAD_CAST"y") == 0) {
+                               y = atoi( (char *)XML_GET_CONTENT(nodo->children) );
+                       } else if (xmlStrcmp(nodo->name, BAD_CAST"salida") == 0) {
+                               p->out_lines.push_back((char *)XML_GET_CONTENT(nodo->children));
+                       } else if (xmlStrcmp(nodo->name, BAD_CAST"entrada") == 0) {
+                               p->in_lines.push_back((char *)XML_GET_CONTENT(nodo->children));
+                       }
+               }
+               nodo = nodo->next;
+       }
+       
+       p->signal_button_press_event().connect(SigC::bind( SigC::slot(*this, &Principal::on_item_clicked), p) );
+       p->set_position(x,y);
+       work_place->put(*p, x, y);
+       p->show();
+       // los agrego al hash
+       mapItems[name] = p;
+}
+
+void Principal::loadOr(xmlNodePtr nodo)
+{
+       std::string name = (char *)xmlGetProp(nodo, BAD_CAST"nombre");
+       std::string id = (char *)xmlGetProp(nodo, BAD_CAST"id");
+       int orientacion=0, x, y;
+
+       ViewOr *p;
+
+       nodo = nodo->children;
+       while (nodo != NULL) {
+               if (nodo->type == XML_ELEMENT_NODE) {
+                       if (xmlStrcmp(nodo->name, BAD_CAST"orientacion") == 0) {
+                               orientacion = atoi( (char *)XML_GET_CONTENT(nodo->children) );
+                               p = new ViewOr(name, orientacion);
+                       } else if (xmlStrcmp(nodo->name, BAD_CAST"x") == 0) {
+                               x = atoi( (char *)XML_GET_CONTENT(nodo->children) );
+                       } else if (xmlStrcmp(nodo->name, BAD_CAST"y") == 0) {
+                               y = atoi( (char *)XML_GET_CONTENT(nodo->children) );
+                       } else if (xmlStrcmp(nodo->name, BAD_CAST"salida") == 0) {
+                               p->out_lines.push_back((char *)XML_GET_CONTENT(nodo->children));
+                       } else if (xmlStrcmp(nodo->name, BAD_CAST"entrada") == 0) {
+                               p->in_lines.push_back((char *)XML_GET_CONTENT(nodo->children));
+                       }
+               }
+               nodo = nodo->next;
+       }
+
+       p->signal_button_press_event().connect(SigC::bind( SigC::slot(*this, &Principal::on_item_clicked), p) );
+       p->set_position(x,y);
+       work_place->put(*p, x, y);
+       p->show();
+       // los agrego al hash
+       mapItems[name] = p;
+}
+
+void Principal::loadAnd(xmlNodePtr nodo)
+{
+       std::string name = (char *)xmlGetProp(nodo, BAD_CAST"nombre");
+       std::string id = (char *)xmlGetProp(nodo, BAD_CAST"id");
+       int orientacion=0, x, y;
+       float flujo;
+       xmlNodePtr inicial = nodo;
+
+       ViewAnd *p;
+       
+       nodo = nodo->children;
+       while (nodo != NULL) {
+               if (nodo->type == XML_ELEMENT_NODE) {
+                       if (xmlStrcmp(nodo->name, BAD_CAST"orientacion") == 0) {
+                               orientacion = atoi( (char *)XML_GET_CONTENT(nodo->children) );
+                               p = new ViewAnd(name, orientacion);
+                       } else if (xmlStrcmp(nodo->name, BAD_CAST"x") == 0) {
+                               x = atoi( (char *)XML_GET_CONTENT(nodo->children) );
+                       } else if (xmlStrcmp(nodo->name, BAD_CAST"y") == 0) {
+                               y = atoi( (char *)XML_GET_CONTENT(nodo->children) );
+                       } else if (xmlStrcmp(nodo->name, BAD_CAST"salida") == 0) {
+                               p->out_lines.push_back((char *)XML_GET_CONTENT(nodo->children));
+                       } else if (xmlStrcmp(nodo->name, BAD_CAST"entrada") == 0) {
+                               p->in_lines.push_back((char *)XML_GET_CONTENT(nodo->children));
+                       }
+               }
+               nodo = nodo->next;
+       }
+
+       p->signal_button_press_event().connect(SigC::bind( SigC::slot(*this, &Principal::on_item_clicked), p) );
+       p->set_position(x,y);
+       work_place->put(*p, x, y);
+       p->show();
+       // los agrego al hash
+       mapItems[name] = p;

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


@@ -239,7 +528,7 @@ void Principal::loadBomba(xmlNodePtr nodo)
        }
 
        // listo, ya recolecte todos los datos, ahora creo el objeto!
        }
 
        // listo, ya recolecte todos los datos, ahora creo el objeto!

-       ViewPump *b = Gtk::manage( new ViewPump(name, orientacion) );
+       ViewPump *b = new ViewPump(name, orientacion);

        b->signal_button_press_event().connect(SigC::bind( SigC::slot(*this, &Principal::on_item_clicked), b) );
        b->set_position(x,y);
        work_place->put(*b, x, y);
        b->signal_button_press_event().connect(SigC::bind( SigC::slot(*this, &Principal::on_item_clicked), b) );
        b->set_position(x,y);
        work_place->put(*b, x, y);


@@ -268,7 +557,7 @@ void Principal::loadCodo(xmlNodePtr nodo)
        }
 
        // listo, ya recolecte todos los datos, ahora creo el objeto!
        }
 
        // listo, ya recolecte todos los datos, ahora creo el objeto!

-       ViewItem *b = Gtk::manage( new ViewCodo(name, orientacion) );
+       ViewItem *b = new ViewCodo(name, orientacion);

        b->signal_button_press_event().connect(SigC::bind( SigC::slot(*this, &Principal::on_item_clicked), b) );
        b->set_position(x,y);
        work_place->put(*b, x, y);
        b->signal_button_press_event().connect(SigC::bind( SigC::slot(*this, &Principal::on_item_clicked), b) );
        b->set_position(x,y);
        work_place->put(*b, x, y);


@@ -297,7 +586,7 @@ void Principal::loadConduct(xmlNodePtr nodo)
        }
 
        // listo, ya recolecte todos los datos, ahora creo el objeto!
        }
 
        // listo, ya recolecte todos los datos, ahora creo el objeto!

-       ViewConduct *b = Gtk::manage( new ViewConduct(name, orientacion) );
+       ViewConduct *b = new ViewConduct(name, orientacion);

        b->signal_button_press_event().connect(SigC::bind( SigC::slot(*this, &Principal::on_item_clicked), b) );
        b->set_position(x,y);
        work_place->put(*b, x, y);
        b->signal_button_press_event().connect(SigC::bind( SigC::slot(*this, &Principal::on_item_clicked), b) );
        b->set_position(x,y);
        work_place->put(*b, x, y);


@@ -326,7 +615,7 @@ void Principal::loadExclusa(xmlNodePtr nodo)
        }
 
        // listo, ya recolecte todos los datos, ahora creo el objeto!
        }
 
        // listo, ya recolecte todos los datos, ahora creo el objeto!

-       ViewExclusa *b = Gtk::manage( new ViewExclusa(name, orientacion) );
+       ViewExclusa *b = new ViewExclusa(name, orientacion);

        b->signal_button_press_event().connect(SigC::bind( SigC::slot(*this, &Principal::on_item_clicked), b) );
        b->set_position(x,y);
        work_place->put(*b, x, y);
        b->signal_button_press_event().connect(SigC::bind( SigC::slot(*this, &Principal::on_item_clicked), b) );
        b->set_position(x,y);
        work_place->put(*b, x, y);


@@ -355,7 +644,7 @@ void Principal::loadTank(xmlNodePtr nodo)
        }
 
        // listo, ya recolecte todos los datos, ahora creo el objeto!
        }
 
        // listo, ya recolecte todos los datos, ahora creo el objeto!

-       ViewTank *b = Gtk::manage( new ViewTank(name, orientacion) );
+       ViewTank *b = new ViewTank(name, orientacion);

        b->signal_button_press_event().connect(SigC::bind( SigC::slot(*this, &Principal::on_item_clicked), b) );
        b->set_position(x,y);
        work_place->put(*b, x, y);
        b->signal_button_press_event().connect(SigC::bind( SigC::slot(*this, &Principal::on_item_clicked), b) );
        b->set_position(x,y);
        work_place->put(*b, x, y);


@@ -384,7 +673,36 @@ void Principal::loadUnion(xmlNodePtr nodo)
        }
 
        // listo, ya recolecte todos los datos, ahora creo el objeto!
        }
 
        // listo, ya recolecte todos los datos, ahora creo el objeto!

-       ViewUnion *b = Gtk::manage( new ViewUnion(name, orientacion) );
+       ViewUnion *b = new ViewUnion(name, orientacion);
+       b->signal_button_release_event().connect(SigC::bind( SigC::slot(*this, &Principal::on_item_clicked), b) );
+       b->set_position(x,y);
+       work_place->put(*b, x, y);
+       b->show();
+       // los agrego al hash
+       mapItems[name] = b;
+}
+
+void Principal::loadDrain(xmlNodePtr nodo)
+{
+       Glib::ustring name = (char *)xmlGetProp(nodo, BAD_CAST"nombre");
+       int orientacion=0, x, y;
+
+       nodo = nodo->children;
+       while (nodo != NULL) {
+               if (nodo->type == XML_ELEMENT_NODE) {
+                       if (xmlStrcmp(nodo->name, BAD_CAST"orientacion") == 0) {
+                               orientacion = atoi( (char *)XML_GET_CONTENT(nodo->children) );
+                       } else if (xmlStrcmp(nodo->name, BAD_CAST"x") == 0) {
+                               x = atoi( (char *)XML_GET_CONTENT(nodo->children) );
+                       } else if (xmlStrcmp(nodo->name, BAD_CAST"y") == 0) {
+                               y = atoi( (char *)XML_GET_CONTENT(nodo->children) );
+                       }
+               }
+               nodo = nodo->next;
+       }
+
+       // listo, ya recolecte todos los datos, ahora creo el objeto!
+       ViewDrain *b = new ViewDrain(name, orientacion);

        b->signal_button_release_event().connect(SigC::bind( SigC::slot(*this, &Principal::on_item_clicked), b) );
        b->set_position(x,y);
        work_place->put(*b, x, y);
        b->signal_button_release_event().connect(SigC::bind( SigC::slot(*this, &Principal::on_item_clicked), b) );
        b->set_position(x,y);
        work_place->put(*b, x, y);


@@ -393,3 +711,153 @@ void Principal::loadUnion(xmlNodePtr nodo)
        mapItems[name] = b;
 }
 
        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"color")==0) {
+                                       item_name = (char *)xmlGetProp(items, BAD_CAST"name");
+                                       mapItems[item_name]->set_color( get_rgb_from_xml(items->children) );
+                               } 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;
+               }
+
+               xmlFreeDoc(document);
+               // Actualizo la UI
+               update_ui();
+       }
+}
+
+Gdk::Color Principal::get_rgb_from_xml(xmlNodePtr nodo)
+{
+       unsigned r,g,b;
+       while (nodo != NULL) {
+               if (nodo->type == XML_ELEMENT_NODE) {
+                       if (xmlStrcmp(nodo->name, BAD_CAST"r")==0)
+                               r = atoi( (char *)XML_GET_CONTENT(nodo->children) );
+                       if (xmlStrcmp(nodo->name, BAD_CAST"g")==0)
+                               g = atoi( (char *)XML_GET_CONTENT(nodo->children) );
+                       if (xmlStrcmp(nodo->name, BAD_CAST"b")==0)
+                               b = atoi( (char *)XML_GET_CONTENT(nodo->children) );
+               }
+               nodo = nodo->next;
+       }
+       r = 65535 * r / 255;
+       g = 65535 * g / 255;
+       b = 65535 * b / 255;
+       Gdk::Color c;
+       c.set_rgb(r,g,b);
+
+       return c;
+}
+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";
+}
+
+void Principal::on_mnu_property()
+{
+       dlg_property->show();
+}
+
+void Principal::on_dlg_property_ok()
+{
+       if (conexion) {
+               PlaQui::Server::Command c("plant", "set_frequency");
+               c.add_arg("default");
+               c.add_arg( dlg_property->get_velocity() );
+
+               conexion->send(c);
+       }
+       dlg_property->hide();
+}
+
+void Principal::on_btn_simulate_clicked()
+{
+       if (conexion == NULL) return;
+
+       PlaQui::Server::Command c("plant", "start");
+       c.add_arg("default");
+       conexion->send(c);
+}
+
+void Principal::on_btn_pause_clicked()
+{
+       if (conexion == NULL) return;
+
+       PlaQui::Server::Command c("plant", "stop");
+       c.add_arg("default");
+       conexion->send(c);
+}
+