* El cliente ahora refleja un poco mejor los datos del server

 * Se agregan verificaciones varias para conexion != NULL (se sigue colgando el desconectar)

diff --git a/Client/include/item.h b/Client/include/item.h
index dd845d48099f689b52215e3d0d2fa6b937aa488d..fca3b79594c8478e0880584b78f9ef094cb3ee1e 100644 (file)
--- a/Client/include/item.h
+++ b/Client/include/item.h
@@ -17,12 +17,20 @@ public:
        void set_position(int _x, int _y);
        void set_name(Glib::ustring _name);
        void set_actual_flow(float f) { actual_flow = f; }
+       void set_open(bool b) { open = b; }
+       void set_extra(float f) { extra = f; }
+
+       
        std::string get_actual_flow();
+       virtual std::string get_cap_flow() { return "Flujo Actual :"; }
+       virtual std::string get_cap_extra() { return ""; }
+       virtual std::string get_extra() { return ""; }
 protected:
        Glib::ustring name;
        Gtk::Image image;
        int x, y;
-       float actual_flow;
+       float actual_flow, extra;
+       bool open;
 };
 
 #endif

diff --git a/Client/include/item_exclusa.h b/Client/include/item_exclusa.h
index b86216b9305cf1e478fb7867cf1e51a3674d4e2f..0ca925660008e2e955e7d82f8c22619e84698ebb 100644 (file)
--- a/Client/include/item_exclusa.h
+++ b/Client/include/item_exclusa.h
@@ -8,6 +8,10 @@ class ViewExclusa:public ViewItem {
 public:
        ViewExclusa(Glib::ustring _name, int orientacion);
        virtual ~ViewExclusa();
+
+       virtual std::string get_cap_flow() { return "Flujo Actual :"; }
+       virtual std::string get_cap_extra() { return "Estado : "; }
+       virtual std::string get_extra() { return (open)?"Abierta":"Cerrada"; }
 };
 
 #endif

diff --git a/Client/include/item_tank.h b/Client/include/item_tank.h
index ae4a2fd904d98487c524fe011c34cdf4bec9ee4f..1cb080601153e8e6aff9195b2a79b3c5c970d476 100644 (file)
--- a/Client/include/item_tank.h
+++ b/Client/include/item_tank.h
@@ -8,6 +8,10 @@ class ViewTank:public ViewItem {
 public:
        ViewTank(Glib::ustring _name, int orientacion);
        virtual ~ViewTank();
+       
+       virtual std::string get_cap_flow() { return "Capacidad :"; }
+       virtual std::string get_cap_extra() { return "Liquido :"; }
+       virtual std::string get_extra(); 
 };
 
 #endif

diff --git a/Client/include/principal.h b/Client/include/principal.h
index c3f2d3234b46ea160ae09052cb66c654298edcd7..9b92e0929b9b7acbeb5920aa15e428e5d3f9ca2c 100644 (file)
--- a/Client/include/principal.h
+++ b/Client/include/principal.h
@@ -26,6 +26,8 @@ protected:
        // Actualiza el estado de una planta
        void read_status_xml(const std::string &frame);
        float get_float_from_xml(xmlNodePtr nodo);
+       bool get_bool_from_xml(xmlNodePtr nodo);
+       
        // Funciones de carga del XML
        bool is_xml_loaded;
        void loadXML();
@@ -48,7 +50,7 @@ protected:
        Gtk::Entry *txt_target, *txt_command, *txt_args;
        Gtk::TextView *txt_view;
        Gtk::Fixed *work_place;
-       Gtk::Label *lbl_nombre, *lbl_color, *lbl_flujo;
+       Gtk::Label *lbl_nombre, *lbl_color, *lbl_flujo, *lbl_extra, *lbl_cap_flujo, *lbl_cap_extra;
        Gtk::Image *ico_conected;
 
        // Callbacks del menu y la barra

diff --git a/Client/src/client.glade b/Client/src/client.glade
index 0fdcecc0adfd073f00a9fda0504d274a44fa3893..5ddebe1b97d230bd7923e9f523bedfcb85301cfa 100644 (file)
--- a/Client/src/client.glade
+++ b/Client/src/client.glade
@@ -527,14 +527,14 @@
                  <child>
                    <widget class="GtkTable" id="table3">
                      <property name="visible">True</property>
-                     <property name="n_rows">3</property>
+                     <property name="n_rows">4</property>
                      <property name="n_columns">2</property>
                      <property name="homogeneous">False</property>
                      <property name="row_spacing">0</property>
                      <property name="column_spacing">0</property>
 
                      <child>
-                       <widget class="GtkLabel" id="label19">
+                       <widget class="GtkLabel" id="lbl_cap_nombre">
                          <property name="visible">True</property>
                          <property name="label" translatable="yes">Nombre : </property>
                          <property name="use_underline">False</property>
@@ -558,7 +558,7 @@
                      </child>
 
                      <child>
-                       <widget class="GtkLabel" id="label20">
+                       <widget class="GtkLabel" id="lbl_cap_flujo">
                          <property name="visible">True</property>
                          <property name="label" translatable="yes">Flujo Actual : </property>
                          <property name="use_underline">False</property>
@@ -582,7 +582,7 @@
                      </child>
 
                      <child>
