* Se completa el cliente. Ya muestra todas las propiedades y el ultimo item que

   se selecciono se va actualizando automaticamente
 * Se pone por default el puero 7522 en el Cliente
 * Se modifica el XML de prueba para llegar a ver como se actualiza el tanque.

 Hay un bug en la Division (maldita sea!), vere si llego a encontrar que es antes de mañana.

diff --git a/Client/include/principal.h b/Client/include/principal.h
index 9b92e0929b9b7acbeb5920aa15e428e5d3f9ca2c..868f6f4bbf47235236f39ee2330de326f9fdea2c 100644 (file)
--- a/Client/include/principal.h
+++ b/Client/include/principal.h
@@ -39,12 +39,14 @@ protected:
        void loadUnion(xmlNodePtr nodo);
        void loadDrain(xmlNodePtr nodo);
 
        void loadUnion(xmlNodePtr nodo);
        void loadDrain(xmlNodePtr nodo);
 

-       Glib::Dispatcher load_xml_dispatch;
+       Glib::Dispatcher load_xml_dispatch, update_ui;

        std::string xml_body;
 
        // Archivo XML del Padre
        Glib::RefPtr<Gnome::Glade::Xml> refXml;
 
        std::string xml_body;
 
        // Archivo XML del Padre
        Glib::RefPtr<Gnome::Glade::Xml> refXml;
 

+       // Para la actualizacion automatica
+       ViewItem *last_selected;

        // Dialogo de Conectar
        DlgConectar *dlg_conectar;
        Gtk::Entry *txt_target, *txt_command, *txt_args;
        // Dialogo de Conectar
        DlgConectar *dlg_conectar;
        Gtk::Entry *txt_target, *txt_command, *txt_args;


@@ -53,6 +55,9 @@ protected:
        Gtk::Label *lbl_nombre, *lbl_color, *lbl_flujo, *lbl_extra, *lbl_cap_flujo, *lbl_cap_extra;
        Gtk::Image *ico_conected;
 
        Gtk::Label *lbl_nombre, *lbl_color, *lbl_flujo, *lbl_extra, *lbl_cap_flujo, *lbl_cap_extra;
        Gtk::Image *ico_conected;
 

+       // Actualiza las propiedades en la ventana del item actual
+       void update_items_prop();
+       

        // Callbacks del menu y la barra
        virtual void on_mnu_file_exit();
        virtual void on_mnu_file_connect();
        // Callbacks del menu y la barra
        virtual void on_mnu_file_exit();
        virtual void on_mnu_file_connect();

diff --git a/Client/src/client.glade b/Client/src/client.glade
index 5ddebe1b97d230bd7923e9f523bedfcb85301cfa..05dcc588122bcf5789b67fcc50581f7ff94f771f 100644 (file)
--- a/Client/src/client.glade
+++ b/Client/src/client.glade
@@ -1128,7 +1128,7 @@
              <property name="update_policy">GTK_UPDATE_ALWAYS</property>
              <property name="snap_to_ticks">False</property>
              <property name="wrap">False</property>
              <property name="update_policy">GTK_UPDATE_ALWAYS</property>
              <property name="snap_to_ticks">False</property>
              <property name="wrap">False</property>

-             <property name="adjustment">1234 1 65535 1 10 10</property>
+             <property name="adjustment">7522 1 65535 1 10 10</property>

            </widget>
            <packing>
              <property name="left_attach">1</property>
            </widget>
            <packing>
              <property name="left_attach">1</property>

diff --git a/Client/src/principal.cpp b/Client/src/principal.cpp
index 2e8d7086b926a4994d5c5c9f05700280bb865834..868e050b1efcdb9315fc978e520f11dd15c76148 100644 (file)
--- a/Client/src/principal.cpp
+++ b/Client/src/principal.cpp
@@ -54,7 +54,8 @@ Principal::Principal(BaseObjectType *co, const Glib::RefPtr<Gnome::Glade::Xml> &
 
        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 ) );
 }
 
        load_xml_dispatch.connect( SigC::slot(*this, &Principal::loadXML ) );
 }
 


@@ -147,16 +148,25 @@ 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());

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


@@ -174,7 +184,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()


@@ -499,7 +511,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,11 +524,33 @@ 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"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;
                }

+
+               // Actualizo la UI
+               update_ui();

        }
 }
 
        }
 }
 

diff --git a/Server/tests/prueba.xml b/Server/tests/prueba.xml
index 6b4e36ce1ca8e5be1efb94b772da868148370198..00880ec5a5953539811edf40ca0f1c8d51917b1d 100644 (file)
--- a/Server/tests/prueba.xml
+++ b/Server/tests/prueba.xml
@@ -83,7 +83,7 @@
                <y>416</y>
        </tanque>
        <codo nombre="codo7" id="7">
                <y>416</y>
        </tanque>
        <codo nombre="codo7" id="7">

-               <caudal>40,00</caudal>
+               <caudal>4,00</caudal>

                <conector>
                        <entrada>exclusa18</entrada>
                        <salida>drenaje8</salida>
                <conector>
                        <entrada>exclusa18</entrada>
                        <salida>drenaje8</salida>