El cliente ya se conecta, muestra en un campo de texto el log de lo que se esta

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

diff --git a/Constructor/union.cpp b/Constructor/union.cpp
index 3de8b900fc3eee1d20a5f41059a2e606bd74392c..f5b6d98e94ac4914f16ec048ae2f081e3e4806d8 100644 (file)
--- a/Constructor/union.cpp
+++ b/Constructor/union.cpp
@@ -11,6 +11,7 @@ Union::Union()
        image = imageN;
        set_size_request(image->get_width(), image->get_height());
        property_wnd->set_title("Propiedades del Empalme");
+       name = "union";
 }
 
 Union::~Union()
@@ -96,28 +97,51 @@ bool Union::check_connection()
 {
        switch (get_img_actual()) {
                        case 0:
-                               if ( is_other_occupied_area( get_position_x() - 10, get_position_y() +10) &&
-                                        is_other_occupied_area( get_position_x()+get_image()->get_width()+10, get_position_y()+10) &&
-                                        is_other_occupied_area( get_position_x()+get_image()->get_width()/2, get_position_y()+get_image()->get_height()+10) )
+                               if ( is_other_connection_area( get_position_x() - 5, get_position_y() +16) &&
+                                        is_other_connection_area( get_position_x()+get_image()->get_width()+5, get_position_y()+16) &&
+                                        is_other_connection_area( get_position_x()+get_image()->get_width()/2, get_position_y()+get_image()->get_height()+5) )
                                        return true;                            
                                break;
                        case 1:
-                               if ( is_other_occupied_area( get_position_x()-10, get_position_y()+get_image()->get_height()/2) &&
-                                        is_other_occupied_area( get_position_x()+get_image()->get_width()-10, get_position_y()-10) &&
-                                        is_other_occupied_area( get_position_x()+get_image()->get_width()-10, get_position_y()+get_image()->get_height()+10) )
+                               if ( is_other_connection_area( get_position_x()-5, get_position_y()+get_image()->get_height()/2) &&
+                                        is_other_connection_area( get_position_x()+get_image()->get_width()-16, get_position_y()-5) &&
+                                        is_other_connection_area( get_position_x()+get_image()->get_width()-16, get_position_y()+get_image()->get_height()+5) )
                                        return true;                            
                                break;
                        case 2:
-                               if ( is_other_occupied_area( get_position_x()-10, get_position_y()+get_image()->get_height()-10) &&
-                                        is_other_occupied_area( get_position_x()+get_image()->get_width()/2, get_position_y()-10) &&
-                                        is_other_occupied_area( get_position_x()+get_image()->get_width()+10, get_position_y()+get_image()->get_height()-10) )
+                               if ( is_other_connection_area( get_position_x()-5, get_position_y()+get_image()->get_height()-16) &&
+                                        is_other_connection_area( get_position_x()+get_image()->get_width()/2, 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_occupied_area( get_position_x()+10, get_position_y()-10) &&
-                                        is_other_occupied_area( get_position_x()+get_image()->get_width()+10, get_position_y()+get_image()->get_height()/2) &&
-                                        is_other_occupied_area( get_position_x()+10, get_position_y()+get_image()->get_height()+10) )
+                               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()/2) &&
+                                        is_other_connection_area( get_position_x()+16, get_position_y()+get_image()->get_height()+5) )
                                        return true;
        }
        return false;   
 }
+
+bool Union::is_connection_area(int _a, int _b)
+{
+       switch ( imgActual) {
+               case 0: if ( ((_a <= x+10) && (_a > x+1) && (_b<= y + 22) && (_b >= y+10)) ||
+                                                 ((_a <= x+image->get_width()-1) && (_a >= x+image->get_width()-10)&&(_b <= y+22) && (_b >= y+10)) ||
+                                                 ((_a <= x+image->get_width()/2 + 5)&&( _a>= x+image->get_width()/2 - 5) && (_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()/2+5 ) && (_b >= y+image->get_height()/2-5)) ||
+                                                 ((_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 2: if ( ((_a <= x+10) && (_a > x) && (_b<= y+image->get_height()-10) && (_b >= y+image->get_height()-22)) ||
+                                                 ((_a <= x+image->get_width()-1) && (_a >= x+image->get_width()-10)&&(_b <= y+image->get_height()-10) && (_b >= y+image->get_height()-22)) ||
+                                                 ((_a <= x+image->get_width()/2 + 5)&&( _a>= x+image->get_width()/2 - 5) && (_b<=y+10)&&(_b > y)) )
+                                               return true;
+               case 3: if ( ((_a <= x+22) && (_a >= x+10) && (_b<= y + 10) && (_b > y )) ||
+                                                 ((_a <= x+22) && (_a >= x+10 )&&(_b <= y+image->get_height()-1 ) && (_b >= y+image->get_height()-10)) ||
+                                                 ((_a <= x+image->get_width() -1)&&( _a>= x+image->get_width()-10) && (_b<=y+image->get_height()/2+5)&&(_b >= y+image->get_height()/2-5)) )
+                                               return true;
+       }
+       return false;
+}