X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/ac870d5f2b6c3690d856c346aaf6946e1e64f05e..8e0b92d947f09e5e4c00f49218aa1ba9ebc4dcb3:/Constructor/src/constructor.cpp

diff --git a/Constructor/src/constructor.cpp b/Constructor/src/constructor.cpp
index 962fff6..6cc741b 100644
--- a/Constructor/src/constructor.cpp
+++ b/Constructor/src/constructor.cpp
@@ -45,6 +45,7 @@ Constructor::Constructor(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glad
 	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
 	
@@ -77,7 +78,8 @@ 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));
-	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));
@@ -114,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;
 }
 
@@ -189,7 +192,13 @@ void Constructor::on_main_menu_open()
 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()
@@ -212,10 +221,11 @@ void Constructor::on_edit_menu_delete_all()
 	id = 0;
 }
 
-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()
@@ -280,6 +290,7 @@ void Constructor::on_load_from_xml()
 			}
 			items = items->next;
 		}
+		xmlFreeDoc(document);
 	} else {
 		// TODO : avisar que el XML no es valido!!
 	}
@@ -293,29 +304,23 @@ void Constructor::on_btn_file_ok_clicked()
 	std::list<CItem *>::iterator i = listaItems.begin();
 	file_name = file_selection->get_filename();
 	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 {
-		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() ){
-				(*i)->save(archivo);
-				i++;
-			}
-			i = lista_logic_Items.begin();
-			while ( i != lista_logic_Items.end() ) {
-				(*i)->save(archivo);
-				i++;
-			}
-			fprintf(archivo,"</planta>\n");
-			saved = true;
-			fclose(archivo);
-		} else 
-			std::cout<<"NO SE ABRIO EL ARCHIVO"<<std::endl;
-	}
+ 	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() ){
+			(*i)->save(archivo);
+			i++;
+		}
+		i = lista_logic_Items.begin();
+		while ( i != lista_logic_Items.end() ) {
+			(*i)->save(archivo);
+			i++;
+		}
+		fprintf(archivo,"</planta>\n");
+		saved = true;
+		fclose(archivo);
+	} else 
+		std::cout<<"NO SE ABRIO EL ARCHIVO"<<std::endl;
 	file_selection->hide();
 }
 
@@ -353,6 +358,23 @@ void Constructor::on_quick_btn_delete_all_clicked()
 	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();