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

diff --git a/Constructor/src/constructor.cpp b/Constructor/src/constructor.cpp
index 2120573..87a943b 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");
 	
 	
@@ -28,6 +29,7 @@ Constructor::Constructor(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glad
 	refGlade->get_widget("btn_or", btn_or);
 	refGlade->get_widget("btn_not", btn_not);
 	refGlade->get_widget("main_menu_quit",main_menu_quit);
+	refGlade->get_widget("main_menu_new",main_menu_new);
 	refGlade->get_widget("main_menu_open",main_menu_open);
 	refGlade->get_widget("main_menu_save",main_menu_save);
 	refGlade->get_widget("edit_menu_del",edit_menu_del);
@@ -39,6 +41,10 @@ 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_new", quick_btn_new);
+	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_derived("workplace", workplace);  //fixed
 	
@@ -72,12 +78,17 @@ 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_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));
 	
 	main_menu_quit->signal_activate().connect(SigC::slot(*this, &Constructor::on_main_menu_quit));
+	main_menu_new->signal_activate().connect(SigC::slot(*this, &Constructor::on_quick_btn_new_clicked));
 	main_menu_open->signal_activate().connect(SigC::slot(*this, &Constructor::on_main_menu_open));
 	main_menu_save->signal_activate().connect(SigC::slot(*this, &Constructor::on_main_menu_save));
 	edit_menu_del->signal_activate().connect(SigC::slot(*this,&Constructor::on_edit_menu_del));
-			
+	edit_menu_delete_all->signal_activate().connect(SigC::slot(*this,&Constructor::on_quick_btn_delete_all_clicked));
+	
 	btn_file_cancel = file_selection->get_cancel_button();
 	btn_file_ok = file_selection->get_ok_button();
 	btn_file_ok->signal_clicked().connect(SigC::slot(*this,&Constructor::on_btn_file_ok_clicked));
@@ -108,13 +119,7 @@ Constructor::Constructor(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glad
 
 Constructor::~Constructor()
 {
-	std::list<CItem *>::iterator i = listaItems.begin();
-	while ( i != listaItems.end() ){
-		CItem *temp = *i;
-		listaItems.erase(i);
-		delete temp;
-		i = listaItems.begin();
-	}
+	Constructor::on_edit_menu_delete_all();
 }
 
 void Constructor::on_btn_canio_drag_get(const Glib::RefPtr<Gdk::DragContext>& context, GtkSelectionData* selection_data, guint info, guint time)
@@ -188,27 +193,35 @@ void Constructor::on_main_menu_save()
 }
 
 void Constructor::on_edit_menu_del()
-{  // OJO que borra al primero que encuentra con el mismo nombre!!!
+{ 
+	workplace->delete_item(WorkPlace::pointed);
+}
+
+void Constructor::on_edit_menu_delete_all()
+{
 	std::list<CItem *>::iterator i = listaItems.begin();
-	Glib::ustring pointed = combo_entry->get_text();
-	while ( i != listaItems.end() ){
-		CItem *temp = *i;
-		if ( temp->get_name() == pointed ){ 
-			workplace->delete_item(temp->get_id());
-			break;
-		}
-	i++;
+	while ( i != listaItems.end() ) {
+		(*i)->workplace->delete_item((*i)->get_id());
+		i = listaItems.begin();
+	}
+	i = lista_logic_Items.begin();
+	while ( i != lista_logic_Items.end() ) {
+		(*i)->workplace->delete_item((*i)->get_id());
+		i=lista_logic_Items.begin();
 	}
+	id = 0;
 }
 
 void Constructor::on_chk_btn_clicked()
 {
 	logica = !logica;
+	CItem::logic_connect = !CItem::logic_connect;
 }
 
 void Constructor::on_load_from_xml()
 {
-	std::string file_name = file_open_selection->get_filename();
+	on_edit_menu_delete_all();
+	file_name = file_open_selection->get_filename();
 
 	/* Parseo de ejemplo de un XML desde archivo */
 	xmlDocPtr document;
@@ -272,26 +285,67 @@ void Constructor::on_load_from_xml()
 	}
 	std::cout << "CARGA COMPLETA" << std::endl;
 	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_new_clicked()
+{
+	on_quick_btn_delete_all_clicked();
+	saved = false;
+}
+
+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;
+}	
+
 void Constructor::on_btn_file_cancel_clicked()
 {
 	file_selection->hide();
@@ -359,14 +413,12 @@ void Constructor::on_not_drag_begin(const Glib::RefPtr<Gdk::DragContext>& contex
 
 void Constructor::on_item_drag_begin(const Glib::RefPtr<Gdk::DragContext>& context, CItem *item)
 {
-	GdkEventExpose e;
 	context->set_icon(item->get_image(), 5, 5);
-	workplace->on_expose_event(&e);
 }
 
 void Constructor::on_item_drag_data_get(const Glib::RefPtr<Gdk::DragContext>& context, GtkSelectionData* selection_data, guint info, guint time)
 {	
-		gtk_selection_data_set (selection_data, selection_data->target, 10, (const guchar*)"item_codo.png", 13);
+	gtk_selection_data_set (selection_data, selection_data->target, 10, (const guchar*)"item_codo.png", 13);
 }
 
 bool Constructor::can_drop(CItem *item, int _x, int _y)
@@ -389,6 +441,8 @@ bool Constructor::can_drop(CItem *item, int _x, int _y)
 
 void Constructor::on_item_drop_drag_received(const Glib::RefPtr<Gdk::DragContext>& context, int x, int y, GtkSelectionData* selection_data, guint info, guint time)
 {
+	workplace->update_logic_position();
+	workplace->queue_draw();
 	if ( !logica ) {
 		/* Ajusto coordenada x e y para que caigan en un lugar de una cuadricula de 32x32 */
 		int i,j;
@@ -426,7 +480,7 @@ void Constructor::on_item_drop_drag_received(const Glib::RefPtr<Gdk::DragContext
 			} else if (strcmp((const char *)selection_data->data, "or_e.png")==0) {
 				a = new Or(); a->is_logic = true;
 				} else if (strcmp((const char *)selection_data->data, "not_e.png")==0) {
-					a = new Not();	a->is_logic = true;
+					a = new Not(); a->is_logic = true;
 					}
 		
 			char char_id[10];
@@ -468,6 +522,8 @@ void Constructor::on_item_drop_drag_received(const Glib::RefPtr<Gdk::DragContext
   		}
 		context->drag_finish(false, false, time);
 	}
+	workplace->update_logic_position();
+	workplace->queue_draw();
 }
 
 void Constructor::on_btn_check_clicked()
@@ -486,7 +542,7 @@ void Constructor::on_btn_check_clicked()
 			std::cout<< "item="<<temp->get_name()<<" "<<"check= "<<temp->check_connection()<<std::endl;
 			if ( !temp->check_connection() ) {
 				dlg_connect->set_title("Error");
-				dlg_label->set_text("Los elementos no estan conectados\n\t\tcorrectamente");
+				dlg_label->set_text("El elemento "+temp->get_name()+" no esta conectado\n\t\tcorrectamente");
 				dlg_connect->show();
 				return;
 			}	
@@ -496,6 +552,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)
@@ -727,4 +791,3 @@ Splitter *Constructor::loadCodo(xmlNodePtr nodo)
 
 	return p;
 }
-