El Transmitter ya anda bien (se puede escuchar con un nc -p [puerto] -l -u :).

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

diff --git a/Client/src/principal.cpp b/Client/src/principal.cpp
index 05387367d5175332da9cf58f1344afae9c392f0f..27ebd524019b94749868b1fcbc05d47d677361b0 100644 (file)
--- a/Client/src/principal.cpp
+++ b/Client/src/principal.cpp
@@ -5,16 +5,18 @@
 #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)
 {
-       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;
@@ -23,6 +25,7 @@ Principal::Principal(BaseObjectType *co, const Glib::RefPtr<Gnome::Glade::Xml> &
 
        rg->get_widget("lbl_nombre", lbl_nombre);
        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);
@@ -38,6 +41,7 @@ Principal::Principal(BaseObjectType *co, const Glib::RefPtr<Gnome::Glade::Xml> &
 
        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));
@@ -89,6 +93,16 @@ void Principal::on_mnu_file_exit()
        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();
@@ -147,9 +161,12 @@ void Principal::on_conexion_finished()
        conexion = NULL;
 }
 
-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");
+       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)
@@ -168,6 +185,7 @@ void Principal::on_get_clicked()
 {
        if (conexion == NULL) {
                txt_view->get_buffer()->insert_at_cursor("SIN CONEXION\n");
+               return;
        }
 
        
@@ -212,7 +230,10 @@ void Principal::on_mnu_prop()
                                        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;
                }
@@ -393,3 +414,31 @@ void Principal::loadUnion(xmlNodePtr nodo)
        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;
+}