X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/d53ded00c10a30a17c7f0aad90acca933a7f4db9..f5a1e732bf3907cabd004932aba3256b31d9d282:/Constructor/constructor.cpp?ds=sidebyside

diff --git a/Constructor/constructor.cpp b/Constructor/constructor.cpp
index 0278ec0..aa162e9 100644
--- a/Constructor/constructor.cpp
+++ b/Constructor/constructor.cpp
@@ -11,6 +11,7 @@ Constructor::Constructor(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glad
 	ico_codo  = Gdk::Pixbuf::create_from_file("codo_o.png");
 	ico_tanque  = Gdk::Pixbuf::create_from_file("tanque_e.png");
 	ico_exclusa = Gdk::Pixbuf::create_from_file("exclusa_h.png");
+	ico_drain = Gdk::Pixbuf::create_from_file("drain_n.png");
 	ico_bomba = Gdk::Pixbuf::create_from_file("bomba_e.png");
 	ico_and = Gdk::Pixbuf::create_from_file("and_e.png");
 	ico_or = Gdk::Pixbuf::create_from_file("or_e.png");
@@ -22,6 +23,7 @@ Constructor::Constructor(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glad
 	refGlade->get_widget("btn_tanque",btn_tanque);
 	refGlade->get_widget("btn_bomba", btn_bomba);
 	refGlade->get_widget("btn_exclusa", btn_exclusa);
+	refGlade->get_widget("btn_drain", btn_drain);
 	refGlade->get_widget("btn_and", btn_and);
 	refGlade->get_widget("btn_or", btn_or);
 	refGlade->get_widget("btn_not", btn_not);
@@ -49,6 +51,7 @@ Constructor::Constructor(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glad
 	btn_codo->drag_source_set(listTargets);
 	btn_tanque->drag_source_set(listTargets);
 	btn_bomba->drag_source_set(listTargets);
+	btn_drain->drag_source_set(listTargets);
 	btn_exclusa->drag_source_set(listTargets);
 	btn_and->drag_source_set(listTargets);
 	btn_or->drag_source_set(listTargets);
@@ -60,6 +63,7 @@ Constructor::Constructor(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glad
 	btn_y->signal_drag_data_get().connect( SigC::slot(*this, &Constructor::on_btn_y_drag_get));
 	btn_codo->signal_drag_data_get().connect( SigC::slot(*this, &Constructor::on_btn_codo_drag_get));
 	btn_tanque->signal_drag_data_get().connect( SigC::slot(*this, &Constructor::on_btn_tanque_drag_get));
+	btn_drain->signal_drag_data_get().connect( SigC::slot(*this, &Constructor::on_btn_drain_drag_get));
 	btn_and->signal_drag_data_get().connect( SigC::slot(*this, &Constructor::on_btn_and_drag_get));
 	btn_or->signal_drag_data_get().connect( SigC::slot(*this, &Constructor::on_btn_or_drag_get));
 	btn_not->signal_drag_data_get().connect( SigC::slot(*this, &Constructor::on_btn_not_drag_get));
@@ -83,6 +87,7 @@ Constructor::Constructor(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glad
 	btn_tanque->signal_drag_begin().connect( SigC::slot(*this, &Constructor::on_tanque_drag_begin));
 	btn_bomba->signal_drag_begin().connect( SigC::slot(*this, &Constructor::on_bomba_drag_begin));
 	btn_exclusa->signal_drag_begin().connect( SigC::slot(*this, &Constructor::on_exclusa_drag_begin));
+	btn_drain->signal_drag_begin().connect( SigC::slot(*this, &Constructor::on_drain_drag_begin));
 	btn_and->signal_drag_begin().connect( SigC::slot(*this, &Constructor::on_and_drag_begin));
 	btn_or->signal_drag_begin().connect( SigC::slot(*this, &Constructor::on_or_drag_begin));
 	btn_not->signal_drag_begin().connect( SigC::slot(*this, &Constructor::on_not_drag_begin));
@@ -105,32 +110,37 @@ Constructor::~Constructor()
 
 void Constructor::on_btn_canio_drag_get(const Glib::RefPtr<Gdk::DragContext>& context, GtkSelectionData* selection_data, guint info, guint time)
 {
-	gtk_selection_data_set (selection_data, selection_data->target, 8, (const guchar*)"canio_n.png", 14);
+	gtk_selection_data_set (selection_data, selection_data->target, 8, (const guchar*)"canio_n.png", 12);
 }
 
 void Constructor::on_btn_y_drag_get(const Glib::RefPtr<Gdk::DragContext>& context, GtkSelectionData* selection_data, guint info, guint time)
 {
-	gtk_selection_data_set(selection_data, selection_data->target, 8,(const guchar*)"y_n.png",10);
+	gtk_selection_data_set(selection_data, selection_data->target, 8,(const guchar*)"y_n.png",8);
 }
 
 void Constructor::on_btn_codo_drag_get(const Glib::RefPtr<Gdk::DragContext>& context, GtkSelectionData* selection_data, guint info, guint time)
 {
-	gtk_selection_data_set(selection_data, selection_data->target, 8 ,(const guchar*)"codo_o.png",13);
+	gtk_selection_data_set(selection_data, selection_data->target, 8 ,(const guchar*)"codo_o.png",10);
 }
 
 void Constructor::on_btn_tanque_drag_get(const Glib::RefPtr<Gdk::DragContext>& context, GtkSelectionData* selection_data, guint info, guint time)
 {
-	gtk_selection_data_set(selection_data, selection_data->target, 8,(const guchar*)"tanque_e.png",15);
+	gtk_selection_data_set(selection_data, selection_data->target, 8,(const guchar*)"tanque_e.png",12);
 }
 
 void Constructor::on_btn_bomba_drag_get(const Glib::RefPtr<Gdk::DragContext>& context, GtkSelectionData* selection_data, guint info, guint time)
 {
-	gtk_selection_data_set(selection_data, selection_data->target, 8,(const guchar*)"bomba_e.png",15);
+	gtk_selection_data_set(selection_data, selection_data->target, 8,(const guchar*)"bomba_e.png",11);
 }
 
 void Constructor::on_btn_exclusa_drag_get(const Glib::RefPtr<Gdk::DragContext>& context, GtkSelectionData* selection_data, guint info, guint time)
 {
-	gtk_selection_data_set(selection_data, selection_data->target, 8,(const guchar*)"exclusa_h.png",15);
+	gtk_selection_data_set(selection_data, selection_data->target, 8,(const guchar*)"exclusa_h.png",13);
+}
+
+void Constructor::on_btn_drain_drag_get(const Glib::RefPtr<Gdk::DragContext>& context, GtkSelectionData* selection_data, guint info, guint time)
+{
+	gtk_selection_data_set(selection_data, selection_data->target, 8,(const guchar*)"drain_n.png",11);
 }
 
 void Constructor::on_btn_and_drag_get(const Glib::RefPtr<Gdk::DragContext>& context, GtkSelectionData* selection_data, guint info, guint time)
@@ -162,8 +172,17 @@ void Constructor::on_main_menu_save()
 }
 
 void Constructor::on_edit_menu_del()
-{
-	// hay que meter algo aca.
+{  // OJO que borra al primero que encuentra con el mismo nombre!!!
+	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++;
+	}
 }
 
 void Constructor::on_chk_btn_clicked()
@@ -176,6 +195,7 @@ void Constructor::on_btn_file_ok_clicked()
 	std::list<CItem *>::iterator i = listaItems.begin();
 	std::string 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;
@@ -229,6 +249,11 @@ void Constructor::on_exclusa_drag_begin(const Glib::RefPtr<Gdk::DragContext>& co
 	context->set_icon(ico_exclusa, 5, 5); 
 }
 
+void Constructor::on_drain_drag_begin(const Glib::RefPtr<Gdk::DragContext>& context)
+{
+	context->set_icon(ico_drain, 5, 5); 
+}
+
 void Constructor::on_and_drag_begin(const Glib::RefPtr<Gdk::DragContext>& context)
 {
 	context->set_icon(ico_and, 5, 5); 
@@ -247,6 +272,11 @@ 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)
 {
 	context->set_icon(item->get_image(), 5, 5);
+	std::list<CItem *>::iterator i = listaItems.begin();
+	while ( i != listaItems.end() ){
+		(*i)->set_default_connector();
+		i++;
+	}
 }
 
 void Constructor::on_item_drag_data_get(const Glib::RefPtr<Gdk::DragContext>& context, GtkSelectionData* selection_data, guint info, guint time)
@@ -304,15 +334,17 @@ void Constructor::on_item_drop_drag_received(const Glib::RefPtr<Gdk::DragContext
 												a =new Pump();
 													else if (strcmp((const char *)selection_data->data, "exclusa_h.png")==0) 
 														a = new Exclusa();
-															else if (strcmp((const char *)selection_data->data, "and_e.png")==0) 
-																a = new And();
-																	else if (strcmp((const char *)selection_data->data, "or_e.png")==0) 
-																		a = new Or();
-																			else if (strcmp((const char *)selection_data->data, "not_e.png")==0) 
-																				a = new Not();	
+															else if (strcmp((const char *)selection_data->data, "drain_n.png")==0) 
+																a = new Drain();
+																	else if (strcmp((const char *)selection_data->data, "and_e.png")==0) 
+																		a = new And();
+																			else if (strcmp((const char *)selection_data->data, "or_e.png")==0) 
+																				a = new Or();
+																					else if (strcmp((const char *)selection_data->data, "not_e.png")==0) 
+																						a = new Not();	
 		
 			char char_id[10];
-			sprintf(char_id," %d",id);
+			sprintf(char_id,"%d",id);
 			a->set_id(++id);		
 			a->set_name( a->get_name()+char_id );
 			if ( can_drop(a, i*32, j*32) ) {