* Se agregan #ifdef DEBUG a los simulate() del modelo, para poder sacar

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

diff --git a/Client/src/principal.cpp b/Client/src/principal.cpp
index 2e8d7086b926a4994d5c5c9f05700280bb865834..d5959a9476b01513ee4cee83f9ed8f70532bd27d 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>


@@ -17,13 +15,15 @@
 
 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, *mnu_disconnect;
+       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;
        lbl_cap_flujo = lbl_cap_extra = lbl_extra = lbl_nombre = lbl_color = lbl_flujo = 0;
 
        Gtk::Button *btn_get=0, *bar_connect=0;
        txt_view = 0;
        txt_target = txt_command = txt_args = 0;
        work_place = 0;
        lbl_cap_flujo = lbl_cap_extra = lbl_extra = lbl_nombre = lbl_color = lbl_flujo = 0;
 

+       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_extra", lbl_extra);
        rg->get_widget("lbl_cap_extra", lbl_cap_extra);
        rg->get_widget("lbl_nombre", lbl_nombre);
        rg->get_widget("lbl_extra", lbl_extra);
        rg->get_widget("lbl_cap_extra", lbl_cap_extra);


@@ -51,17 +51,24 @@ Principal::Principal(BaseObjectType *co, const Glib::RefPtr<Gnome::Glade::Xml> &
        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) );

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

 
        conexion = NULL;
        is_xml_loaded = false;
 
        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 ) );
 }
 
 Principal::~Principal()
 {
        load_xml_dispatch.connect( SigC::slot(*this, &Principal::loadXML ) );
 }
 
 Principal::~Principal()
 {

-       if (conexion != NULL)
-               delete conexion;
+       if (conexion) {
+               conexion->finish();
+       }
+       // Espera a que termine realmente.
+       while (conexion) {
+               Glib::usleep(10000); // 10 milisegundos
+       }

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


@@ -73,8 +80,9 @@ 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;
                }
 
                        return;
                }
 


@@ -97,15 +105,31 @@ 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;
 
 void Principal::on_mnu_file_disconnect()
 {
        if (conexion == NULL) return;
 

-       PlaQui::Server::Command c("transmission", "stop");
+       PlaQui::Server::Command c("connection", "stop");

        c.add_arg(conexion->get_host());
        c.add_arg(conexion->get_host());

-       c.add_arg("7528");
+       c.add_arg(conexion->get_port());

        conexion->send(c);
        conexion->send(c);

-       conexion->finish();

 }
 
 void Principal::on_mnu_file_connect()
 }
 
 void Principal::on_mnu_file_connect()


@@ -147,16 +171,28 @@ 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());
-       lbl_flujo->set_text(i->get_actual_flow());
-       lbl_extra->set_text(i->get_extra());
-
-       lbl_cap_flujo->set_text(i->get_cap_flow());
-       lbl_cap_extra->set_text(i->get_cap_extra());

        
        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::update_items_prop()
+{
+       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();

 }
 
 void Principal::on_conexion_connected()
 }
 
 void Principal::on_conexion_connected()


@@ -174,7 +210,9 @@ void Principal::on_conexion_connected()
 
 void Principal::on_conexion_frame(const std::string &frame)
 {
 
 void Principal::on_conexion_frame(const std::string &frame)
 {

-       read_status_xml(frame);
+       if (conexion != NULL) {
+               read_status_xml(frame);
+       }

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


@@ -272,6 +310,8 @@ void Principal::loadXML()
                }
        }
 
                }
        }
 

+       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");
        // Ya cargado el XML, mando un msg para empezar a recibir los frames!
        PlaQui::Server::Command c("transmission", "start");
        c.add_arg("default");


@@ -499,7 +539,6 @@ void Principal::read_status_xml(const std::string &frame)
        bool tmp_b;
 
        if (strcmp((char *)nodo->name, "plantstatus") == 0) {
        bool tmp_b;
 
        if (strcmp((char *)nodo->name, "plantstatus") == 0) {

-               std::cout << "LEGO EL XML!" << std::endl;

                items = nodo->children;
                while (items != NULL) {
                        if (items->type == XML_ELEMENT_NODE) {
                items = nodo->children;
                while (items != NULL) {
                        if (items->type == XML_ELEMENT_NODE) {


@@ -513,14 +552,62 @@ void Principal::read_status_xml(const std::string &frame)
                                        tmp_b = get_bool_from_xml(items->children);
                                        item_name = (char *)xmlGetProp(items, BAD_CAST"name");
                                        mapItems[item_name]->set_open(tmp_b);
                                        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;
                }
                        }
                        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;
 float Principal::get_float_from_xml(xmlNodePtr nodo)
 {
        float tmp = -1;