agrego los menues que faltaban y hago unos pequenios cambios para que al poner new...

[z.facultad/75.42/plaqui.git] / Constructor / src / constructor.cpp

diff --git a/Constructor/src/constructor.cpp b/Constructor/src/constructor.cpp
index 4ab3b19c5fe2c30a4782fd61f7942443d50af9a4..87a943bb72e924fcc54aab2949dc7b1f104e8f62 100644 (file)
--- a/Constructor/src/constructor.cpp
+++ b/Constructor/src/constructor.cpp
@@ -3,6 +3,7 @@
 Constructor::Constructor(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade):Gtk::Window(cobject)
 {
        id = 0;
+       saved = false;
        set_title("Constructor");
        
        
@@ -28,6 +29,7 @@ Constructor::Constructor(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glad
        refGlade->get_widget("btn_or", btn_or);
        refGlade->get_widget("btn_not", btn_not);
        refGlade->get_widget("main_menu_quit",main_menu_quit);
+       refGlade->get_widget("main_menu_new",main_menu_new);
        refGlade->get_widget("main_menu_open",main_menu_open);
        refGlade->get_widget("main_menu_save",main_menu_save);
        refGlade->get_widget("edit_menu_del",edit_menu_del);
@@ -39,6 +41,10 @@ Constructor::Constructor(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glad
        refGlade->get_widget("dlg_connect", dlg_connect);
        refGlade->get_widget("btn_dlg_close", btn_dlg_close);
        refGlade->get_widget("dlg_label", dlg_label);
+       refGlade->get_widget("quick_btn_new", quick_btn_new);
+       refGlade->get_widget("quick_btn_save", quick_btn_save);
+       refGlade->get_widget("quick_btn_open", quick_btn_open);
+       refGlade->get_widget("edit_menu_delete_all", edit_menu_delete_all);
        
        refGlade->get_widget_derived("workplace", workplace);  //fixed
        
@@ -72,12 +78,17 @@ Constructor::Constructor(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glad
        btn_check->signal_clicked().connect(SigC::slot(*this,&Constructor::on_btn_check_clicked));
        btn_dlg_close->signal_clicked().connect(SigC::slot(*this,&Constructor::on_btn_dlg_connect_clicked));
        chk_btn_logica->signal_clicked().connect(SigC::slot(*this, &Constructor::on_chk_btn_clicked));
+       quick_btn_new->signal_clicked().connect(SigC::slot(*this, &Constructor::on_quick_btn_new_clicked));
+       quick_btn_save->signal_clicked().connect(SigC::slot(*this, &Constructor::on_quick_btn_save_clicked));
+       quick_btn_open->signal_clicked().connect(SigC::slot(*this, &Constructor::on_main_menu_open));
        
        main_menu_quit->signal_activate().connect(SigC::slot(*this, &Constructor::on_main_menu_quit));
+       main_menu_new->signal_activate().connect(SigC::slot(*this, &Constructor::on_quick_btn_new_clicked));
        main_menu_open->signal_activate().connect(SigC::slot(*this, &Constructor::on_main_menu_open));
        main_menu_save->signal_activate().connect(SigC::slot(*this, &Constructor::on_main_menu_save));
        edit_menu_del->signal_activate().connect(SigC::slot(*this,&Constructor::on_edit_menu_del));
-                       
+       edit_menu_delete_all->signal_activate().connect(SigC::slot(*this,&Constructor::on_quick_btn_delete_all_clicked));
+       
        btn_file_cancel = file_selection->get_cancel_button();
        btn_file_ok = file_selection->get_ok_button();
        btn_file_ok->signal_clicked().connect(SigC::slot(*this,&Constructor::on_btn_file_ok_clicked));
@@ -198,6 +209,7 @@ void Constructor::on_edit_menu_delete_all()
                (*i)->workplace->delete_item((*i)->get_id());
                i=lista_logic_Items.begin();
        }
+       id = 0;
 }
 
 void Constructor::on_chk_btn_clicked()
@@ -208,7 +220,8 @@ void Constructor::on_chk_btn_clicked()
 
 void Constructor::on_load_from_xml()
 {
-       std::string file_name = file_open_selection->get_filename();
+       on_edit_menu_delete_all();
+       file_name = file_open_selection->get_filename();
 
        /* Parseo de ejemplo de un XML desde archivo */
        xmlDocPtr document;
@@ -278,7 +291,7 @@ void Constructor::on_load_from_xml()
 void Constructor::on_btn_file_ok_clicked()
 {
        std::list<CItem *>::iterator i = listaItems.begin();
-       std::string file_name = file_selection->get_filename();
+       file_name = file_selection->get_filename();
        if ( (archivo = fopen( file_name.c_str(), "w+")) != NULL ){
                fprintf(archivo, "<?xml version=\"1.0\" encoding=\"iso-8859-1\" ?>\n");
                fprintf (archivo,"<planta>\n");
@@ -292,12 +305,47 @@ void Constructor::on_btn_file_ok_clicked()
                        i++;
                }
                fprintf(archivo,"</planta>\n");
+               saved = true;
        } else 
                std::cout<<"NO SE ABRIO EL ARCHIVO"<<std::endl;
        fclose(archivo);
        file_selection->hide();
 }
 
+void Constructor::on_quick_btn_save_clicked()
+{
+       if ( ! saved ) {
+               on_main_menu_save();
+       } else {
+               on_btn_file_ok_clicked();
+       }
+}
+       
+void Constructor::on_quick_btn_new_clicked()
+{
+       on_quick_btn_delete_all_clicked();
+       saved = false;
+}
+
+void Constructor::on_quick_btn_delete_all_clicked()
+{
+       std::list<CItem *>::iterator i = listaItems.begin();
+       while ( i != listaItems.end() ){
+               CItem *temp = *i;
+               listaItems.erase(i);
+               delete temp;
+               i = listaItems.begin();
+       }
+       i = lista_logic_Items.begin();
+       while ( i != lista_logic_Items.end() ){
+               CItem *temp2 = *i;
+               lista_logic_Items.erase(i);
+               delete temp2;
+               i = lista_logic_Items.begin();
+       }
+       id = 0;
+}      
+
 void Constructor::on_btn_file_cancel_clicked()
 {
        file_selection->hide();
@@ -494,7 +542,7 @@ void Constructor::on_btn_check_clicked()
                        std::cout<< "item="<<temp->get_name()<<" "<<"check= "<<temp->check_connection()<<std::endl;
                        if ( !temp->check_connection() ) {
                                dlg_connect->set_title("Error");
-                               dlg_label->set_text("Los elementos no estan conectados\n\t\tcorrectamente");
+                               dlg_label->set_text("El elemento "+temp->get_name()+" no esta conectado\n\t\tcorrectamente");
                                dlg_connect->show();
                                return;
                        }