X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/d53ded00c10a30a17c7f0aad90acca933a7f4db9..796708eefb056b936274da15c7af2c7d709c9249:/Constructor/or.cpp

diff --git a/Constructor/or.cpp b/Constructor/or.cpp
index d68dc6d..0c0631b 100644
--- a/Constructor/or.cpp
+++ b/Constructor/or.cpp
@@ -11,6 +11,7 @@ Or::Or()
 	image = imageE;
 	set_size_request(image->get_width(), image->get_height());
 	name = "or";
+	menulist.push_back( Gtk::Menu_Helpers::ImageMenuElem("Conectar", menu_image_linea,SigC::slot(*this, &CItem::on_menu_popup_conectar) ) ) ;
 }
 
 Or::~Or()
@@ -19,8 +20,10 @@ Or::~Or()
 
 bool Or::on_button_press_event(GdkEventButton *event)
 {
-	if ((event->type == GDK_BUTTON_PRESS) && ( event->button == 1))
+	if ((event->type == GDK_BUTTON_PRESS) && ( event->button == 1)) {
+		std::cout<<ID<<std::endl;
 		combo_entry->set_text(name);
+	}
 	
 	if ((event->type == GDK_BUTTON_PRESS) && ( event->button == 2)){
 		image = null;   
@@ -49,6 +52,7 @@ bool Or::on_button_press_event(GdkEventButton *event)
   	}
 	return true;
 }
+
 void Or::on_menu_popup_rotar()
 {
 	GdkEventButton event; 
@@ -57,54 +61,18 @@ void Or::on_menu_popup_rotar()
 	Or::on_button_press_event(&event);
 }
 
-void Or::save(FILE *archivo)
+void Or::on_menu_popup_conectar()
 {
-
+	CItem::logic_connect = true;
+	CItem::quien = ID;	
 }
 
-
-// CAMBIAR TODO ESTO!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-bool Or::check_connection()
+void Or::save(FILE *archivo)
 {
-	switch (get_img_actual()) {
-			case 0:
-				if ( is_other_connection_area( get_position_x()-5, get_position_y()+16) && 
-					 is_other_connection_area( get_position_x()+get_image()->get_width()-16, +get_position_y()+get_image()->get_height() + 5) )
-					return true;				
-				break;	
-			case 1:
-				if ( is_other_connection_area( get_position_x()+get_image()->get_width() - 16, get_position_y() -5) && 
-					 is_other_connection_area( get_position_x()-5, get_position_y()+get_image()->get_height()-16) )
-					return true;
-				break;
-			case 2:
-				if ( is_other_connection_area( get_position_x() + 16, get_position_y() -5) &&
-					 is_other_connection_area( get_position_x()+get_image()->get_width()+5, get_position_y()+get_image()->get_height()-16) )
-					return true;
-				break;
-			case 3:
-				if ( is_other_connection_area( get_position_x()+get_image()->get_width()+5, get_position_y() +16) &&
-					 is_other_connection_area( get_position_x() + 16, get_position_y()+get_image()->get_height() + 5) )
-					return true;
-	}
-	return false;
+
 }
 
-bool Or::is_connection_area(int _a, int _b)
+bool Or::check_connection()
 {
-	switch (imgActual) {
-		case 0: if ( ( (_a <= x+10)&&(_a > x) && (_b <=y+22)&&(_b>=y+10) ) ||
-						 ( (_a <= x+image->get_width()-10)&&(_a>=x+image->get_width()-22)&&(_b<=y+image->get_height()-1)&&(_b>=y+image->get_height()-10) ) )
-						return true;
-		case 1: if ( ( (_a <= x+image->get_width()-10)&&(_a >= x+image->get_width()-22) && (_b <=y+10)&&(_b > y) ) ||
-						 ( (_a <= x+10)&&(_a > x)&&(_b<=y+image->get_height()-10)&&(_b>=y+image->get_height()-22) ) )
-						return true;
-		case 2: if ( ( (_a <= x+22)&&(_a >= x+10) && (_b <=y+10)&&(_b > y) ) ||
-						 ( (_a <= x+image->get_width()-1)&&(_a>=x+image->get_width()-10)&&(_b<=y+image->get_height()-10)&&(_b>=y+image->get_height()-22) ) )
-						return true;
-		case 3: if ( ( (_a <= x+image->get_width()-1)&&(_a >= x+image->get_width()-10) && (_b <=y+22)&&(_b>=y+10) ) ||
-						 ( (_a <= x+22)&&(_a>=x+10)&&(_b<=y+image->get_height()-1)&&(_b>=y+image->get_height()-10) ) )
-						return true;
-	}
-	return false;
+	return true;
 }