Se pasa la conexion suicida al finish del TCPServer para que sea 'transparente'.

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

diff --git a/Constructor/src/constructor.cpp b/Constructor/src/constructor.cpp
index 80d07d232f71c0f9c3f17dd4394d0df43547a120..2318a4405d57b71b14ba1bc07c98163ecdc68945 100644 (file)
--- a/Constructor/src/constructor.cpp
+++ b/Constructor/src/constructor.cpp
@@ -29,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);
@@ -40,8 +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_clear", quick_btn_clear);
+       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
        
@@ -75,14 +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_clear->signal_clicked().connect(SigC::slot(*this, &Constructor::on_quick_btn_clear_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));
@@ -183,7 +189,13 @@ void Constructor::on_main_menu_open()
 void Constructor::on_main_menu_save()
 {
        // Conecto el boton OK para llamar al salvar
-       file_selection->show();
+       Glib::ustring name;
+       if ( ! check_connection(name) ) {
+               dlg_connect->set_title("Error");
+               dlg_label->set_text("El elemento "+name+" no esta conectado\n\t\tcorrectamente");
+               dlg_connect->show();
+       } else  
+               file_selection->show();
 }
 
 void Constructor::on_edit_menu_del()
@@ -203,6 +215,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()
@@ -213,6 +226,7 @@ void Constructor::on_chk_btn_clicked()
 
 void Constructor::on_load_from_xml()
 {
+       on_edit_menu_delete_all();
        file_name = file_open_selection->get_filename();
 
        /* Parseo de ejemplo de un XML desde archivo */
@@ -284,7 +298,8 @@ void Constructor::on_btn_file_ok_clicked()
 {
        std::list<CItem *>::iterator i = listaItems.begin();
        file_name = file_selection->get_filename();
-       if ( (archivo = fopen( file_name.c_str(), "w+")) != NULL ){
+       Glib::ustring name;
+       if ( (archivo = fopen( file_name.c_str(), "w+")) != NULL ){
                fprintf(archivo, "<?xml version=\"1.0\" encoding=\"iso-8859-1\" ?>\n");
                fprintf (archivo,"<planta>\n");
                while ( i != listaItems.end() ){
@@ -298,9 +313,9 @@ void Constructor::on_btn_file_ok_clicked()
                }
                fprintf(archivo,"</planta>\n");
                saved = true;
+               fclose(archivo);
        } else 
                std::cout<<"NO SE ABRIO EL ARCHIVO"<<std::endl;
-       fclose(archivo);
        file_selection->hide();
 }
 
@@ -313,8 +328,13 @@ void Constructor::on_quick_btn_save_clicked()
        }
 }
        
+void Constructor::on_quick_btn_new_clicked()
+{
+       on_quick_btn_delete_all_clicked();
+       saved = false;
+}
 
-void Constructor::on_quick_btn_clear_clicked()
+void Constructor::on_quick_btn_delete_all_clicked()
 {
        std::list<CItem *>::iterator i = listaItems.begin();
        while ( i != listaItems.end() ){
@@ -330,6 +350,7 @@ void Constructor::on_quick_btn_clear_clicked()
                delete temp2;
                i = lista_logic_Items.begin();
        }
+       id = 0;
 }      
 
 void Constructor::on_btn_file_cancel_clicked()
@@ -513,6 +534,21 @@ void Constructor::on_item_drop_drag_received(const Glib::RefPtr<Gdk::DragContext
 }
 
 void Constructor::on_btn_check_clicked()
+{
+       Glib::ustring name;
+       if ( ! check_connection(name) ) {
+               dlg_connect->set_title("Error");
+               dlg_label->set_text("El elemento "+name+" no esta conectado\n\t\tcorrectamente");
+               dlg_connect->show();
+       } else {
+               dlg_connect->set_title("Conexion");
+               dlg_label->set_text("Los elementos estan conectados\n\t\tcorrectamente");
+               dlg_connect->show();
+       }
+}
+
+
+bool Constructor::check_connection(Glib::ustring& name)
 {
        std::list<CItem *>::iterator i = listaItems.begin();
        while ( i != listaItems.end() ){
@@ -520,33 +556,29 @@ void Constructor::on_btn_check_clicked()
                (*i)->is_connected = false;
                i++;
        }
-       
        i = listaItems.begin();
        if ( !listaItems.empty() ) {
                while ( i != listaItems.end() ) {
                        CItem *temp = *i;
                        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("El elemento "+temp->get_name()+" no esta conectado\n\t\tcorrectamente");
-                               dlg_connect->show();
-                               return;
+                               name = temp->get_name();
+                               return false;
                        }       
                i++;
                }
-               dlg_connect->set_title("Conexion");
-               dlg_label->set_text("Los elementos estan conectados\n\t\tcorrectamente");
-               dlg_connect->show();    
        }
        std::cout<<"check_connection logic"<<std::endl;
        std::list<CItem *>::iterator j = lista_logic_Items.begin();
        while ( j != lista_logic_Items.end() ) {
-               (*j)->check_connection();
+               if ( !(*j)->check_connection() ) {
+                       name = (*j)->get_name();
+                       return false;
+               }
                j++;
        }
-
-
-}
+       return true;
+}      
 
 Pump *Constructor::loadBomba(xmlNodePtr nodo)
 {