agrego mi partes sobre los problemas encontrados

[z.facultad/75.42/plaqui.git] / Client / src / principal.cpp

diff --git a/Client/src/principal.cpp b/Client/src/principal.cpp
index a94ec37775589196663e07390899fbdfd872d809..89caf8233ccf2161847e4119c618a0354b10b35d 100644 (file)
--- a/Client/src/principal.cpp
+++ b/Client/src/principal.cpp
@@ -21,6 +21,7 @@
 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;
 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;
        Gtk::Button *bar_connect=0, *close_about=0;
        Gtk::Image *plaqui_logo;
        Gtk::Label *lbl_plaqui_version;


@@ -52,14 +53,16 @@ Principal::Principal(BaseObjectType *co, const Glib::RefPtr<Gnome::Glade::Xml> &
        rev = rev.substr(6, rev.length() - 8);
        std::string s = "PlaQui Client versión " VERSION " (revisión ";
        s += rev + ")"; 
        rev = rev.substr(6, rev.length() - 8);
        std::string s = "PlaQui Client versión " VERSION " (revisión ";
        s += rev + ")"; 

-       lbl_plaqui_version->set_text(s);
+       lbl_plaqui_version->set_text(Glib::locale_to_utf8(s));

 
        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("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("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);
        rg->get_widget("btn_simular", btn_simulate);
        rg->get_widget("btn_activar", btn_activar);
        rg->get_widget("color_preview", color_preview);


@@ -92,7 +95,9 @@ Principal::Principal(BaseObjectType *co, const Glib::RefPtr<Gnome::Glade::Xml> &
        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) );
        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) );
        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) );
        
        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) );
        


@@ -107,6 +112,7 @@ Principal::Principal(BaseObjectType *co, const Glib::RefPtr<Gnome::Glade::Xml> &
        color_high = Gdk::Color("red");
        Gtk::Widget::get_default_colormap()->alloc_color(color_low);
        Gtk::Widget::get_default_colormap()->alloc_color(color_high);
        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()
 }
 
 Principal::~Principal()


@@ -206,10 +212,12 @@ void Principal::on_dlg_connect_ok()
                        conexion = new PlaQui::Server::ControlClient(dlg_conectar->get_server_name(), dlg_conectar->get_server_port());
                }
                catch (...) {
                        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; XXX Si no me equivoco, si falla el
                        //constructor, no se reserva la memoria (el delete no va).

+                       delete conexion;

                        conexion = NULL;
                        conexion = NULL;

+                       dlg_conectar->hide();

                        return;
                }
 
                        return;
                }
 


@@ -221,7 +229,7 @@ void Principal::on_dlg_connect_ok()
                conexion->signal_frame_received().connect(SigC::slot(*this, &Principal::on_conexion_frame));
                // Lanzo la conexion!
                conexion->run();
                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
                ico_conected->set( Gtk::Stock::YES , Gtk::IconSize(Gtk::ICON_SIZE_LARGE_TOOLBAR));
 
                // Pido la planta por defecto


@@ -302,10 +310,9 @@ void Principal::on_mnu_help_about()
 
 bool Principal::on_item_clicked(GdkEventButton *e, ViewItem *i)
 {
 
 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();
 
        last_selected = i;
        update_items_prop();


@@ -350,7 +357,7 @@ void Principal::on_conexion_frame(const std::string &frame)
 
 void Principal::on_conexion_finished()
 {
 
 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    
        ico_conected->set( Gtk::Stock::NO , Gtk::IconSize(Gtk::ICON_SIZE_LARGE_TOOLBAR));
        conexion = NULL;
        // Elimino la planta    


@@ -367,14 +374,12 @@ void Principal::on_conexion_ok(const std::string &body)
        /* lo paso a la carga del XML */
        /* verifico que body este completo */
        if ((body.find("</planta>")>0) && (body.find("<planta>")>0)) {
        /* 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 {
                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;
+               s = "<IN>\n"+Glib::locale_to_utf8(body)+"\n</IN>\n";
+               txt_view->get_buffer()->insert(txt_view->get_buffer()->begin(),s);

        }
 }
 
        }
 }
 


@@ -384,11 +389,9 @@ void Principal::on_conexion_fatal_error(const PlaQui::Server::ControlClient::Err
        std::string s;
        a << code;
        a >> 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)
 }
 
 void Principal::on_conexion_error(unsigned code, const std::string& desc)


@@ -397,11 +400,9 @@ void Principal::on_conexion_error(unsigned code, const std::string& desc)
        std::string s;
        a << code;
        a >> s;
        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()
 }
 
 void Principal::loadXML()


@@ -413,7 +414,8 @@ void Principal::loadXML()
        xmlDocPtr document;
        document = xmlParseMemory(xml_body.c_str(),xml_body.size());
        if (document == NULL) {
        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;
                return;
        }
        is_xml_loaded = true;


@@ -806,7 +808,7 @@ void Principal::read_status_xml(const std::string &frame)
        xmlDocPtr document;
        document = xmlParseMemory(frame.c_str(),frame.size());
        if (document == NULL) {
        xmlDocPtr document;
        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;
        }
        
                return;
        }