X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/4511b619c83ef3f3589e7a76fd812561950eef99..24ac99bd21e4562a6ae028e0a84d8c09da07058b:/Client/src/principal.cpp?ds=sidebyside diff --git a/Client/src/principal.cpp b/Client/src/principal.cpp index 0e965e3..0b59c0b 100644 --- a/Client/src/principal.cpp +++ b/Client/src/principal.cpp @@ -1,6 +1,4 @@ - - #include "principal.h" #include #include @@ -17,14 +15,19 @@ Principal::Principal(BaseObjectType *co, const Glib::RefPtr &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_nombre = lbl_color = lbl_flujo = 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_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); @@ -48,16 +51,19 @@ Principal::Principal(BaseObjectType *co, const Glib::RefPtr & 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; - + last_selected = NULL; + update_ui.connect( SigC::slot(*this, &Principal::update_items_prop ) ); load_xml_dispatch.connect( SigC::slot(*this, &Principal::loadXML ) ); } Principal::~Principal() { - delete conexion; + if (conexion != NULL) + delete conexion; } void Principal::on_dlg_connect_ok() @@ -81,12 +87,7 @@ void Principal::on_dlg_connect_ok() conexion->signal_finished().connect( SigC::slot(*this, &Principal::on_conexion_finished) ); conexion->signal_frame_received().connect(SigC::slot(*this, &Principal::on_conexion_frame)); // Lanzo la conexion! - try { - conexion->run(); - } - catch (...) { - txt_view->get_buffer()->insert_at_cursor("no se puede correr conexion->run()!!!\n"); - } + conexion->run(); } else { txt_view->get_buffer()->insert_at_cursor("YA ESTAS CONECTADO\n"); } @@ -98,13 +99,30 @@ void Principal::on_mnu_file_exit() 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; PlaQui::Server::Command c("connection", "stop"); c.add_arg(conexion->get_host()); - c.add_arg(conexion->get_port()); + c.add_arg("7522"); conexion->send(c); } @@ -147,11 +165,28 @@ void Principal::on_mnu_help_about() bool Principal::on_item_clicked(GdkEventButton *e, ViewItem *i) { - lbl_nombre->set_text(i->get_name()); - lbl_flujo->set_text(i->get_actual_flow()); + 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() @@ -160,14 +195,18 @@ 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) { - read_status_xml(frame); + if (conexion != NULL) { + read_status_xml(frame); + } } void Principal::on_conexion_finished() @@ -185,12 +224,6 @@ void Principal::on_conexion_ok(const std::string &body) //loadXML(body); xml_body = body; load_xml_dispatch(); - // Ya cargado el XML, mando un msg para empezar a recibir los frames! - PlaQui::Server::Command c("transmission", "start"); - c.add_arg("default"); - c.add_arg(""); - c.add_arg("7528"); - conexion->send(c); } else { std::cout << body << std::endl; txt_view->get_buffer()->insert_at_cursor("\n"); @@ -208,7 +241,6 @@ void Principal::on_conexion_error(unsigned code) txt_view->get_buffer()->insert_at_cursor("El server dice que hay error : "); txt_view->get_buffer()->insert_at_cursor(s); txt_view->get_buffer()->insert_at_cursor("\n"); - } void Principal::on_get_clicked() @@ -217,7 +249,6 @@ void Principal::on_get_clicked() txt_view->get_buffer()->insert_at_cursor("SIN CONEXION\n"); return; } - PlaQui::Server::Command command(txt_target->get_text(), txt_command->get_text()); command.add_arg( txt_args->get_text() ); @@ -273,6 +304,12 @@ void Principal::loadXML() } } + // Ya cargado el XML, mando un msg para empezar a recibir los frames! + PlaQui::Server::Command c("transmission", "start"); + c.add_arg("default"); + c.add_arg(conexion->get_host()); + c.add_arg("7528"); + conexion->send(c); } void Principal::loadBomba(xmlNodePtr nodo) @@ -491,23 +528,77 @@ 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, "plantastatus") == 0) { + if (strcmp((char *)nodo->name, "plantstatus") == 0) { items = nodo->children; while (items != NULL) { - tmp = -1; if (items->type == XML_ELEMENT_NODE) { - if (xmlStrcmp(items->name, BAD_CAST"conduct")==0) { + tmp = -1; + item_name = ""; + if (xmlStrcmp(items->name, BAD_CAST"float")==0) { tmp = get_float_from_xml(items->children); - item_name = (char *)xmlGetProp(nodo, BAD_CAST"nombre"); + 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); + } 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; } + + // 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; @@ -523,3 +614,18 @@ float Principal::get_float_from_xml(xmlNodePtr nodo) 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"; +} +