X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/ffc9f02ea0544d4b1aa86e29afe12a2b4bace953..d28e70425d07b46f732db220f83d6c0826c90a88:/Client/src/principal.cpp diff --git a/Client/src/principal.cpp b/Client/src/principal.cpp index 46ec40b..cdba798 100644 --- a/Client/src/principal.cpp +++ b/Client/src/principal.cpp @@ -16,16 +16,37 @@ #include #include +#define INFINITO 99999999 + 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=0; - Gtk::Button *btn_get=0, *bar_connect=0; + Gtk::MenuItem *conect=0, *exit=0, *about=0, *mnu_prop=0, *mnu_disconnect=0, *server_stop=0; + Gtk::Button *bar_connect=0, *close_about=0; + Gtk::Image *plaqui_logo; txt_view = 0; - txt_target = txt_command = txt_args = 0; work_place = 0; lbl_cap_flujo = lbl_cap_extra = lbl_extra = lbl_nombre = lbl_color = lbl_flujo = 0; btn_simulate = btn_pause = 0; + anim_frames[0] = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-client/pixmaps/anim_0.png"); + anim_frames[1] = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-client/pixmaps/anim_1.png"); + anim_frames[2] = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-client/pixmaps/anim_2.png"); + anim_frames[3] = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-client/pixmaps/anim_3.png"); + anim_frames[4] = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-client/pixmaps/anim_4.png"); + anim_frames[5] = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-client/pixmaps/anim_5.png"); + anim_frames[6] = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-client/pixmaps/anim_6.png"); + anim_frames[7] = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-client/pixmaps/anim_7.png"); + current_frame = 0; + + plaqui_logo = anim = 0; + rg->get_widget("plaqui_logo", plaqui_logo); + plaqui_logo->set(PACKAGE_DATA_DIR"/plaqui-client/pixmaps/logo.png"); + + rg->get_widget("anim_frames", anim); + anim->set(anim_frames[current_frame]); + + rg->get_widget("close_about", close_about); + rg->get_widget("dlgAbout", dlg_about); rg->get_widget("btn_pausa", btn_pause); rg->get_widget("btn_simular", btn_simulate); rg->get_widget("btn_activar", btn_activar); @@ -39,14 +60,11 @@ Principal::Principal(BaseObjectType *co, const Glib::RefPtr & 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_server_stop", server_stop); 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); - rg->get_widget("txt_target", txt_target); - rg->get_widget("txt_command", txt_command); - rg->get_widget("txt_args", txt_args); rg->get_widget("bar_connect", bar_connect); rg->get_widget("work_place", work_place); rg->get_widget("ico_conected", ico_conected); @@ -56,32 +74,31 @@ Principal::Principal(BaseObjectType *co, const Glib::RefPtr & 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)); + server_stop->signal_activate().connect( SigC::slot(*this, &Principal::on_mnu_server_stop_activate)); 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) ); + close_about->signal_clicked().connect( SigC::slot(*dlg_about, &Gtk::Widget::hide) ); conexion = NULL; is_xml_loaded = false; last_selected = NULL; + paused = true; 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()); + color_low = Gdk::Color("blue"); + color_high = Gdk::Color("red"); + Gtk::Widget::get_default_colormap()->alloc_color(color_low); + Gtk::Widget::get_default_colormap()->alloc_color(color_high); } Principal::~Principal() { - if (conexion) { - conexion->finish(); - } - // Espera a que termine realmente. - while (conexion) { - Glib::usleep(10000); // 10 milisegundos - } } void Principal::on_realize() @@ -100,11 +117,37 @@ bool Principal::on_workplace_expose_event(GdkEventExpose *e) 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; + 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; + ViewItem *tmp = find_item(linea->dst); + /* Si este item es un tanque */ + if (linea->is_tank) { + if (linea->is_tank_lower) { + x2 = tmp->x + tmp->out_x; + y2 = tmp->y + tmp->out_y; + if (dynamic_cast(tmp)->get_out_inf()) { + gc->set_foreground(color_high); + } else { + gc->set_foreground(color_low); + } + } else { + x2 = tmp->x + tmp->in_x; + y2 = tmp->y + tmp->in_y; + if (dynamic_cast(tmp)->get_out_sup()) { + gc->set_foreground(color_high); + } else { + gc->set_foreground(color_low); + } + } + } else { + x2 = tmp->x + tmp->out_x; + y2 = tmp->y + tmp->out_y; + if (tmp->get_open()) { + gc->set_foreground(color_high); + } else { + gc->set_foreground(color_low); + } + } 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); @@ -114,9 +157,14 @@ bool Principal::on_workplace_expose_event(GdkEventExpose *e) 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); + ViewItem *tmp = find_item(linea->dst); x2 = tmp->x + tmp->in_x; y2 = tmp->y + tmp->in_y; + if (i->second->get_open()) { + gc->set_foreground(color_high); + } else { + gc->set_foreground(color_low); + } 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); @@ -155,6 +203,7 @@ void Principal::on_dlg_connect_ok() // Conecto las señales conexion->signal_ok_received().connect( SigC::slot(*this, &Principal::on_conexion_ok) ); + conexion->signal_error().connect( SigC::slot(*this, &Principal::on_conexion_fatal_error) ); conexion->signal_error_received().connect( SigC::slot(*this, &Principal::on_conexion_error) ); conexion->signal_finished().connect( SigC::slot(*this, &Principal::on_conexion_finished) ); conexion->signal_frame_received().connect(SigC::slot(*this, &Principal::on_conexion_frame)); @@ -173,9 +222,31 @@ void Principal::on_dlg_connect_ok() void Principal::on_mnu_file_exit() { + on_mnu_file_disconnect(); + if (conexion) { + conexion->finish(); + } + // Espera a que termine realmente. + while (conexion) { + Glib::usleep(100000); // 0,1 segundo + } Gtk::Main::quit(); } +bool Principal::on_delete_event(GdkEventAny *e) +{ + on_mnu_file_exit(); + return false; +} + +void Principal::on_mnu_server_stop_activate() +{ + if (conexion == NULL) return; + + PlaQui::Server::Command c("server", "stop"); + conexion->send(c); +} + void Principal::on_btn_activar_clicked() { if ((conexion == NULL) || (last_selected == NULL)) return; @@ -205,7 +276,6 @@ void Principal::on_mnu_file_disconnect() c2.add_arg(conexion->get_host()); c2.add_arg(conexion->get_port()); conexion->send(c2); - } void Principal::on_mnu_file_connect() @@ -215,34 +285,7 @@ void Principal::on_mnu_file_connect() void Principal::on_mnu_help_about() { - // preparo para leer el archivo ChangeLog -/* Glib::RefPtr xml; - Glib::ustring line; - Glib::RefPtr log_buffer; - Glib::RefPtr log_io; - - log_buffer = Gtk::TextBuffer::create(); - log_io = Glib::IOChannel::create_from_file("../ChangeLog", "r"); - while (log_io->read_line(line) != Glib::IO_STATUS_EOF) { - log_buffer->insert_at_cursor(line); - } - - try { - xml = Gnome::Glade::Xml::create("client.glade", "dlgAbout"); - } - catch(const Gnome::Glade::XmlError &ex) { - std::cerr << ex.what() << std::endl; - return; - } - Gtk::Window *dlg = 0; - Gtk::Button *btn_cerrar = 0; - Gtk::TextView *txt_changelog = 0; - xml->get_widget("dlgAbout", dlg); - xml->get_widget("btn_close", btn_cerrar); - xml->get_widget("txt_changelog", txt_changelog); - btn_cerrar->signal_clicked().connect(SigC::slot(*dlg, &Gtk::Dialog::hide)); - txt_changelog->set_buffer(log_buffer); - dlg->show();*/ + dlg_about->run(); } bool Principal::on_item_clicked(GdkEventButton *e, ViewItem *i) @@ -258,24 +301,32 @@ bool Principal::on_item_clicked(GdkEventButton *e, ViewItem *i) void Principal::update_items_prop() { - if (last_selected == NULL) return; + if (last_selected != NULL) { + 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_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()); - 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(); + } - color_preview->modify_bg(Gtk::STATE_NORMAL, last_selected->get_color()); - color_preview->queue_draw(); + if (!paused) { + current_frame++; + if (current_frame > 7) { + current_frame = 0; + } + anim->set(anim_frames[current_frame]); + } // Mando a redibujar a todos los items std::map::iterator i; for(i=mapItems.begin(); i!=mapItems.end(); i++) { i->second->queue_draw(); } - + work_place->queue_draw(); } void Principal::on_conexion_frame(const std::string &frame) @@ -296,6 +347,7 @@ void Principal::on_conexion_finished() delete i->second; } mapItems.clear(); + is_xml_loaded = false; } void Principal::on_conexion_ok(const std::string &body) @@ -314,34 +366,30 @@ void Principal::on_conexion_ok(const std::string &body) } } -void Principal::on_conexion_error(unsigned code) +void Principal::on_conexion_fatal_error(const PlaQui::Server::ControlClient::Error& code, const std::string& desc) { std::stringstream a; std::string s; a << code; a >> s; - txt_view->get_buffer()->insert_at_cursor("El server dice que hay error : "); + txt_view->get_buffer()->insert_at_cursor("Error de red nro. "); txt_view->get_buffer()->insert_at_cursor(s); + txt_view->get_buffer()->insert_at_cursor(": "); + txt_view->get_buffer()->insert_at_cursor(desc); txt_view->get_buffer()->insert_at_cursor("\n"); } -void Principal::on_get_clicked() +void Principal::on_conexion_error(unsigned code, const std::string& desc) { - if (conexion == NULL) { - 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() ); - txt_view->get_buffer()->insert_at_cursor("Enviando comando\n"); - try { - conexion->send(command); - } - catch (...) { - txt_view->get_buffer()->insert_at_cursor("EXCEPTION EN conexion->send !!\n"); - } - + std::stringstream a; + std::string s; + a << code; + a >> s; + txt_view->get_buffer()->insert_at_cursor("El server dice que hay error nro. "); + txt_view->get_buffer()->insert_at_cursor(s); + txt_view->get_buffer()->insert_at_cursor(": "); + txt_view->get_buffer()->insert_at_cursor(desc); + txt_view->get_buffer()->insert_at_cursor("\n"); } void Principal::loadXML() @@ -407,6 +455,7 @@ 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; + t_Linea linea; ViewNot *p; nodo = nodo->children; @@ -420,9 +469,18 @@ void Principal::loadNot(xmlNodePtr nodo) } 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)); + linea.dst = (char *)XML_GET_CONTENT(nodo->children); + p->out_lines.push_back(linea); } else if (xmlStrcmp(nodo->name, BAD_CAST"entrada") == 0) { - p->in_lines.push_back((char *)XML_GET_CONTENT(nodo->children)); + linea.dst = (char *)XML_GET_CONTENT(nodo->children); + linea.is_tank = false; + if (dynamic_cast(find_item(linea.dst)) != NULL) { + linea.is_tank = true; + linea.is_tank_lower = false; + if (xmlStrcmp(xmlGetProp(nodo, BAD_CAST"id"), BAD_CAST"inferior")==0) + linea.is_tank_lower = true; + } + p->in_lines.push_back(linea); } } nodo = nodo->next; @@ -441,6 +499,7 @@ 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; + t_Linea linea; ViewOr *p; @@ -455,9 +514,18 @@ void Principal::loadOr(xmlNodePtr nodo) } 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)); + linea.dst = (char *)XML_GET_CONTENT(nodo->children); + p->out_lines.push_back(linea); } else if (xmlStrcmp(nodo->name, BAD_CAST"entrada") == 0) { - p->in_lines.push_back((char *)XML_GET_CONTENT(nodo->children)); + linea.dst = (char *)XML_GET_CONTENT(nodo->children); + linea.is_tank = false; + if (dynamic_cast(find_item(linea.dst)) != NULL) { + linea.is_tank = true; + linea.is_tank_lower = false; + if (xmlStrcmp(xmlGetProp(nodo, BAD_CAST"id"), BAD_CAST"inferior")==0) + linea.is_tank_lower = true; + } + p->in_lines.push_back(linea); } } nodo = nodo->next; @@ -478,7 +546,7 @@ void Principal::loadAnd(xmlNodePtr nodo) int orientacion=0, x, y; float flujo; xmlNodePtr inicial = nodo; - + t_Linea linea; ViewAnd *p; nodo = nodo->children; @@ -492,9 +560,18 @@ void Principal::loadAnd(xmlNodePtr nodo) } 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)); + linea.dst = (char *)XML_GET_CONTENT(nodo->children); + p->out_lines.push_back(linea); } else if (xmlStrcmp(nodo->name, BAD_CAST"entrada") == 0) { - p->in_lines.push_back((char *)XML_GET_CONTENT(nodo->children)); + linea.dst = (char *)XML_GET_CONTENT(nodo->children); + linea.is_tank = false; + if (dynamic_cast(find_item(linea.dst)) != NULL) { + linea.is_tank = true; + linea.is_tank_lower = false; + if (xmlStrcmp(xmlGetProp(nodo, BAD_CAST"id"), BAD_CAST"inferior")==0) + linea.is_tank_lower = true; + } + p->in_lines.push_back(linea); } } nodo = nodo->next; @@ -744,25 +821,39 @@ 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); - } else if (xmlStrcmp(items->name, BAD_CAST"color")==0) { + } else if (xmlStrcmp(items->name, BAD_CAST"logic")==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; + bool b_inf, b_sup; 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) ); + else if (xmlStrcmp(nodo_tmp->name, BAD_CAST"salida")==0) { + if (xmlStrcmp(xmlGetProp(items, BAD_CAST"id"), BAD_CAST"inferior")==0) { + b_inf = get_bool_from_xml(nodo_tmp->children); + } else { + b_sup = get_bool_from_xml(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); + dynamic_cast(mapItems[item_name])->set_out_sup(b_sup); + dynamic_cast(mapItems[item_name])->set_out_inf(b_inf); } } items = items->next; @@ -776,7 +867,7 @@ void Principal::read_status_xml(const std::string &frame) Gdk::Color Principal::get_rgb_from_xml(xmlNodePtr nodo) { - unsigned r,g,b; + gushort r,g,b; while (nodo != NULL) { if (nodo->type == XML_ELEMENT_NODE) { if (xmlStrcmp(nodo->name, BAD_CAST"r")==0) @@ -788,14 +879,15 @@ Gdk::Color Principal::get_rgb_from_xml(xmlNodePtr nodo) } nodo = nodo->next; } - r = 65535 * r / 255; - g = 65535 * g / 255; - b = 65535 * b / 255; + r = static_cast(65535 * (r / 255.0f)); + g = static_cast(65535 * (g / 255.0f)); + b = static_cast(65535 * (b / 255.0f)); Gdk::Color c; c.set_rgb(r,g,b); return c; } + float Principal::get_float_from_xml(xmlNodePtr nodo) { float tmp = -1; @@ -808,6 +900,7 @@ float Principal::get_float_from_xml(xmlNodePtr nodo) } nodo = nodo->next; } + if (tmp == INFINITO) tmp = 0; return tmp; } @@ -850,6 +943,7 @@ void Principal::on_btn_simulate_clicked() PlaQui::Server::Command c("plant", "start"); c.add_arg("default"); conexion->send(c); + paused = false; } void Principal::on_btn_pause_clicked() @@ -859,5 +953,6 @@ void Principal::on_btn_pause_clicked() PlaQui::Server::Command c("plant", "stop"); c.add_arg("default"); conexion->send(c); + paused = true; }