* Cliente carga todos los widgets (falta exclusa!)

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

diff --git a/Constructor/conduct.cpp b/Constructor/conduct.cpp
index 2a582fb9f82fc8c432276bbc97063a4aa284c74c..9b2e31fcbf459580c20a609a546259930f9382f8 100644 (file)
--- a/Constructor/conduct.cpp
+++ b/Constructor/conduct.cpp
@@ -9,6 +9,7 @@ Conduct::Conduct()
        image = imageN;
        set_size_request(image->get_width(), image->get_height());
        property_wnd->set_title("Propiedades del Tubo");
+       name="tubo";
 }
 
 Conduct::~Conduct()
@@ -90,13 +91,27 @@ bool Conduct::check_connection()
 {
        switch (get_img_actual()) {
                        case 0:
-                               if ( is_other_occupied_area( get_position_x()+get_image()->get_width()/2, get_position_y()+get_image()->get_height()+10) && 
-                                        is_other_occupied_area( get_position_x()+get_image()->get_width()/2, get_position_y() - 10) )
+                               if ( is_other_connection_area( get_position_x()+16, get_position_y()-5) && 
+                                        is_other_connection_area( get_position_x()+16, 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()+get_image()->get_height()/2) )
+                               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) )
+                                       return true;
+       }
+       return false;
+}
+
+bool Conduct::is_connection_area(int _a, int _b)
+{
+       switch (imgActual){
+               case 0:
+                       if ( ((_a <= x+image->get_width()-10 )&&(_a >= x + 10) && (_b <= y+10) &&(_b > 0 )) ||
+                                ((_a <= x+22 )&&(_a >= x + 10) && (_b <= y+image->get_height()-1) &&(_b >= y+image->get_height()-10 )) )
+                               return true;
+               case 1:
+                       if ( ((_a <= x+10 )&&(_a > 0) && (_b <= y+image->get_height()-10) &&(_b >= y+10 )) ||
+                                ((_a <= x+image->get_width()-1)&&(_a >= x+image->get_width()-10) && (_b <= y+image->get_height()-10) &&(_b >= y +10 )) )
                                return true;
        }
        return false;