-Se conectan como trompada!!!!!

[z.facultad/75.42/plaqui.git] / Constructor / or.cpp

diff --git a/Constructor/or.cpp b/Constructor/or.cpp
index d68dc6d9f9b2c4000ce20587948ab302bfe8f9a7..b4801881aedf08cc48a82a9ab4bd358cec548ff9 100644 (file)
--- 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";
        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()
 }
 
 Or::~Or()


@@ -57,54 +58,14 @@ void Or::on_menu_popup_rotar()
        Or::on_button_press_event(&event);
 }
 
        Or::on_button_press_event(&event);
 }
 

+
+

 void Or::save(FILE *archivo)
 {
 
 }
 
 void Or::save(FILE *archivo)
 {
 
 }
 

-
-// CAMBIAR TODO ESTO!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

 bool Or::check_connection()
 {
 bool Or::check_connection()
 {

-       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)
-{
-       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;

 }
 }