X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/5feb2747f8b89db0209a13b826559b02bce3d43f..cd508589aa50ba1a706b8b9f07c9f4c8d6daee4c:/Client/src/principal.cpp?ds=inline diff --git a/Client/src/principal.cpp b/Client/src/principal.cpp index 2973543..6a08583 100644 --- a/Client/src/principal.cpp +++ b/Client/src/principal.cpp @@ -1,6 +1,4 @@ - - #include "principal.h" #include #include @@ -13,24 +11,36 @@ #include "item_pump.h" #include "item_union.h" #include "item_drain.h" +#include "item_not.h" +#include "item_or.h" +#include "item_and.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; + btn_simulate = btn_pause = 0; + rg->get_widget("btn_pausa", btn_pause); + rg->get_widget("btn_simular", btn_simulate); + 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); rg->get_widget("mnu_help_about", about); rg->get_widget("mnu_prop", mnu_prop); + rg->get_widget_derived("dlg_property", dlg_property); rg->get_widget_derived("dlgConectar", dlg_conectar); rg->get_widget("btn_get", btn_get); rg->get_widget("txt_view", txt_view); @@ -41,23 +51,91 @@ Principal::Principal(BaseObjectType *co, const Glib::RefPtr & rg->get_widget("work_place", work_place); rg->get_widget("ico_conected", ico_conected); + work_place->signal_expose_event().connect( SigC::slot(*this, &Principal::on_workplace_expose_event) ); + dlg_property->get_ok_button()->signal_clicked().connect( SigC::slot(*this, &Principal::on_dlg_property_ok) ); 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_property)); 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) ); + btn_simulate->signal_clicked().connect( SigC::slot(*this, &Principal::on_btn_simulate_clicked) ); + btn_pause->signal_clicked().connect( SigC::slot(*this, &Principal::on_btn_pause_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 ) ); + gc = Gdk::GC::create(get_window()); } Principal::~Principal() { - delete conexion; + if (conexion) { + conexion->finish(); + } + // Espera a que termine realmente. + while (conexion) { + Glib::usleep(10000); // 10 milisegundos + } +} + +void Principal::on_realize() +{ + Gtk::Window::on_realize(); +} + +bool Principal::on_workplace_expose_event(GdkEventExpose *e) +{ + Glib::RefPtr window = work_place->get_window(); + + int x1, y1, x2, y2; + // Dibujo las lineas + std::map::iterator i; + for(i=mapItems.begin(); i!=mapItems.end(); i++) { + if (dynamic_cast(i->second) || dynamic_cast(i->second) || dynamic_cast(i->second)) { + x1 = i->second->x + i->second->in_x; + y1 = i->second->y + i->second->in_y; + std::list::iterator linea; + for(linea=i->second->in_lines.begin(); linea!=i->second->in_lines.end(); linea++) { + ViewItem *tmp = find_item(*linea); + x2 = tmp->x + tmp->out_x; + y2 = tmp->y + tmp->out_y; + gc->set_line_attributes(3, Gdk::LINE_SOLID, Gdk::CAP_NOT_LAST, Gdk::JOIN_MITER); + window->draw_line(gc, x2+tmp->item_offset_x, y2+tmp->item_offset_y, x2+tmp->item_offset_x, y1+i->second->offset_y); + window->draw_line(gc, x2+tmp->item_offset_x, y1+i->second->offset_y, x1+i->second->offset_x, y1+i->second->offset_y); + window->draw_line(gc, x1, y1, x1+i->second->offset_x, y1+i->second->offset_y); + window->draw_line(gc, x2, y2, x2+tmp->item_offset_x, y2+tmp->item_offset_y); + } + x1 = i->second->x + i->second->out_x; + y1 = i->second->y + i->second->out_y; + for(linea=i->second->out_lines.begin(); linea!=i->second->out_lines.end(); linea++) { + ViewItem *tmp = find_item(*linea); + x2 = tmp->x + tmp->in_x; + y2 = tmp->y + tmp->in_y; + gc->set_line_attributes(3, Gdk::LINE_SOLID, Gdk::CAP_NOT_LAST, Gdk::JOIN_MITER); + window->draw_line(gc, x1+i->second->offset_x, y1+i->second->offset_y, x1+i->second->offset_x, y2+tmp->item_offset_y); + window->draw_line(gc, x1+i->second->offset_x, y2+tmp->item_offset_y, x2+tmp->item_offset_x, y2+tmp->item_offset_y); + window->draw_line(gc, x1, y1, x1+i->second->offset_x, y1+i->second->offset_y); + window->draw_line(gc, x2, y2, x2+tmp->item_offset_x, y2+tmp->item_offset_y); + } + } + } +} + +ViewItem *Principal::find_item(std::string &_name) +{ + std::map::iterator i; + for(i=mapItems.begin(); i!=mapItems.end(); i++) { + if (i->second->get_name() == _name) { + return i->second; + } + } + return NULL; } void Principal::on_dlg_connect_ok() @@ -69,21 +147,26 @@ 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; } // Conecto las señales conexion->signal_ok_received().connect( SigC::slot(*this, &Principal::on_conexion_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! conexion->run(); - } else { - txt_view->get_buffer()->insert_at_cursor("YA ESTAS CONECTADO\n"); + 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 + PlaQui::Server::Command c("plant", "get"); + c.add_arg("default"); + conexion->send(c); } dlg_conectar->hide(); } @@ -93,11 +176,36 @@ 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; - conexion->finish(); + PlaQui::Server::Command c("transmission", "stop"); + c.add_arg(conexion->get_host()); + c.add_arg("7528"); + conexion->send(c); + PlaQui::Server::Command c2("connection", "stop"); + c2.add_arg(conexion->get_host()); + c2.add_arg(conexion->get_port()); + conexion->send(c2); + } void Principal::on_mnu_file_connect() @@ -139,28 +247,42 @@ 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::on_conexion_connected() +void Principal::update_items_prop() { - txt_view->get_buffer()->insert_at_cursor("CONNECTED\n"); - ico_conected->set( Gtk::Stock::YES , Gtk::IconSize(Gtk::ICON_SIZE_LARGE_TOOLBAR)); + 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(); + + // Mando a redibujar a todos los items + std::map::iterator i; + for(i=mapItems.begin(); i!=mapItems.end(); i++) { + i->second->queue_draw(); + } - // Pido la planta por defecto - 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); + if (conexion != NULL) { + read_status_xml(frame); + } } void Principal::on_conexion_finished() @@ -168,6 +290,12 @@ void Principal::on_conexion_finished() txt_view->get_buffer()->insert_at_cursor("HANG UP\n"); ico_conected->set( Gtk::Stock::NO , Gtk::IconSize(Gtk::ICON_SIZE_LARGE_TOOLBAR)); conexion = NULL; + // Elimino la planta + std::map::iterator i; + for(i=mapItems.begin(); i!=mapItems.end(); i++) { + delete i->second; + } + mapItems.clear(); } void Principal::on_conexion_ok(const std::string &body) @@ -251,6 +379,12 @@ void Principal::loadXML() loadUnion(items); } else if (xmlStrcmp(items->name, BAD_CAST"drenaje")==0) { loadDrain(items); + } else if (xmlStrcmp(items->name, BAD_CAST"and")==0) { + loadAnd(items); + } else if (xmlStrcmp(items->name, BAD_CAST"or")==0) { + loadOr(items); + } else if (xmlStrcmp(items->name, BAD_CAST"not")==0) { + loadNot(items); } } @@ -258,6 +392,8 @@ void Principal::loadXML() } } + 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"); @@ -266,6 +402,112 @@ void Principal::loadXML() conexion->send(c); } +void Principal::loadNot(xmlNodePtr nodo) +{ + std::string name = (char *)xmlGetProp(nodo, BAD_CAST"nombre"); + std::string id = (char *)xmlGetProp(nodo, BAD_CAST"id"); + int orientacion=0, x, y; + + ViewNot *p; + nodo = nodo->children; + while (nodo != NULL) { + if (nodo->type == XML_ELEMENT_NODE) { + if (xmlStrcmp(nodo->name, BAD_CAST"orientacion") == 0) { + orientacion = atoi( (char *)XML_GET_CONTENT(nodo->children) ); + p = new ViewNot(name, orientacion); + } else if (xmlStrcmp(nodo->name, BAD_CAST"x") == 0) { + x = atoi( (char *)XML_GET_CONTENT(nodo->children) ); + } else if (xmlStrcmp(nodo->name, BAD_CAST"y") == 0) { + y = atoi( (char *)XML_GET_CONTENT(nodo->children) ); + } else if (xmlStrcmp(nodo->name, BAD_CAST"salida") == 0) { + p->out_lines.push_back((char *)XML_GET_CONTENT(nodo->children)); + } else if (xmlStrcmp(nodo->name, BAD_CAST"entrada") == 0) { + p->in_lines.push_back((char *)XML_GET_CONTENT(nodo->children)); + } + } + nodo = nodo->next; + } + + p->signal_button_press_event().connect(SigC::bind( SigC::slot(*this, &Principal::on_item_clicked), p) ); + p->set_position(x,y); + work_place->put(*p, x, y); + p->show(); + // los agrego al hash + mapItems[name] = p; +} + +void Principal::loadOr(xmlNodePtr nodo) +{ + std::string name = (char *)xmlGetProp(nodo, BAD_CAST"nombre"); + std::string id = (char *)xmlGetProp(nodo, BAD_CAST"id"); + int orientacion=0, x, y; + + ViewOr *p; + + nodo = nodo->children; + while (nodo != NULL) { + if (nodo->type == XML_ELEMENT_NODE) { + if (xmlStrcmp(nodo->name, BAD_CAST"orientacion") == 0) { + orientacion = atoi( (char *)XML_GET_CONTENT(nodo->children) ); + p = new ViewOr(name, orientacion); + } else if (xmlStrcmp(nodo->name, BAD_CAST"x") == 0) { + x = atoi( (char *)XML_GET_CONTENT(nodo->children) ); + } else if (xmlStrcmp(nodo->name, BAD_CAST"y") == 0) { + y = atoi( (char *)XML_GET_CONTENT(nodo->children) ); + } else if (xmlStrcmp(nodo->name, BAD_CAST"salida") == 0) { + p->out_lines.push_back((char *)XML_GET_CONTENT(nodo->children)); + } else if (xmlStrcmp(nodo->name, BAD_CAST"entrada") == 0) { + p->in_lines.push_back((char *)XML_GET_CONTENT(nodo->children)); + } + } + nodo = nodo->next; + } + + p->signal_button_press_event().connect(SigC::bind( SigC::slot(*this, &Principal::on_item_clicked), p) ); + p->set_position(x,y); + work_place->put(*p, x, y); + p->show(); + // los agrego al hash + mapItems[name] = p; +} + +void Principal::loadAnd(xmlNodePtr nodo) +{ + std::string name = (char *)xmlGetProp(nodo, BAD_CAST"nombre"); + std::string id = (char *)xmlGetProp(nodo, BAD_CAST"id"); + int orientacion=0, x, y; + float flujo; + xmlNodePtr inicial = nodo; + + ViewAnd *p; + + nodo = nodo->children; + while (nodo != NULL) { + if (nodo->type == XML_ELEMENT_NODE) { + if (xmlStrcmp(nodo->name, BAD_CAST"orientacion") == 0) { + orientacion = atoi( (char *)XML_GET_CONTENT(nodo->children) ); + p = new ViewAnd(name, orientacion); + } else if (xmlStrcmp(nodo->name, BAD_CAST"x") == 0) { + x = atoi( (char *)XML_GET_CONTENT(nodo->children) ); + } else if (xmlStrcmp(nodo->name, BAD_CAST"y") == 0) { + y = atoi( (char *)XML_GET_CONTENT(nodo->children) ); + } else if (xmlStrcmp(nodo->name, BAD_CAST"salida") == 0) { + p->out_lines.push_back((char *)XML_GET_CONTENT(nodo->children)); + } else if (xmlStrcmp(nodo->name, BAD_CAST"entrada") == 0) { + p->in_lines.push_back((char *)XML_GET_CONTENT(nodo->children)); + } + } + nodo = nodo->next; + } + + p->signal_button_press_event().connect(SigC::bind( SigC::slot(*this, &Principal::on_item_clicked), p) ); + p->set_position(x,y); + work_place->put(*p, x, y); + p->show(); + // los agrego al hash + mapItems[name] = p; +} + void Principal::loadBomba(xmlNodePtr nodo) { Glib::ustring name = (char *)xmlGetProp(nodo, BAD_CAST"nombre"); @@ -482,25 +724,78 @@ 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; 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(items, BAD_CAST"name"); - std::cout << "CONDUCT :: " << item_name << " -> " << tmp << std::endl; 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; @@ -513,7 +808,56 @@ 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"; +} + +void Principal::on_mnu_property() +{ + dlg_property->show(); +} + +void Principal::on_dlg_property_ok() +{ + if (conexion) { + PlaQui::Server::Command c("plant", "set_frequency"); + c.add_arg("default"); + c.add_arg( dlg_property->get_velocity() ); + + conexion->send(c); + } + dlg_property->hide(); +} + +void Principal::on_btn_simulate_clicked() +{ + if (conexion == NULL) return; + + PlaQui::Server::Command c("plant", "start"); + c.add_arg("default"); + conexion->send(c); +} + +void Principal::on_btn_pause_clicked() +{ + if (conexion == NULL) return; + + PlaQui::Server::Command c("plant", "stop"); + c.add_arg("default"); + conexion->send(c); +} +