-                       <widget class="GtkLabel" id="label21">
+                       <widget class="GtkLabel" id="lbl_cap_color">
                          <property name="visible">True</property>
                          <property name="label" translatable="yes">Color : </property>
                          <property name="use_underline">False</property>
@@ -676,6 +676,54 @@
                          <property name="y_options"></property>
                        </packing>
                      </child>
+
+                     <child>
+                       <widget class="GtkLabel" id="lbl_cap_extra">
+                         <property name="visible">True</property>
+                         <property name="label" translatable="yes">Extra : </property>
+                         <property name="use_underline">False</property>
+                         <property name="use_markup">False</property>
+                         <property name="justify">GTK_JUSTIFY_LEFT</property>
+                         <property name="wrap">False</property>
+                         <property name="selectable">False</property>
+                         <property name="xalign">0</property>
+                         <property name="yalign">0.5</property>
+                         <property name="xpad">0</property>
+                         <property name="ypad">0</property>
+                       </widget>
+                       <packing>
+                         <property name="left_attach">0</property>
+                         <property name="right_attach">1</property>
+                         <property name="top_attach">3</property>
+                         <property name="bottom_attach">4</property>
+                         <property name="x_options">fill</property>
+                         <property name="y_options"></property>
+                       </packing>
+                     </child>
+
+                     <child>
+                       <widget class="GtkLabel" id="lbl_extra">
+                         <property name="visible">True</property>
+                         <property name="label" translatable="yes">...</property>
+                         <property name="use_underline">False</property>
+                         <property name="use_markup">False</property>
+                         <property name="justify">GTK_JUSTIFY_LEFT</property>
+                         <property name="wrap">False</property>
+                         <property name="selectable">False</property>
+                         <property name="xalign">0</property>
+                         <property name="yalign">0.5</property>
+                         <property name="xpad">0</property>
+                         <property name="ypad">0</property>
+                       </widget>
+                       <packing>
+                         <property name="left_attach">1</property>
+                         <property name="right_attach">2</property>
+                         <property name="top_attach">3</property>
+                         <property name="bottom_attach">4</property>
+                         <property name="x_options">fill</property>
+                         <property name="y_options"></property>
+                       </packing>
+                     </child>
                    </widget>
                  </child>
 

diff --git a/Client/src/item_tank.cpp b/Client/src/item_tank.cpp
index 88b8eda25f16d1bd593f9d1f3ed145d74d385067..c3fcdaaa305e4fa80cc52f26b9b959fdfddf5182 100644 (file)
--- a/Client/src/item_tank.cpp
+++ b/Client/src/item_tank.cpp
@@ -1,5 +1,6 @@
 
 #include "item_tank.h"
+#include <sstream>
 
 ViewTank::ViewTank(Glib::ustring _name, int orientacion):ViewItem(_name)
 {
@@ -18,3 +19,12 @@ ViewTank::~ViewTank()
 {
 }
 
+std::string ViewTank::get_extra()
+{
+       std::stringstream ss;
+       std::string s;
+       ss << extra;
+       ss >> s;
+       return s;
+}
+

diff --git a/Client/src/principal.cpp b/Client/src/principal.cpp
index 76680bd23b31ab3ea103fc61189ff17633fd4b10..2e8d7086b926a4994d5c5c9f05700280bb865834 100644 (file)
--- a/Client/src/principal.cpp
+++ b/Client/src/principal.cpp
@@ -22,9 +22,12 @@ Principal::Principal(BaseObjectType *co, const Glib::RefPtr<Gnome::Glade::Xml> &
        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;
 
        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_disconnect", mnu_disconnect);
@@ -57,7 +60,8 @@ Principal::Principal(BaseObjectType *co, const Glib::RefPtr<Gnome::Glade::Xml> &
 
 Principal::~Principal()
 {
-       delete conexion;
+       if (conexion != NULL)
+               delete conexion;
 }
 
 void Principal::on_dlg_connect_ok()
@@ -97,6 +101,10 @@ 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);
        conexion->finish();
 }
 
@@ -141,6 +149,11 @@ 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");
@@ -152,14 +165,15 @@ void Principal::on_conexion_connected()
        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);
+       if (conexion != NULL) {
+               PlaQui::Server::Command c("plant", "get");
+               c.add_arg("default");
+               conexion->send(c);
+       }
 }
 
 void Principal::on_conexion_frame(const std::string &frame)
 {
-       std::cout << "FRAME" << std::endl;
        read_status_xml(frame);
 }
 
@@ -482,6 +496,7 @@ void Principal::read_status_xml(const std::string &frame)
        xmlNodePtr nodo, items, props;
        nodo = document->children;
        float tmp;
+       bool tmp_b;
 
        if (strcmp((char *)nodo->name, "plantstatus") == 0) {
                std::cout << "LEGO EL XML!" << std::endl;
@@ -493,10 +508,13 @@ void Principal::read_status_xml(const std::string &frame)
                                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);
                                }
 
-                               if (item_name != "")
-                                       mapItems[item_name]->set_actual_flow(tmp);
                        }
                        items = items->next;
                }
@@ -515,7 +533,21 @@ float Principal::get_float_from_xml(xmlNodePtr nodo)
                }
                nodo = nodo->next;
        }
-       std::cout << "get_float == " << tmp << std::endl;
        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";
+}
+