- Se mejora el manejo de errores (excepciones) en los tests (y en algunas otras

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

diff --git a/Client/src/principal.cpp b/Client/src/principal.cpp
index e88c8968c42f3a1897516bcea8a9a495d625ae17..a68ee6e46d66b28bec9c85abc8f9876810e7cd5c 100644 (file)
--- a/Client/src/principal.cpp
+++ b/Client/src/principal.cpp
@@ -3,24 +3,34 @@
 
 #include "principal.h"
 #include <iostream>
 
 #include "principal.h"
 #include <iostream>

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

 
 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;
-       Gtk::Button *btn_get=0;
+       Gtk::MenuItem *conect=0, *exit=0, *about=0, *mnu_prop=0;
+       Gtk::Button *btn_get=0, *bar_connect=0;

        txt_view = 0;
        txt_view = 0;

-       txt_get = 0;
-       
+       txt_target = txt_command = txt_args = 0;
+       work_place = 0;
+

        rg->get_widget("mnu_file_connect", conect);
        rg->get_widget("mnu_file_exit", exit);
        rg->get_widget("mnu_help_about", about);
        rg->get_widget("mnu_file_connect", conect);
        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("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);

-       rg->get_widget("txt_uri", txt_get);
+       rg->get_widget("txt_target", txt_target);
+       rg->get_widget("txt_command", txt_command);
+       rg->get_widget("txt_args", txt_args);
+       rg->get_widget("bar_connect", bar_connect);
+       rg->get_widget("work_place", work_place);

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

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


@@ -38,20 +48,29 @@ void Principal::on_dlg_connect_ok()
        if (conexion == NULL) {
                std::cout << "Conectando ..." << std::endl;
                // Creo la conexion
        if (conexion == NULL) {
                std::cout << "Conectando ..." << std::endl;
                // Creo la conexion

-               conexion = new PlaQui::Server::ControlClient(dlg_conectar->get_server_name(), dlg_conectar->get_server_port());
+               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");
+                       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) );
                // Lanzo la conexion!
                // 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) );
                // Lanzo la conexion!

-               conexion->run();
+               //
+               try {
+                       conexion->run();
+               }
+               catch (...) {
+                       txt_view->get_buffer()->insert_at_cursor("no se puede correr ->run()!!!\n");
+               }

        } else {
                std::cout << "Ya estas conectado" << std::endl;
        }
        dlg_conectar->hide();
        } else {
                std::cout << "Ya estas conectado" << std::endl;
        }
        dlg_conectar->hide();

-
-       // mando algo para ver que me dice
-       PlaQui::Server::Command command("/", "status");
-       conexion->send(command);

 }
 
 void Principal::on_mnu_file_exit()
 }
 
 void Principal::on_mnu_file_exit()


@@ -101,9 +120,16 @@ void Principal::on_conexion_ok()
        txt_view->get_buffer()->insert_at_cursor("El server dice que ta' todo ok!\n");
 }
 
        txt_view->get_buffer()->insert_at_cursor("El server dice que ta' todo ok!\n");
 }
 

-void Principal::on_conexion_error()
+void Principal::on_conexion_error(unsigned code)

 {
 {

-       txt_view->get_buffer()->insert_at_cursor("El server dice que hay error\n");
+       std::stringstream a;
+       std::string s;
+       a << code;
+       a >> s;
+       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()
 }
 
 void Principal::on_get_clicked()


@@ -112,12 +138,102 @@ void Principal::on_get_clicked()
                txt_view->get_buffer()->insert_at_cursor("SIN CONEXION\n");
        }
 
                txt_view->get_buffer()->insert_at_cursor("SIN CONEXION\n");
        }
 

-       txt_view->get_buffer()->insert_at_cursor("Enviada URI : ");
-       txt_view->get_buffer()->insert_at_cursor(txt_get->get_text());
-       txt_view->get_buffer()->insert_at_cursor("\n");

        
        

-       PlaQui::Server::Command command(txt_get->get_text(), "");
-       conexion->send(command);
+       PlaQui::Server::Command command(txt_target->get_text(), txt_command->get_text());
+       command.add_arg( txt_args->get_text() );
+       txt_view->get_buffer()->insert_at_cursor("Enviando comando\n");
+       try {
+               conexion->send(command);
+       }
+       catch (...) {
+               txt_view->get_buffer()->insert_at_cursor("EXCEPTION EN conexion->send !!\n");
+       }
+
+}
+
+void Principal::on_mnu_prop()
+{
+       /* Parseo de ejemplo de un XML desde archivo */
+       xmlDocPtr document;
+       document = xmlParseFile("test.xml");
+       if (document == NULL) {
+               printf("Error al parsear test.xml\n");
+               return;
+       }
+
+       /* bien, el archivo se parseo bien! */
+       xmlNodePtr nodo, items;
+       nodo = document->children;
+
+       if (strcmp((char *)nodo->name, "planta") == 0) {
+               items = nodo->children;
+               while (items != NULL) {
+                       if (items->type == XML_ELEMENT_NODE) {
+                               if (strcmp((char *)items->name, "bomba")==0) {
+                                       loadBomba(items);
+                               } else if (strcmp((char *)items->name, "codo")==0) {
+                                       loadCodo(items);
+                               }
+                       }
+                       items = items->next;
+               }
+       } else {
+               printf("NO ES UNA PLANTA\n");
+       }
+       
+
+       printf("Fin parseo!!\n");
+}
+
+void Principal::loadBomba(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!
+       Bomba *b = Gtk::manage( new Bomba(name, orientacion) );
+       b->set_position(x,y);
+       work_place->put(*b, x, y);
+       b->show();
+}
+
+void Principal::loadCodo(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!
+       Codo *b = Gtk::manage( new Codo(name, orientacion) );
+       b->set_position(x,y);
+       work_place->put(*b, x, y);
+       b->show();

 }
 
 }