X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/ee2cb3d6c26ae319d20bde28f415393e96611ece..101179f2d7bcc4de75c326d3e9d01694c84d07ca:/Constructor/src/cistern.cpp

diff --git a/Constructor/src/cistern.cpp b/Constructor/src/cistern.cpp
index d39a66c..f58df18 100644
--- a/Constructor/src/cistern.cpp
+++ b/Constructor/src/cistern.cpp
@@ -3,6 +3,10 @@
 
 Cistern::Cistern(int orientacion)
 {
+	in_x = x+5;
+	in_y = y+16;
+	out_x = x + 48;
+	out_y = y + 64;
 	imageE = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/tanque_e.png");
 	imageO = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/tanque_o.png");
 	null = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/tanque_null.png");
@@ -40,13 +44,22 @@ bool Cistern::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);
+		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) {
-			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);
+		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();
+				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) { 
+				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();
+			}
 		}
 	}
 	
@@ -57,10 +70,18 @@ bool Cistern::on_button_press_event(GdkEventButton *event)
 		switch (imgActual) {
 			case 1:
 				image = imageO;
+				in_x = x + image->get_width()-5;
+				in_y = y + 16;
+				out_x = x+16;
+				out_y = y + image->get_height();
 				break;
 			default: 
 				imgActual = 0;
 				image = imageE;			
+				in_x = x+5;
+				in_y = y+16;
+				out_x = x + image->get_width() -16;
+				out_y = y + image->get_height();
 		}
 		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);
@@ -77,7 +98,7 @@ bool Cistern::on_button_press_event(GdkEventButton *event)
 		cistern_pty_wnd->txt_cistern_name->set_text( name );
 		cistern_pty_wnd->show();
 	}		
-	workplace->on_expose_event(&e);
+	workplace->queue_draw();
 	return true;
 }
 
@@ -204,15 +225,50 @@ void Cistern::set_default_connector()
 	connect_vec[1].type = OUT;
 }
 
-void Cistern::get_logic_connect_position(int& _a, int& _b)
+void Cistern::get_in_logic_connect_position(int& _a, int& _b)
 {
+	_a = in_x;
+	_b = in_y;
+}
+
+void Cistern::get_out_logic_connect_position(int& _a, int& _b)
+{
+	_a = out_x;
+	_b = out_y;
+}
+	
+ConnectorType Cistern::detect_click_position(int _a, int _b)
+{
+	//VER DONDE CAEN LOS CLICKS!!!!!!!!!!!!!! SI ES CON RESPECTO AL WORKPLACE O AL ITEM!!!
 	switch(imgActual) {
-		case 0: 
-			_a = x;
-			_b = y + 10;
+		case 0:
+			if ( (_a<=32) &&(_a>=0)&&(_b<=32)&&(_b>=0) )
+				return IN;
+			if ( (_a<=image->get_width())&&(_a>=image->get_width()-32)&&(_b<=image->get_height())&&(_b>=image->get_height()-32) )
+				return OUT;
 			break;
-		case 1: 
-			_a = x +image->get_width();
-			_b = y + 10;
+		case 1:
+			if ( (_a<=image->get_width()) &&(_a>=image->get_width()-32)&&(_b<=32)&&(_b>=0) )
+				return IN;
+			if ( (_a<=32)&&(_a>=0)&&(_b<=image->get_height())&&(_b>=image->get_height()-32) )
+				return OUT;
+		}
+		return UNDEF;
+}
+		
+void Cistern::update_logic_position()
+{
+	switch (imgActual) {
+		case 1:
+			in_x = x + image->get_width()-5;
+			in_y = y + 16;
+			out_x = x+16;
+			out_y = y + image->get_height();
+			break;
+		case 0: 
+			in_x = x+5;
+			in_y = y+16;
+			out_x = x + image->get_width() -16;
+			out_y = y + image->get_height();
 	}
 }