X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/d4d9e7169ed68ba75024ab23f773fbb168ef2e55..101179f2d7bcc4de75c326d3e9d01694c84d07ca:/Constructor/src/constructor.cpp?ds=sidebyside diff --git a/Constructor/src/constructor.cpp b/Constructor/src/constructor.cpp index bfd2b2b..21bdbca 100644 --- 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::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::RefPtrput(*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