X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/3b6a42222383cfd5f7ef0d6116077fb2fecb28d6..e376a43f98fb205779e093242f3d6e1db4f81f60:/Constructor/src/constructor.cpp?ds=sidebyside

diff --git a/Constructor/src/constructor.cpp b/Constructor/src/constructor.cpp
index 231017f..2966528 100644
--- a/Constructor/src/constructor.cpp
+++ b/Constructor/src/constructor.cpp
@@ -3,6 +3,7 @@
 Constructor::Constructor(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade):Gtk::Window(cobject)
 {
 	id = 0;
+	saved = false;
 	set_title("Constructor");
 	
 	
@@ -39,6 +40,8 @@ Constructor::Constructor(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glad
 	refGlade->get_widget("dlg_connect", dlg_connect);
 	refGlade->get_widget("btn_dlg_close", btn_dlg_close);
 	refGlade->get_widget("dlg_label", dlg_label);
+	refGlade->get_widget("quick_btn_clear", quick_btn_clear);
+	refGlade->get_widget("quick_btn_save", quick_btn_save);
 	
 	refGlade->get_widget_derived("workplace", workplace);  //fixed
 	
@@ -72,6 +75,8 @@ 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));
 	chk_btn_logica->signal_clicked().connect(SigC::slot(*this, &Constructor::on_chk_btn_clicked));
+	quick_btn_clear->signal_clicked().connect(SigC::slot(*this, &Constructor::on_quick_btn_clear_clicked));
+	quick_btn_save->signal_clicked().connect(SigC::slot(*this, &Constructor::on_quick_btn_save_clicked));
 	
 	main_menu_quit->signal_activate().connect(SigC::slot(*this, &Constructor::on_main_menu_quit));
 	main_menu_open->signal_activate().connect(SigC::slot(*this, &Constructor::on_main_menu_open));
@@ -208,7 +213,7 @@ void Constructor::on_chk_btn_clicked()
 
 void Constructor::on_load_from_xml()
 {
-	std::string file_name = file_open_selection->get_filename();
+	file_name = file_open_selection->get_filename();
 
 	/* Parseo de ejemplo de un XML desde archivo */
 	xmlDocPtr document;
@@ -274,25 +279,59 @@ void Constructor::on_load_from_xml()
 	file_open_selection->hide();
 	id = listaItems.size()+lista_logic_Items.size()+1;
 }
+
 void Constructor::on_btn_file_ok_clicked()
 {
 	std::list<CItem *>::iterator i = listaItems.begin();
-	std::string file_name = file_selection->get_filename();
+	file_name = file_selection->get_filename();
 	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() ){
-			CItem *temp = *i;
-			temp->save(archivo);
+			(*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;
 	} else 
 		std::cout<<"NO SE ABRIO EL ARCHIVO"<<std::endl;
 	fclose(archivo);
 	file_selection->hide();
 }
 
+void Constructor::on_quick_btn_save_clicked()
+{
+	if ( ! saved ) {
+		on_main_menu_save();
+	} else {
+		on_btn_file_ok_clicked();
+	}
+}
+	
+
+void Constructor::on_quick_btn_clear_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();
+	}
+}	
+
 void Constructor::on_btn_file_cancel_clicked()
 {
 	file_selection->hide();
@@ -499,6 +538,14 @@ void Constructor::on_btn_check_clicked()
 		dlg_label->set_text("Los elementos estan conectados\n\t\tcorrectamente");
 		dlg_connect->show();	
 	}
+	std::cout<<"check_connection logic"<<std::endl;
+	std::list<CItem *>::iterator j = lista_logic_Items.begin();
+	while ( j != lista_logic_Items.end() ) {
+		(*j)->check_connection();
+		j++;
+	}
+
+
 }
 
 Pump *Constructor::loadBomba(xmlNodePtr nodo)