X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/1f8b8040f374c36d90625d31e0fc1bef2e94f0a8..4f94fbe0a1d217c7410e5396aad365c85f1fc5af:/Client/src/principal.cpp diff --git a/Client/src/principal.cpp b/Client/src/principal.cpp index fab7552..7b441ee 100644 --- a/Client/src/principal.cpp +++ b/Client/src/principal.cpp @@ -3,7 +3,6 @@ #include #include #include -#include "plaqui/server/string.h" #include "item_codo.h" #include "item_conduct.h" #include "item_exclusa.h" @@ -11,7 +10,13 @@ #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 +#include + +#define INFINITO 99999999 Principal::Principal(BaseObjectType *co, const Glib::RefPtr &rg):Gtk::Window(co),refXml(rg) { @@ -21,7 +26,10 @@ Principal::Principal(BaseObjectType *co, const Glib::RefPtr & 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; + 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); @@ -34,6 +42,7 @@ Principal::Principal(BaseObjectType *co, const Glib::RefPtr & 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); @@ -44,7 +53,10 @@ 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)); @@ -52,12 +64,19 @@ Principal::Principal(BaseObjectType *co, const Glib::RefPtr & 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()); + 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() @@ -67,10 +86,74 @@ Principal::~Principal() } // Espera a que termine realmente. while (conexion) { - Glib::usleep(10000); // 10 milisegundos + Glib::usleep(100000); // 0,1 segundo + } +} + +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; + 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); + 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; + 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); + 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() { if (conexion == NULL) { @@ -88,6 +171,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)); @@ -106,9 +190,16 @@ void Principal::on_dlg_connect_ok() void Principal::on_mnu_file_exit() { + on_mnu_file_disconnect(); Gtk::Main::quit(); } +bool Principal::on_delete_event(GdkEventAny *e) +{ + on_mnu_file_exit(); + return false; +} + void Principal::on_btn_activar_clicked() { if ((conexion == NULL) || (last_selected == NULL)) return; @@ -138,7 +229,7 @@ void Principal::on_mnu_file_disconnect() c2.add_arg(conexion->get_host()); c2.add_arg(conexion->get_port()); conexion->send(c2); - //conexion->finish(); + } void Principal::on_mnu_file_connect() @@ -208,7 +299,7 @@ void Principal::update_items_prop() 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) @@ -223,6 +314,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) @@ -241,14 +338,29 @@ 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("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_conexion_error(unsigned 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("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"); } @@ -306,6 +418,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); } } @@ -323,6 +441,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"); @@ -559,7 +783,11 @@ 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) { @@ -591,7 +819,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) @@ -603,14 +831,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; @@ -623,6 +852,7 @@ float Principal::get_float_from_xml(xmlNodePtr nodo) } nodo = nodo->next; } + if (tmp == INFINITO) tmp = 0; return tmp; } @@ -641,3 +871,38 @@ bool Principal::get_bool_from_xml(xmlNodePtr nodo) 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); +} +