-cambios en la implementacion de algunos items, get_connector_type..

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

diff --git a/Constructor/src/constructor.cpp b/Constructor/src/constructor.cpp
index 6cc741b98cc568f93f3af05adfc885a04ccbe211..e6f413e9fcf647ea12c36ce113be02571f7d25b4 100644 (file)
--- a/Constructor/src/constructor.cpp
+++ b/Constructor/src/constructor.cpp
@@ -219,6 +219,10 @@ void Constructor::on_edit_menu_delete_all()
                i=lista_logic_Items.begin();
        }
        id = 0;
                i=lista_logic_Items.begin();
        }
        id = 0;

+       list_pointed.clear();
+       list_pointed.push_back(" ");
+       combo_entry->set_popdown_strings(list_pointed);
+       combo_entry->get_entry()->set_text("");

 }
 
 void Constructor::on_chk_btn_logica_clicked()
 }
 
 void Constructor::on_chk_btn_logica_clicked()


@@ -278,6 +282,8 @@ void Constructor::on_load_from_xml()
                                        current->workplace= workplace;
                                        //Apunto a la lista.
                                        current->combo_entry = combo_entry;
                                        current->workplace= workplace;
                                        //Apunto a la lista.
                                        current->combo_entry = combo_entry;

+                                       //Apunto a la lista de apuntados
+                                       current->list_pointed = &list_pointed;

                                        //Apunto a la listaItems.
                                        current->listaItems = &listaItems;
                                        //Apunto a la lista de items logicos
                                        //Apunto a la listaItems.
                                        current->listaItems = &listaItems;
                                        //Apunto a la lista de items logicos


@@ -341,21 +347,7 @@ void Constructor::on_quick_btn_new_clicked()
 
 void Constructor::on_quick_btn_delete_all_clicked()
 {
 
 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;
+       on_edit_menu_delete_all();

 }      
 
 void Constructor::on_btn_find_clicked()
 }      
 
 void Constructor::on_btn_find_clicked()


@@ -363,13 +355,21 @@ void Constructor::on_btn_find_clicked()
        CItem * temp = NULL;
        std::list<CItem *>::iterator i = listaItems.begin();
        while ( i !=listaItems.end() ) {
        CItem * temp = NULL;
        std::list<CItem *>::iterator i = listaItems.begin();
        while ( i !=listaItems.end() ) {

-               if ( (*i)->get_name()  == combo_entry->get_text() ) {
+               if ( (*i)->get_name()  == combo_entry->get_entry()->get_text() ) {

                        temp = *i;
                        break;
                }
                i++;
        }
        
                        temp = *i;
                        break;
                }
                i++;
        }
        

+       i = lista_logic_Items.begin();
+       while ( i !=lista_logic_Items.end() ) {
+               if ( (*i)->get_name()  == combo_entry->get_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);
        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);


@@ -519,9 +519,11 @@ void Constructor::on_item_drop_drag_received(const Glib::RefPtr<Gdk::DragContext
                        if ( can_drop(a, i*32, j*32) ) {
                                workplace->put(*a, i*32, j*32);
                                //Apunto al workplace
                        if ( can_drop(a, i*32, j*32) ) {
                                workplace->put(*a, i*32, j*32);
                                //Apunto al workplace

-                               a->workplace= workplace;
+                               a->workplace = workplace;

                                //Apunto a la lista.
                                a->combo_entry = combo_entry;
                                //Apunto a la lista.
                                a->combo_entry = combo_entry;

+                               //Apunto a la lista de apuntados
+                               a->list_pointed = &list_pointed;

                                //Apunto a la listaItems.
                                a->listaItems = &listaItems;
                                //Apunto a la lista de items logicos
                                //Apunto a la listaItems.
                                a->listaItems = &listaItems;
                                //Apunto a la lista de items logicos