X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/f85e6b00bd29ddff6067db8c6d4c56f53bcf4c0b..ea7708f0d91b00a54cc5f136a67e9f9bd272329d:/Constructor/src/conduct.cpp?ds=sidebyside

diff --git a/Constructor/src/conduct.cpp b/Constructor/src/conduct.cpp
index f753a67..c6dd074 100644
--- a/Constructor/src/conduct.cpp
+++ b/Constructor/src/conduct.cpp
@@ -2,6 +2,7 @@
 
 Conduct::Conduct(int orientacion)
 {
+	in_x = -1;
 	imageN = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/canio_n.png");
 	imageS = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/canio_s.png");
 	null = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/null.png");
@@ -30,9 +31,13 @@ Conduct::~Conduct()
 
 bool Conduct::on_button_press_event(GdkEventButton *event)
 {
-	int w, h;
-	if ((event->type == GDK_BUTTON_PRESS) && ( event->button == 1))
-		combo_entry->set_text(name);
+	if ((event->type == GDK_BUTTON_PRESS) && ( event->button == 1)) {
+		list_pointed->push_back(name);
+		combo_entry->set_popdown_strings(*list_pointed);
+		WorkPlace::pointed = ID;
+		combo_entry->get_entry()->set_text (name);
+		workplace->queue_draw();
+	}
 	
 	if ((event->type == GDK_BUTTON_PRESS) && ( event->button ==2)){
 		image = null; 
@@ -46,8 +51,7 @@ bool Conduct::on_button_press_event(GdkEventButton *event)
 				imgActual = 0;
 				image = imageN;			
 		}
-		get_size_request(w, h);
-		set_size_request(h, w);		
+		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);
 	}
 	if ((event->type == GDK_BUTTON_PRESS) && ( event->button == 3)){
@@ -133,6 +137,9 @@ bool Conduct::check_connection()
 	else return is_connected;
 }
 
+/*si no estoy conectado pregunto por el del otro lado, y ahi puedo setear los dos
+ *si ya estoy devuelvo.
+*/
 ConnectorType Conduct::get_connector_type(int _a, int _b)
 { 
 	CItem *_item;
@@ -167,9 +174,7 @@ ConnectorType Conduct::get_connector_type(int _a, int _b)
 	}
 	return UNDEF;
 }
-/*si no estoy conectado pregunto por el del otro lado, y ahi puedo setear los dos
- *si ya estoy devuelvo.
-*/
+
 
 void Conduct::set_default_connector()
 {