Se corrige un bug.

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

diff --git a/Client/src/principal.cpp b/Client/src/principal.cpp
index a68ee6e46d66b28bec9c85abc8f9876810e7cd5c..27ebd524019b94749868b1fcbc05d47d677361b0 100644 (file)
--- a/Client/src/principal.cpp
+++ b/Client/src/principal.cpp
@@ -5,16 +5,27 @@
 #include <iostream>
 #include <sstream>
 #include <string>
 #include <iostream>
 #include <sstream>
 #include <string>

+#include "plaqui/server/string.h"
+#include "item_codo.h"
+#include "item_conduct.h"
+#include "item_exclusa.h"
+#include "item_tank.h"
+#include "item_pump.h"
+#include "item_union.h"
+#include "item_drain.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;

        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;

 
 

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

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


@@ -26,9 +37,11 @@ Principal::Principal(BaseObjectType *co, const Glib::RefPtr<Gnome::Glade::Xml> &
        rg->get_widget("txt_args", txt_args);
        rg->get_widget("bar_connect", bar_connect);
        rg->get_widget("work_place", work_place);
        rg->get_widget("txt_args", txt_args);
        rg->get_widget("bar_connect", bar_connect);
        rg->get_widget("work_place", work_place);

+       rg->get_widget("ico_conected", ico_conected);

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


@@ -46,29 +59,31 @@ Principal::~Principal()
 void Principal::on_dlg_connect_ok()
 {
        if (conexion == NULL) {
 void Principal::on_dlg_connect_ok()
 {
        if (conexion == NULL) {

-               std::cout << "Conectando ..." << std::endl;

                // Creo la conexion
                try {
                        conexion = new PlaQui::Server::ControlClient(dlg_conectar->get_server_name(), dlg_conectar->get_server_port());
                }
                catch (...) {
                        txt_view->get_buffer()->insert_at_cursor("NO SE PUDO CREAR OBJETO\n");
                // Creo la conexion
                try {
                        conexion = new PlaQui::Server::ControlClient(dlg_conectar->get_server_name(), dlg_conectar->get_server_port());
                }
                catch (...) {
                        txt_view->get_buffer()->insert_at_cursor("NO SE PUDO CREAR OBJETO\n");

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

                // Lanzo la conexion!
                // Lanzo la conexion!

-               //

                try {
                        conexion->run();
                }
                catch (...) {
                try {
                        conexion->run();
                }
                catch (...) {

-                       txt_view->get_buffer()->insert_at_cursor("no se puede correr ->run()!!!\n");
+                       txt_view->get_buffer()->insert_at_cursor("no se puede correr conexion->run()!!!\n");

                }
        } else {
                }
        } else {

-               std::cout << "Ya estas conectado" << std::endl;
+               txt_view->get_buffer()->insert_at_cursor("YA ESTAS CONECTADO\n");

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


@@ -78,6 +93,16 @@ void Principal::on_mnu_file_exit()
        Gtk::Main::quit();
 }
 
        Gtk::Main::quit();
 }
 

+void Principal::on_mnu_file_disconnect()
+{
+       if (conexion == NULL) return;
+
+       PlaQui::Server::Command c("connection", "stop");
+       c.add_arg(conexion->get_host());
+       c.add_arg(conexion->get_port());
+       conexion->send(c);
+}
+

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


@@ -115,9 +140,33 @@ void Principal::on_mnu_help_about()
        dlg->show();*/
 }
 
        dlg->show();*/
 }
 

-void Principal::on_conexion_ok()
+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");
+}
+
+void Principal::on_conexion_connected()
+{
+       txt_view->get_buffer()->insert_at_cursor("CONNECTED\n");
+       ico_conected->set( Gtk::Stock::YES , Gtk::IconSize(Gtk::ICON_SIZE_LARGE_TOOLBAR));
+}
+
+void Principal::on_conexion_finished()

 {
 {

-       txt_view->get_buffer()->insert_at_cursor("El server dice que ta' todo ok!\n");
+       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;
+}
+
+void Principal::on_conexion_ok(const std::string &body)
+{
+       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)


@@ -136,6 +185,7 @@ void Principal::on_get_clicked()
 {
        if (conexion == NULL) {
                txt_view->get_buffer()->insert_at_cursor("SIN CONEXION\n");
 {
        if (conexion == NULL) {
                txt_view->get_buffer()->insert_at_cursor("SIN CONEXION\n");

+               return;

        }
 
        
        }
 
        


@@ -157,7 +207,6 @@ void Principal::on_mnu_prop()
        xmlDocPtr document;
        document = xmlParseFile("test.xml");
        if (document == NULL) {
        xmlDocPtr document;
        document = xmlParseFile("test.xml");
        if (document == NULL) {

-               printf("Error al parsear test.xml\n");

                return;
        }
 
                return;
        }
 


@@ -169,20 +218,26 @@ void Principal::on_mnu_prop()
                items = nodo->children;
                while (items != NULL) {
                        if (items->type == XML_ELEMENT_NODE) {
                items = nodo->children;
                while (items != NULL) {
                        if (items->type == XML_ELEMENT_NODE) {

-                               if (strcmp((char *)items->name, "bomba")==0) {
+                               if (xmlStrcmp(items->name, BAD_CAST"bomba")==0) {

                                        loadBomba(items);
                                        loadBomba(items);

-                               } else if (strcmp((char *)items->name, "codo")==0) {
+                               } else if (xmlStrcmp(items->name, BAD_CAST"codo")==0) {

                                        loadCodo(items);
                                        loadCodo(items);

+                               } else if (xmlStrcmp(items->name, BAD_CAST"tubo")==0) {
+                                       loadConduct(items);
+                               } else if (xmlStrcmp(items->name, BAD_CAST"exclusa")==0) {
+                                       loadExclusa(items);
+                               } else if (xmlStrcmp(items->name, BAD_CAST"tanque")==0) {
+                                       loadTank(items);
+                               } else if (xmlStrcmp(items->name, BAD_CAST"empalme")==0) {
+                                       loadUnion(items);
+                               } else if (xmlStrcmp(items->name, BAD_CAST"drenaje")==0) {
+                                       loadDrain(items);

                                }
                                }

+

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

-       } else {
-               printf("NO ES UNA PLANTA\n");

        }
        }

-       
-
-       printf("Fin parseo!!\n");

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


@@ -205,13 +260,103 @@ 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!

-       Bomba *b = Gtk::manage( new Bomba(name, orientacion) );
+       ViewPump *b = Gtk::manage( 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->show();
        b->set_position(x,y);
        work_place->put(*b, x, y);
        b->show();

+       // los agrego al hash
+       mapItems[name] = b;

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

+{
+       std::string 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!
+       ViewItem *b = Gtk::manage( 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->show();
+       // los agrego al hash
+       mapItems[name] = b;
+}
+
+void Principal::loadConduct(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!
+       ViewConduct *b = Gtk::manage( 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->show();
+       // los agrego al hash
+       mapItems[name] = b;
+}
+
+void Principal::loadExclusa(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!
+       ViewExclusa *b = Gtk::manage( 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->show();
+       // los agrego al hash
+       mapItems[name] = b;
+}
+
+void Principal::loadTank(xmlNodePtr nodo)

 {
        Glib::ustring name = (char *)xmlGetProp(nodo, BAD_CAST"nombre");
        int orientacion=0, x, y;
 {
        Glib::ustring name = (char *)xmlGetProp(nodo, BAD_CAST"nombre");
        int orientacion=0, x, y;


@@ -231,9 +376,69 @@ 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!

-       Codo *b = Gtk::manage( new Codo(name, orientacion) );
+       ViewTank *b = Gtk::manage( 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->show();
        b->set_position(x,y);
        work_place->put(*b, x, y);
        b->show();

+       // los agrego al hash
+       mapItems[name] = b;

 }
 
 }
 

+void Principal::loadUnion(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!
+       ViewUnion *b = Gtk::manage( 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 = Gtk::manage( 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->show();
+       // los agrego al hash
+       mapItems[name] = b;
+}