Se arregla el cliente para que compile de nuevo (NOT TESTED!)

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

diff --git a/Constructor/src/constructor.cpp b/Constructor/src/constructor.cpp
index bfd2b2b827a49313d7fd37ccc54b407bb65624b5..21bdbca48bb699f7c5b063756d4873db15ef337f 100644 (file)
--- a/Constructor/src/constructor.cpp
+++ b/Constructor/src/constructor.cpp
@@ -278,6 +278,8 @@ void Constructor::on_load_from_xml()
                                        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
@@ -290,6 +292,7 @@ void Constructor::on_load_from_xml()
                        }
                        items = items->next;
                }
+               xmlFreeDoc(document);
        } else {
                // TODO : avisar que el XML no es valido!!
        }
@@ -362,13 +365,21 @@ 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() ) {
+               if ( (*i)->get_name()  == combo_entry->get_entry()->get_text() ) {
                        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);
@@ -518,9 +529,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
-                               a->workplace= workplace;
+                               a->workplace = workplace;
                                //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