From 4404d8472c0088ec061b2f4f6527412f7ba23569 Mon Sep 17 00:00:00 2001 From: Ricardo Markiewicz Date: Thu, 20 Nov 2003 03:30:00 +0000 Subject: [PATCH] * El cliente ahora refleja un poco mejor los datos del server * Se agregan verificaciones varias para conexion != NULL (se sigue colgando el desconectar) --- Client/include/item.h | 10 ++++++- Client/include/item_exclusa.h | 4 +++ Client/include/item_tank.h | 4 +++ Client/include/principal.h | 4 ++- Client/src/client.glade | 56 ++++++++++++++++++++++++++++++++--- Client/src/item_tank.cpp | 10 +++++++ Client/src/principal.cpp | 50 +++++++++++++++++++++++++------ 7 files changed, 123 insertions(+), 15 deletions(-) diff --git a/Client/include/item.h b/Client/include/item.h index dd845d4..fca3b79 100644 --- 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 b86216b..0ca9256 100644 --- 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 ae4a2fd..1cb0806 100644 --- 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 c3f2d32..9b92e09 100644 --- 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 0fdcecc..5ddebe1 100644 --- a/Client/src/client.glade +++ b/Client/src/client.glade @@ -527,14 +527,14 @@ True - 3 + 4 2 False 0 0 - + True Nombre : False @@ -558,7 +558,7 @@ - + True Flujo Actual : False @@ -582,7 +582,7 @@ - + True Color : False @@ -676,6 +676,54 @@ + + + + True + Extra : + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 3 + 4 + fill + + + + + + + True + ... + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 1 + 2 + 3 + 4 + fill + + + diff --git a/Client/src/item_tank.cpp b/Client/src/item_tank.cpp index 88b8eda..c3fcdaa 100644 --- a/Client/src/item_tank.cpp +++ b/Client/src/item_tank.cpp @@ -1,5 +1,6 @@ #include "item_tank.h" +#include 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 76680bd..2e8d708 100644 --- a/Client/src/principal.cpp +++ b/Client/src/principal.cpp @@ -22,9 +22,12 @@ Principal::Principal(BaseObjectType *co, const Glib::RefPtr & 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 & 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"; +} + -- 2.43.0