X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/f85e6b00bd29ddff6067db8c6d4c56f53bcf4c0b..8991f15558a6b0fbcfd588abe073f6f0537a7f8d:/Constructor/src/pump.cpp?ds=inline

diff --git a/Constructor/src/pump.cpp b/Constructor/src/pump.cpp
index e2510f6..2d7f2a8 100644
--- a/Constructor/src/pump.cpp
+++ b/Constructor/src/pump.cpp
@@ -1,8 +1,14 @@
 #include "pump.h"
 #include "pumpptywnd.h"
+#include "not.h"
 
 Pump::Pump(int orientacion)
 {
+	in_x = x + 48;
+	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");
@@ -28,23 +34,50 @@ Pump::Pump(int orientacion)
 	connect_vec.push_back(temp);
 }
 
+
 Pump::~Pump()
 {
 }
 
 bool Pump::on_button_press_event(GdkEventButton *event)
 {
-	GdkEventExpose e;
 	t_line tmp_line;
 	if ((event->type == GDK_BUTTON_PRESS) && ( event->button == 1)) {
-		combo_entry->set_text(name);
-		if (CItem::logic_connect) {
-			tmp_line.logic =  workplace->get_logic_item(CItem::quien);
-			tmp_line.store = this;
-			workplace->lista_lineas.push_back(tmp_line);
-			workplace->on_expose_event(&e);
+		list_pointed->push_back(name);
+		combo_entry->set_popdown_strings(*list_pointed);
+		combo_entry->get_entry()->set_text (name);
+		WorkPlace::pointed = ID;
+		std::cout<< "CItem::gate_id = "<<CItem::gate_id<<std::endl;
+		if (CItem::logic_connect && CItem::gate_id != -1) {
+			if ( detect_click_position((int)event->x, (int)event->y) == IN && !workplace->get_logic_item(CItem::gate_id)->get_out_logic_connect()) {
+				tmp_line.logic_id =  CItem::gate_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 if (detect_click_position((int)event->x, (int)event->y) == OUT )  { 
+				if (dynamic_cast<Not *>(workplace->get_logic_item(CItem::gate_id))) {
+					if ( !dynamic_cast<Not *>(workplace->get_logic_item(CItem::gate_id))->get_in_logic_connect()) {
+						workplace->get_logic_item(CItem::gate_id)->set_in_connected(true);
+						tmp_line.logic_id =  CItem::gate_id;
+						tmp_line.store_id = ID;
+						workplace->lista_lineas_out.push_back(tmp_line);
+						workplace->queue_draw();
+					}
+				} else {
+					tmp_line.logic_id =  CItem::gate_id;
+					tmp_line.store_id = ID;
+					workplace->lista_lineas_out.push_back(tmp_line);
+					workplace->queue_draw();
+				}					
+			}
+			CItem::gate_id = -1;
 		}
-		CItem::logic_connect = false;	
+		char f[20];
+		Glib::ustring text;
+		sprintf(f,"  Entrega:%.1f",entrega);
+		text = name+f;
+		status_bar->push ( text, 0);
 	}
 	
 	if ((event->type == GDK_BUTTON_PRESS) && ( event->button ==2)){
@@ -54,10 +87,18 @@ bool Pump::on_button_press_event(GdkEventButton *event)
 		switch (imgActual) {
 			case 1:
 				image = imageO;
+				in_x = x + 16;
+				in_y = y;			
+				out_x = in_x;
+				out_y = y + 32;
 				break;
 			default: 
 				imgActual = 0;
 				image = imageE;			
+				in_x = x + image->get_width()-16;
+				in_y = y;
+				out_x = in_x;
+				out_y = y + 32;
 		}
 		set_size_request(image->get_width(),image->get_height());
 		image->render_to_drawable(get_window(),get_style()->get_black_gc(),0,0,0,0,image->get_width(),image->get_height(),Gdk::RGB_DITHER_NONE,0,0);
@@ -73,6 +114,7 @@ bool Pump::on_button_press_event(GdkEventButton *event)
 		pump_pty_wnd->txt_pump_name->set_text( name );
 		pump_pty_wnd->show();
 	}		
+	workplace->queue_draw();
 	return true;
 }
 
@@ -156,6 +198,7 @@ bool Pump::check_connection()
 			temp =  is_other_connection_area( get_position_x() -5, get_position_y() +16, &_item);
 	}
 	 if (is_connected = ( temp == IN) ) {
+			std::cout << "PUMP " << _item->get_id() << std::endl;
 		 connect_vec[0].id_dest = _item->get_id();
 		 return is_connected;
 	 }
@@ -180,3 +223,50 @@ void Pump::set_default_connector()
 {
 	connect_vec[0].type = OUT;
 }
+
+void Pump::get_in_logic_connect_position(int& _a, int& _b)
+{
+	_a = in_x;
+	_b = in_y;
+}
+
+void Pump::get_out_logic_connect_position(int& _a, int& _b)
+{
+	_a = out_x;
+	_b = out_y;
+}
+	
+ConnectorType Pump::detect_click_position(int _a, int _b)
+{
+	switch (imgActual) {
+		case 0:
+			if ( (_a <=image->get_width())&&(_a>=image->get_width()-32)&&(_b<=16)&&(_b >= 0) )
+				return IN;
+			if ( (_a <= image->get_width())&&(_a>=image->get_width()-32)&&(_b<=32)&&(_b > 16) )
+				return OUT;
+			break;
+		case 1:
+			if ( (_a <= 32)&&(_a>=0)&&(_b<=16)&&(_b >= 0) )
+				return IN;
+			if ( (_a <= 32)&&(_a>=0)&&(_b<=32)&&(_b > 16) )
+				return OUT;
+		}
+		return UNDEF;
+}
+
+void Pump::update_logic_position()
+{
+	switch (imgActual) {
+		case 1:
+			in_x = x + 16;
+			in_y = y;			
+			out_x = in_x;
+			out_y = y + 32;
+			break;
+		case 0: 
+			in_x = x + image->get_width()-16;
+			in_y = y;
+			out_x = in_x;
+			out_y = y + 32;
+	}
+}