Principal::Principal(BaseObjectType *co, const Glib::RefPtr<Gnome::Glade::Xml> &rg):Gtk::Window(co),refXml(rg)
{
Gtk::MenuItem *conect=0, *exit=0, *about=0, *mnu_prop=0, *mnu_disconnect=0, *server_stop=0;
+ Gtk::MenuItem *mnu_simular=0, *mnu_pausar=0;
Gtk::Button *bar_connect=0, *close_about=0;
Gtk::Image *plaqui_logo;
Gtk::Label *lbl_plaqui_version;
rev = rev.substr(6, rev.length() - 8);
std::string s = "PlaQui Client versión " VERSION " (revisión ";
s += rev + ")";
- lbl_plaqui_version->set_text(Glib::locale_to_utf8(s));
+ lbl_plaqui_version->set_text(Glib::convert(s, "UTF-8", "ISO-8859-1"));
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("mnu_pausar", mnu_pausar);
rg->get_widget("btn_pausa", btn_pause);
+ rg->get_widget("mnu_simular", mnu_simular);
rg->get_widget("btn_simular", btn_simulate);
rg->get_widget("btn_activar", btn_activar);
rg->get_widget("color_preview", color_preview);
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_activar->signal_clicked().connect( SigC::slot(*this, &Principal::on_btn_activar_clicked) );
+ mnu_simular->signal_activate().connect( SigC::slot(*this, &Principal::on_btn_simulate_clicked) );
btn_simulate->signal_clicked().connect( SigC::slot(*this, &Principal::on_btn_simulate_clicked) );
+ mnu_pausar->signal_activate().connect( SigC::slot(*this, &Principal::on_btn_pause_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) );
color_high = Gdk::Color("red");
Gtk::Widget::get_default_colormap()->alloc_color(color_low);
Gtk::Widget::get_default_colormap()->alloc_color(color_high);
+ txt_view->set_editable(false);
}
Principal::~Principal()
conexion = new PlaQui::Server::ControlClient(dlg_conectar->get_server_name(), dlg_conectar->get_server_port());
}
catch (...) {
- txt_view->get_buffer()->insert_at_cursor("NO SE PUDO CREAR OBJETO\n");
+ txt_view->get_buffer()->insert(txt_view->get_buffer()->begin(), "NO SE PUDO CONECTAR\n");
//delete conexion; XXX Si no me equivoco, si falla el
//constructor, no se reserva la memoria (el delete no va).
+ delete conexion;
conexion = NULL;
+ dlg_conectar->hide();
return;
}
conexion->signal_frame_received().connect(SigC::slot(*this, &Principal::on_conexion_frame));
// Lanzo la conexion!
conexion->run();
- txt_view->get_buffer()->insert_at_cursor("CONNECTED\n");
+ txt_view->get_buffer()->insert(txt_view->get_buffer()->begin(),"CONNECTED\n");
ico_conected->set( Gtk::Stock::YES , Gtk::IconSize(Gtk::ICON_SIZE_LARGE_TOOLBAR));
// Pido la planta por defecto
bool Principal::on_item_clicked(GdkEventButton *e, ViewItem *i)
{
-
- 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");
+ Glib::ustring s;
+ s = "Selecciono "+i->get_name()+"\n";
+ txt_view->get_buffer()->insert(txt_view->get_buffer()->begin(), s);
last_selected = i;
update_items_prop();
void Principal::on_conexion_finished()
{
- txt_view->get_buffer()->insert_at_cursor("HANG UP\n");
+ txt_view->get_buffer()->insert(txt_view->get_buffer()->begin(),"HANG UP\n");
ico_conected->set( Gtk::Stock::NO , Gtk::IconSize(Gtk::ICON_SIZE_LARGE_TOOLBAR));
conexion = NULL;
// Elimino la planta
/* lo paso a la carga del XML */
/* verifico que body este completo */
if ((body.find("</planta>")>0) && (body.find("<planta>")>0)) {
- //loadXML(body);
xml_body = body;
load_xml_dispatch();
} else {
- std::cout << body << std::endl;
- txt_view->get_buffer()->insert_at_cursor("<IN>\n");
- txt_view->get_buffer()->insert_at_cursor(Glib::locale_to_utf8(body));
- txt_view->get_buffer()->insert_at_cursor("</IN>\n");
+ Glib::ustring s;
+ try {
+ // El mensaje deberia convertirse a UTF antes de
+ // mandarlo para evitar problemas.
+ s = "<IN>\n"+Glib::locale_to_utf8(body)+"\n</IN>\n";
+ }
+ catch (...) {
+ s = "NO SE PUDO CONVERTIR MENSAJE A UTF8";
+ }
+ txt_view->get_buffer()->insert(txt_view->get_buffer()->begin(),s);
}
}
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");
+ Glib::ustring st;
+ st = "Error de red nro. "+s+": "+desc+"\n";
+ txt_view->get_buffer()->insert(txt_view->get_buffer()->begin(),st);
}
void Principal::on_conexion_error(unsigned code, const std::string& desc)
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");
+ Glib::ustring st;
+ st = "El server dice que hay error nro. "+s+": "+desc+"\n";
+ txt_view->get_buffer()->insert(txt_view->get_buffer()->begin(),st);
}
void Principal::loadXML()
xmlDocPtr document;
document = xmlParseMemory(xml_body.c_str(),xml_body.size());
if (document == NULL) {
- std::cout << "EEERRRRRRROOOOOOOOOO" << std::endl;
+ txt_view->get_buffer()->insert(txt_view->get_buffer()->begin(),"No se pudo cargar XML enviado por el servidor.");
+ is_xml_loaded = false;
return;
}
is_xml_loaded = true;
y = atoi( (char *)XML_GET_CONTENT(nodo->children) );
} else if (xmlStrcmp(nodo->name, BAD_CAST"salida") == 0) {
linea.dst = (char *)XML_GET_CONTENT(nodo->children);
+ linea.is_tank = false;
p->out_lines.push_back(linea);
} else if (xmlStrcmp(nodo->name, BAD_CAST"entrada") == 0) {
linea.dst = (char *)XML_GET_CONTENT(nodo->children);
y = atoi( (char *)XML_GET_CONTENT(nodo->children) );
} else if (xmlStrcmp(nodo->name, BAD_CAST"salida") == 0) {
linea.dst = (char *)XML_GET_CONTENT(nodo->children);
+ linea.is_tank = false;
p->out_lines.push_back(linea);
} else if (xmlStrcmp(nodo->name, BAD_CAST"entrada") == 0) {
linea.dst = (char *)XML_GET_CONTENT(nodo->children);
mapItems[name] = b;
}
-void Principal::read_status_xml(const std::string &frame)
+void Principal::read_status_xml(const std::string &_frame)
{
std::string item_name;
+ std::string frame = _frame;
xmlDocPtr document;
+
+ // Cambio las , por . para evitar problemas de convercion
+ for(int i=0; i<frame.size(); i++) {
+ if (frame[i] == ',') {
+ frame[i] = '.';
+ }
+ }
document = xmlParseMemory(frame.c_str(),frame.size());
if (document == NULL) {
- std::cout << "read_status_xml::no se creo documento" << std::endl;
+ txt_view->get_buffer()->insert(txt_view->get_buffer()->begin(), "ERROR : No se pudo leer el último frame!\n");
return;
}
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) {
+ if (xmlStrcmp(xmlGetProp(nodo_tmp, 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);
float Principal::get_float_from_xml(xmlNodePtr nodo)
{
float tmp = -1;
+ std::string s;
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) );
+ s = (char *)XML_GET_CONTENT(nodo->children);
break;
}
}
nodo = nodo->next;
}
+ std::stringstream ss;
+ ss << s;
+ ss >> tmp;
if (tmp == INFINITO) tmp = 0;
+
return tmp;
}
projects / z.facultad / 75.42 / plaqui.git / blobdiff