X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/78a6866a5076cee1015d8985b5bbbb84adf32576..4341c033f13578b5b3aeb3e08e20d3889cb2d7c7:/Client/src/principal.cpp?ds=inline diff --git a/Client/src/principal.cpp b/Client/src/principal.cpp index 5066b52..3a9bfe4 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,18 +74,20 @@ 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()); @@ -79,13 +99,6 @@ Principal::Principal(BaseObjectType *co, const Glib::RefPtr & Principal::~Principal() { - if (conexion) { - conexion->finish(); - } - // Espera a que termine realmente. - while (conexion) { - Glib::usleep(100000); // 0,1 segundo - } } void Principal::on_realize() @@ -189,6 +202,13 @@ 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(); } @@ -198,6 +218,14 @@ bool Principal::on_delete_event(GdkEventAny *e) 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; @@ -227,7 +255,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() @@ -237,34 +264,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) @@ -280,17 +280,25 @@ 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; @@ -318,6 +326,7 @@ void Principal::on_conexion_finished() delete i->second; } mapItems.clear(); + is_xml_loaded = false; } void Principal::on_conexion_ok(const std::string &body) @@ -362,25 +371,6 @@ void Principal::on_conexion_error(unsigned code, const std::string& desc) txt_view->get_buffer()->insert_at_cursor("\n"); } -void Principal::on_get_clicked() -{ - 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"); - } - -} - void Principal::loadXML() { // ya lo cargue @@ -850,6 +840,7 @@ float Principal::get_float_from_xml(xmlNodePtr nodo) } nodo = nodo->next; } + if (tmp == INFINITO) tmp = 0; return tmp; } @@ -892,6 +883,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() @@ -901,5 +893,6 @@ void Principal::on_btn_pause_clicked() PlaQui::Server::Command c("plant", "stop"); c.add_arg("default"); conexion->send(c); + paused = true; }