X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/f85e6b00bd29ddff6067db8c6d4c56f53bcf4c0b..950f83d0e71dc886fcf5be9889796c5b2a85fa4c:/Constructor/src/constructor.cpp

diff --git a/Constructor/src/constructor.cpp b/Constructor/src/constructor.cpp
index 2120573..4ab3b19 100644
--- a/Constructor/src/constructor.cpp
+++ b/Constructor/src/constructor.cpp
@@ -108,13 +108,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,22 +182,28 @@ 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();
 	}
 }
 
 void Constructor::on_chk_btn_clicked()
 {
 	logica = !logica;
+	CItem::logic_connect = !CItem::logic_connect;
 }
 
 void Constructor::on_load_from_xml()
@@ -272,7 +272,9 @@ 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();
@@ -281,8 +283,12 @@ void Constructor::on_btn_file_ok_clicked()
 		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");
@@ -359,14 +365,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 +393,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 +432,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 +474,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()
@@ -496,6 +504,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 +743,3 @@ Splitter *Constructor::loadCodo(xmlNodePtr nodo)
 
 	return p;
 }
-