Se agrega una pequeña mejora al dibujo de las lineas. Tengo pensado mejorarlas

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

diff --git a/Constructor/src/constructor.cpp b/Constructor/src/constructor.cpp
index 3447a2eb441ec2118dbfe303654fdfe1f8257bdf..6cc741b98cc568f93f3af05adfc885a04ccbe211 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;
 Constructor::Constructor(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade):Gtk::Window(cobject)
 {
        id = 0;

+       saved = false;

        set_title("Constructor");
        
        
        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("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);
        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,11 @@ 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("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("btn_find", btn_find);

        
        refGlade->get_widget_derived("workplace", workplace);  //fixed
        
        
        refGlade->get_widget_derived("workplace", workplace);  //fixed
        


@@ -71,13 +78,19 @@ Constructor::Constructor(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glad
        btn_not->signal_drag_data_get().connect( SigC::slot(*this, &Constructor::on_btn_not_drag_get));
        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));
        btn_not->signal_drag_data_get().connect( SigC::slot(*this, &Constructor::on_btn_not_drag_get));
        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));
+       btn_find->signal_clicked().connect(SigC::slot(*this,&Constructor::on_btn_find_clicked));        
+       chk_btn_logica->signal_clicked().connect(SigC::slot(*this, &Constructor::on_chk_btn_logica_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_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));
        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));
        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));


@@ -103,6 +116,7 @@ Constructor::Constructor(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glad
        workplace->signal_drag_data_received().connect( SigC::slot(*this, &Constructor::on_item_drop_drag_received) );  
        workplace->listaItems = &listaItems;    
        workplace->lista_logic_Items = &lista_logic_Items;      
        workplace->signal_drag_data_received().connect( SigC::slot(*this, &Constructor::on_item_drop_drag_received) );  
        workplace->listaItems = &listaItems;    
        workplace->lista_logic_Items = &lista_logic_Items;      

+       workplace->logica = &logica;

        logica = false;
 }
 
        logica = false;
 }
 


@@ -178,7 +192,13 @@ void Constructor::on_main_menu_open()
 void Constructor::on_main_menu_save()
 {
        // Conecto el boton OK para llamar al salvar
 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()
 }
 
 void Constructor::on_edit_menu_del()


@@ -198,17 +218,20 @@ void Constructor::on_edit_menu_delete_all()
                (*i)->workplace->delete_item((*i)->get_id());
                i=lista_logic_Items.begin();
        }
                (*i)->workplace->delete_item((*i)->get_id());
                i=lista_logic_Items.begin();
        }

+       id = 0;

 }
 
 }
 

-void Constructor::on_chk_btn_clicked()
+void Constructor::on_chk_btn_logica_clicked()

 {
        logica = !logica;
        CItem::logic_connect = !CItem::logic_connect;
 {
        logica = !logica;
        CItem::logic_connect = !CItem::logic_connect;

+       workplace->queue_draw();

 }
 
 void Constructor::on_load_from_xml()
 {
 }
 
 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;
 
        /* Parseo de ejemplo de un XML desde archivo */
        xmlDocPtr document;


@@ -267,6 +290,7 @@ void Constructor::on_load_from_xml()
                        }
                        items = items->next;
                }
                        }
                        items = items->next;
                }

+               xmlFreeDoc(document);

        } else {
                // TODO : avisar que el XML no es valido!!
        }
        } else {
                // TODO : avisar que el XML no es valido!!
        }


@@ -274,25 +298,83 @@ void Constructor::on_load_from_xml()
        file_open_selection->hide();
        id = listaItems.size()+lista_logic_Items.size()+1;
 }
        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();
 void Constructor::on_btn_file_ok_clicked()
 {
        std::list<CItem *>::iterator i = listaItems.begin();

-       std::string file_name = file_selection->get_filename();
-       if ( (archivo = fopen( file_name.c_str(), "w+")) != NULL ){
+       file_name = file_selection->get_filename();
+       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() ){
                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");
                        i++;
                }
                fprintf(archivo,"</planta>\n");

+               saved = true;
+               fclose(archivo);

        } else 
                std::cout<<"NO SE ABRIO EL ARCHIVO"<<std::endl;
        } else 
                std::cout<<"NO SE ABRIO EL ARCHIVO"<<std::endl;

-       fclose(archivo);

        file_selection->hide();
 }
 
        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_find_clicked()
+{
+       CItem * temp = NULL;
+       std::list<CItem *>::iterator i = listaItems.begin();
+       while ( i !=listaItems.end() ) {
+               if ( (*i)->get_name()  == combo_entry->get_text() ) {
+                       temp = *i;
+                       break;
+               }
+               i++;
+       }
+       
+       if ( temp != NULL )
+       workplace->get_window()->draw_rectangle(workplace->get_style()->get_black_gc(), false , temp->get_position_x()-5, temp->get_position_y()-5,
+                                                                                                                                               temp->get_image()->get_width()+10, temp->get_image()->get_height()+10);
+}
+

 void Constructor::on_btn_file_cancel_clicked()
 {
        file_selection->hide();
 void Constructor::on_btn_file_cancel_clicked()
 {
        file_selection->hide();


@@ -360,14 +442,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)
 {
 
 void Constructor::on_item_drag_begin(const Glib::RefPtr<Gdk::DragContext>& context, CItem *item)
 {

-       GdkEventExpose e;

        context->set_icon(item->get_image(), 5, 5);
        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)
 {      
 }
 
 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)
 }
 
 bool Constructor::can_drop(CItem *item, int _x, int _y)


@@ -390,6 +470,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)
 {
 
 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;
        if ( !logica ) {
                /* Ajusto coordenada x e y para que caigan en un lugar de una cuadricula de 32x32 */
                int i,j;


@@ -427,7 +509,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) {
                        } 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];
                                        }
                
                        char char_id[10];


@@ -469,9 +551,26 @@ void Constructor::on_item_drop_drag_received(const Glib::RefPtr<Gdk::DragContext
                }
                context->drag_finish(false, false, time);
        }
                }
                context->drag_finish(false, false, time);
        }

+       workplace->update_logic_position();
+       workplace->queue_draw();

 }
 
 void Constructor::on_btn_check_clicked()
 }
 
 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() ){
 {
        std::list<CItem *>::iterator i = listaItems.begin();
        while ( i != listaItems.end() ){


@@ -479,25 +578,29 @@ void Constructor::on_btn_check_clicked()
                (*i)->is_connected = false;
                i++;
        }
                (*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() ) {
        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("Los elementos no estan conectados\n\t\tcorrectamente");
-                               dlg_connect->show();
-                               return;
+                               name = temp->get_name();
+                               return false;

                        }       
                i++;
                }
                        }       
                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() ) {
+               if ( !(*j)->check_connection() ) {
+                       name = (*j)->get_name();
+                       return false;
+               }
+               j++;
+       }
+       return true;
+}      

 
 Pump *Constructor::loadBomba(xmlNodePtr nodo)
 {
 
 Pump *Constructor::loadBomba(xmlNodePtr nodo)
 {