X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/94fc2a6d3148acc30d1b0415336a1c2259632a18..fb8d2fb83534b0ca76f81e6d107e38d002642a46:/Constructor/src/constructor.cpp

diff --git a/Constructor/src/constructor.cpp b/Constructor/src/constructor.cpp
index 82a73ec..e6f413e 100644
--- a/Constructor/src/constructor.cpp
+++ b/Constructor/src/constructor.cpp
@@ -79,7 +79,7 @@ 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));
 	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_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));
@@ -116,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->logica = &logica;
 	logica = false;
 }
 
@@ -218,12 +219,17 @@ void Constructor::on_edit_menu_delete_all()
 		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_clicked()
+void Constructor::on_chk_btn_logica_clicked()
 {
 	logica = !logica;
 	CItem::logic_connect = !CItem::logic_connect;
+	workplace->queue_draw();
 }
 
 void Constructor::on_load_from_xml()
@@ -276,6 +282,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
@@ -288,6 +296,7 @@ void Constructor::on_load_from_xml()
 			}
 			items = items->next;
 		}
+		xmlFreeDoc(document);
 	} else {
 		// TODO : avisar que el XML no es valido!!
 	}
@@ -338,21 +347,7 @@ void Constructor::on_quick_btn_new_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()
@@ -360,13 +355,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);
@@ -516,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
-				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