agrege todos los items con sus respectivas ventanas pero falta arreglar el tema del...

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

diff --git a/Constructor/cistern.cpp b/Constructor/cistern.cpp
index fe0e5dd1a5ccb42ebaaa79b5f7df5679f49fc83d..71d8cceb92fac1d70a6d1641fadb31019e0b4f19 100644 (file)
--- a/Constructor/cistern.cpp
+++ b/Constructor/cistern.cpp
@@ -14,6 +14,7 @@ Cistern::Cistern()
        ref->get_widget_derived("cistern_pty_wnd",cistern_pty_wnd);
        cistern_pty_wnd->cistern = this;
        cistern_pty_wnd->set_title("Propiedades del Tanque");   
        ref->get_widget_derived("cistern_pty_wnd",cistern_pty_wnd);
        cistern_pty_wnd->cistern = this;
        cistern_pty_wnd->set_title("Propiedades del Tanque");   

+       name = "tanque";

 }
 
 Cistern::~Cistern()
 }
 
 Cistern::~Cistern()


@@ -117,11 +118,13 @@ bool Cistern::check_connection()
 {
        switch (get_img_actual()) {
                case 0:
 {
        switch (get_img_actual()) {
                case 0:

-                       if ( is_other_occupied_area( get_position_x()+get_image()->get_width()+10 , get_position_y()+get_image()->get_height() -10) )
+                       if ( is_other_occupied_area( get_position_x()+get_image()->get_width()+10 , get_position_y()+get_image()->get_height() -10) &&
+                                is_other_occupied_area( get_position_x() + 10, get_position_y() - 10) ) 

                                return true;                            
                        break;
                case 1:
                                return true;                            
                        break;
                case 1:

-                       if ( is_other_occupied_area( get_position_x() -10, get_position_y()+get_image()->get_height()-10) )
+                       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() - 10, get_position_y() - 10) )

                                return true;
        }
        return false;
                                return true;
        }
        return false;