-arreglo el bug de la union cuando se carga desde un archivo

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

diff --git a/Constructor/src/constructor.cpp b/Constructor/src/constructor.cpp
index 3447a2eb441ec2118dbfe303654fdfe1f8257bdf..2966528a44aef807761f8ab53377ac89cbec1cb0 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");
        
        
@@ -39,6 +40,8 @@ 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_save", quick_btn_save);
        
        refGlade->get_widget_derived("workplace", workplace);  //fixed
        
@@ -72,6 +75,8 @@ 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_save->signal_clicked().connect(SigC::slot(*this, &Constructor::on_quick_btn_save_clicked));
        
        main_menu_quit->signal_activate().connect(SigC::slot(*this, &Constructor::on_main_menu_quit));
        main_menu_open->signal_activate().connect(SigC::slot(*this, &Constructor::on_main_menu_open));
@@ -208,7 +213,7 @@ void Constructor::on_chk_btn_clicked()
 
 void Constructor::on_load_from_xml()
 {
-       std::string file_name = file_open_selection->get_filename();
+       file_name = file_open_selection->get_filename();
 
        /* Parseo de ejemplo de un XML desde archivo */
        xmlDocPtr document;
@@ -274,25 +279,59 @@ void Constructor::on_load_from_xml()
        file_open_selection->hide();
        id = listaItems.size()+lista_logic_Items.size()+1;
 }
+
 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");
                while ( i != listaItems.end() ){
-                       CItem *temp = *i;
-                       temp->save(archivo);
+                       (*i)->save(archivo);
+                       i++;
+               }
+               i = lista_logic_Items.begin();
+               while ( i != lista_logic_Items.end() ) {
+                       (*i)->save(archivo);
                        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_clear_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();
+       }
+}      
+
 void Constructor::on_btn_file_cancel_clicked()
 {
        file_selection->hide();
@@ -360,14 +399,12 @@ void Constructor::on_not_drag_begin(const Glib::RefPtr<Gdk::DragContext>& contex
 
 void Constructor::on_item_drag_begin(const Glib::RefPtr<Gdk::DragContext>& context, CItem *item)
 {
-       GdkEventExpose e;
        context->set_icon(item->get_image(), 5, 5);
-       workplace->on_expose_event(&e);
 }
 
 void Constructor::on_item_drag_data_get(const Glib::RefPtr<Gdk::DragContext>& context, GtkSelectionData* selection_data, guint info, guint time)
 {      
-               gtk_selection_data_set (selection_data, selection_data->target, 10, (const guchar*)"item_codo.png", 13);
+       gtk_selection_data_set (selection_data, selection_data->target, 10, (const guchar*)"item_codo.png", 13);
 }
 
 bool Constructor::can_drop(CItem *item, int _x, int _y)
@@ -390,6 +427,8 @@ bool Constructor::can_drop(CItem *item, int _x, int _y)
 
 void Constructor::on_item_drop_drag_received(const Glib::RefPtr<Gdk::DragContext>& context, int x, int y, GtkSelectionData* selection_data, guint info, guint time)
 {
+       workplace->update_logic_position();
+       workplace->queue_draw();
        if ( !logica ) {
                /* Ajusto coordenada x e y para que caigan en un lugar de una cuadricula de 32x32 */
                int i,j;
@@ -427,7 +466,7 @@ void Constructor::on_item_drop_drag_received(const Glib::RefPtr<Gdk::DragContext
                        } else if (strcmp((const char *)selection_data->data, "or_e.png")==0) {
                                a = new Or(); a->is_logic = true;
                                } else if (strcmp((const char *)selection_data->data, "not_e.png")==0) {
-                                       a = new Not();  a->is_logic = true;
+                                       a = new Not(); a->is_logic = true;
                                        }
                
                        char char_id[10];
@@ -469,6 +508,8 @@ void Constructor::on_item_drop_drag_received(const Glib::RefPtr<Gdk::DragContext
                }
                context->drag_finish(false, false, time);
        }
+       workplace->update_logic_position();
+       workplace->queue_draw();
 }
 
 void Constructor::on_btn_check_clicked()
@@ -497,6 +538,14 @@ void Constructor::on_btn_check_clicked()
                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();
+               j++;
+       }
+
+
 }
 
 Pump *Constructor::loadBomba(xmlNodePtr nodo)