X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/5042b6492969385725852d3cf90959abb52a7398..663eccb7e27110aba6c79648c38254a7a5737bca:/Constructor/src/pump.cpp

diff --git a/Constructor/src/pump.cpp b/Constructor/src/pump.cpp
index 7526f6b..897ca50 100644
--- a/Constructor/src/pump.cpp
+++ b/Constructor/src/pump.cpp
@@ -7,6 +7,7 @@ Pump::Pump(int orientacion)
 	in_y = y;
 	out_x = in_x;
 	out_y = y + 32;
+	entrega = 10.0;
 	imageE = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/bomba_e.png");
 	imageO = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/bomba_o.png");
 	null = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/bomba_null.png");
@@ -32,6 +33,7 @@ Pump::Pump(int orientacion)
 	connect_vec.push_back(temp);
 }
 
+
 Pump::~Pump()
 {
 }
@@ -40,21 +42,31 @@ bool Pump::on_button_press_event(GdkEventButton *event)
 {
 	t_line tmp_line;
 	if ((event->type == GDK_BUTTON_PRESS) && ( event->button == 1)) {
-		combo_entry->set_text(name);
+		list_pointed->push_back(name);
+		combo_entry->set_popdown_strings(*list_pointed);
+		combo_entry->get_entry()->set_text (name);
 		WorkPlace::pointed = ID;
-		if (CItem::logic_connect) {
-			if ( detect_click_position(event->x, event->y) == IN) {
-				tmp_line.logic =  workplace->get_logic_item(CItem::gate_id);
-				tmp_line.store = this;
+		if (CItem::logic_connect && CItem::gate_id != -1) {
+			if ( detect_click_position((int)event->x, (int)event->y) == IN) {
+				tmp_line.logic_id =  workplace->get_logic_item(CItem::gate_id)->get_id();
+				workplace->get_logic_item(CItem::gate_id)->set_out_connected(true);
+				tmp_line.store_id = ID;
 				workplace->lista_lineas_in.push_back(tmp_line);
 				workplace->queue_draw();
-			} else {
-				tmp_line.logic =  workplace->get_logic_item(CItem::gate_id);
-				tmp_line.store = this;
+			} else if (detect_click_position((int)event->x, (int)event->y) == OUT) {
+				tmp_line.logic_id =  workplace->get_logic_item(CItem::gate_id)->get_id();
+				tmp_line.store_id = ID;
 				workplace->lista_lineas_out.push_back(tmp_line);
 				workplace->queue_draw();
 			}
+			CItem::gate_id = -1;
 		}
+		char f[10];
+		Glib::ustring text;
+		sprintf(f,"%.1f",entrega);
+		text = name+"  Entrega: ";
+		text += f;
+		status_bar->push ( text, 0);
 	}
 	
 	if ((event->type == GDK_BUTTON_PRESS) && ( event->button ==2)){