X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/e36a4e9f6b04998cc8f92a8808abac66e670a01d..be1908f8097dbbc871bfd7c55432de43d25647b7:/Client/src/principal.cpp diff --git a/Client/src/principal.cpp b/Client/src/principal.cpp index 27ebd52..d5959a9 100644 --- a/Client/src/principal.cpp +++ b/Client/src/principal.cpp @@ -1,6 +1,4 @@ - - #include "principal.h" #include #include @@ -13,17 +11,24 @@ #include "item_pump.h" #include "item_union.h" #include "item_drain.h" +#include 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); rg->get_widget("mnu_file_exit", exit); @@ -40,20 +45,30 @@ Principal::Principal(BaseObjectType *co, const Glib::RefPtr & rg->get_widget("ico_conected", ico_conected); dlg_conectar->get_ok_button()->signal_clicked().connect( SigC::slot(*this, &Principal::on_dlg_connect_ok) ); - mnu_prop->signal_activate().connect( SigC::slot(*this, &Principal::on_mnu_prop)); mnu_disconnect->signal_activate().connect( SigC::slot(*this, &Principal::on_mnu_file_disconnect)); conect->signal_activate().connect( SigC::slot(*this, &Principal::on_mnu_file_connect)); bar_connect->signal_clicked().connect( SigC::slot(*this, &Principal::on_mnu_file_connect)); 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) { + conexion->finish(); + } + // Espera a que termine realmente. + while (conexion) { + Glib::usleep(10000); // 10 milisegundos + } } void Principal::on_dlg_connect_ok() @@ -65,8 +80,9 @@ void Principal::on_dlg_connect_ok() } 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; } @@ -75,13 +91,9 @@ void Principal::on_dlg_connect_ok() conexion->signal_error_received().connect( SigC::slot(*this, &Principal::on_conexion_error) ); conexion->signal_connected().connect( SigC::slot(*this, &Principal::on_conexion_connected) ); 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"); } @@ -93,6 +105,23 @@ 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; @@ -142,16 +171,48 @@ void Principal::on_mnu_help_about() bool Principal::on_item_clicked(GdkEventButton *e, ViewItem *i) { - lbl_nombre->set_text(i->get_name()); + 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() { txt_view->get_buffer()->insert_at_cursor("CONNECTED\n"); ico_conected->set( Gtk::Stock::YES , Gtk::IconSize(Gtk::ICON_SIZE_LARGE_TOOLBAR)); + + // Pido la planta por defecto + 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) +{ + if (conexion != NULL) { + read_status_xml(frame); + } } void Principal::on_conexion_finished() @@ -163,10 +224,18 @@ void Principal::on_conexion_finished() void Principal::on_conexion_ok(const std::string &body) { - std::cout << body << std::endl; - txt_view->get_buffer()->insert_at_cursor("\n"); - txt_view->get_buffer()->insert_at_cursor(Glib::locale_to_utf8(body)); - txt_view->get_buffer()->insert_at_cursor("\n"); + /* lo paso a la carga del XML */ + /* verifico que body este completo */ + if ((body.find("")>0) && (body.find("")>0)) { + //loadXML(body); + xml_body = body; + load_xml_dispatch(); + } else { + std::cout << body << std::endl; + txt_view->get_buffer()->insert_at_cursor("\n"); + txt_view->get_buffer()->insert_at_cursor(Glib::locale_to_utf8(body)); + txt_view->get_buffer()->insert_at_cursor("\n"); + } } void Principal::on_conexion_error(unsigned code) @@ -178,7 +247,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() @@ -187,7 +255,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() ); @@ -201,15 +268,19 @@ void Principal::on_get_clicked() } -void Principal::on_mnu_prop() +void Principal::loadXML() { + // ya lo cargue + if (is_xml_loaded) return; + /* Parseo de ejemplo de un XML desde archivo */ xmlDocPtr document; - document = xmlParseFile("test.xml"); + document = xmlParseMemory(xml_body.c_str(),xml_body.size()); if (document == NULL) { + std::cout << "EEERRRRRRROOOOOOOOOO" << std::endl; return; } - + is_xml_loaded = true; /* bien, el archivo se parseo bien! */ xmlNodePtr nodo, items; nodo = document->children; @@ -238,6 +309,15 @@ void Principal::on_mnu_prop() items = items->next; } } + + 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"); + c.add_arg(conexion->get_host()); + c.add_arg("7528"); + conexion->send(c); } void Principal::loadBomba(xmlNodePtr nodo) @@ -260,7 +340,7 @@ void Principal::loadBomba(xmlNodePtr nodo) } // listo, ya recolecte todos los datos, ahora creo el objeto! - ViewPump *b = Gtk::manage( new ViewPump(name, orientacion) ); + ViewPump *b = new ViewPump(name, orientacion); b->signal_button_press_event().connect(SigC::bind( SigC::slot(*this, &Principal::on_item_clicked), b) ); b->set_position(x,y); work_place->put(*b, x, y); @@ -289,7 +369,7 @@ void Principal::loadCodo(xmlNodePtr nodo) } // listo, ya recolecte todos los datos, ahora creo el objeto! - ViewItem *b = Gtk::manage( new ViewCodo(name, orientacion) ); + ViewItem *b = new ViewCodo(name, orientacion); b->signal_button_press_event().connect(SigC::bind( SigC::slot(*this, &Principal::on_item_clicked), b) ); b->set_position(x,y); work_place->put(*b, x, y); @@ -318,7 +398,7 @@ void Principal::loadConduct(xmlNodePtr nodo) } // listo, ya recolecte todos los datos, ahora creo el objeto! - ViewConduct *b = Gtk::manage( new ViewConduct(name, orientacion) ); + ViewConduct *b = new ViewConduct(name, orientacion); b->signal_button_press_event().connect(SigC::bind( SigC::slot(*this, &Principal::on_item_clicked), b) ); b->set_position(x,y); work_place->put(*b, x, y); @@ -347,7 +427,7 @@ void Principal::loadExclusa(xmlNodePtr nodo) } // listo, ya recolecte todos los datos, ahora creo el objeto! - ViewExclusa *b = Gtk::manage( new ViewExclusa(name, orientacion) ); + ViewExclusa *b = new ViewExclusa(name, orientacion); b->signal_button_press_event().connect(SigC::bind( SigC::slot(*this, &Principal::on_item_clicked), b) ); b->set_position(x,y); work_place->put(*b, x, y); @@ -376,7 +456,7 @@ void Principal::loadTank(xmlNodePtr nodo) } // listo, ya recolecte todos los datos, ahora creo el objeto! - ViewTank *b = Gtk::manage( new ViewTank(name, orientacion) ); + ViewTank *b = new ViewTank(name, orientacion); b->signal_button_press_event().connect(SigC::bind( SigC::slot(*this, &Principal::on_item_clicked), b) ); b->set_position(x,y); work_place->put(*b, x, y); @@ -405,7 +485,7 @@ void Principal::loadUnion(xmlNodePtr nodo) } // listo, ya recolecte todos los datos, ahora creo el objeto! - ViewUnion *b = Gtk::manage( new ViewUnion(name, orientacion) ); + ViewUnion *b = new ViewUnion(name, orientacion); b->signal_button_release_event().connect(SigC::bind( SigC::slot(*this, &Principal::on_item_clicked), b) ); b->set_position(x,y); work_place->put(*b, x, y); @@ -434,7 +514,7 @@ void Principal::loadDrain(xmlNodePtr nodo) } // listo, ya recolecte todos los datos, ahora creo el objeto! - ViewDrain *b = Gtk::manage( new ViewDrain(name, orientacion) ); + ViewDrain *b = new ViewDrain(name, orientacion); b->signal_button_release_event().connect(SigC::bind( SigC::slot(*this, &Principal::on_item_clicked), b) ); b->set_position(x,y); work_place->put(*b, x, y); @@ -442,3 +522,119 @@ void Principal::loadDrain(xmlNodePtr nodo) // los agrego al hash mapItems[name] = b; } + +void Principal::read_status_xml(const std::string &frame) +{ + std::string item_name; + xmlDocPtr document; + document = xmlParseMemory(frame.c_str(),frame.size()); + if (document == NULL) { + std::cout << "read_status_xml::no se creo documento" << std::endl; + return; + } + + xmlNodePtr nodo, items, props; + nodo = document->children; + float tmp; + bool tmp_b; + + if (strcmp((char *)nodo->name, "plantstatus") == 0) { + items = nodo->children; + while (items != NULL) { + if (items->type == XML_ELEMENT_NODE) { + tmp = -1; + item_name = ""; + 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); + } 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; + } + + 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; + while (nodo != NULL) { + if (nodo->type == XML_ELEMENT_NODE) { + if (xmlStrcmp(nodo->name, BAD_CAST"actual_flow")==0) { + tmp = atof( (char *)XML_GET_CONTENT(nodo->children) ); + break; + } + } + nodo = nodo->next; + } + 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"; +} +