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 / pump.cpp

diff --git a/Constructor/pump.cpp b/Constructor/pump.cpp
index 51993a225eeeca7caf473960aa15f6621d195eb4..719a1f9c83a84967b69731da8f58e43abce8cd4d 100644 (file)
--- a/Constructor/pump.cpp
+++ b/Constructor/pump.cpp
@@ -97,7 +97,7 @@ void Pump::save(FILE *archivo)
        dato += c_img;
        dato += c_x; 
        dato += c_y;
-       dato += "\t</entrega>\n";
+       dato += "\t</bomba>\n";
        fprintf(archivo,dato.c_str());  
 }
 
@@ -105,12 +105,23 @@ bool Pump::check_connection()
 {
        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_connection_area( get_position_x()+get_image()->get_width()+5 , get_position_y() +16) )
                                return true;                            
                        break;
                case 1:
-                       if ( is_other_occupied_area( get_position_x() -10, get_position_y() -10) )
+                       if ( is_other_connection_area( get_position_x() -5, get_position_y() +16) )
                                return true;
        }
        return false;
 }
+
+bool Pump::is_connection_area(int _a, int _b)
+{
+       switch (imgActual) {
+               case 0: if ( (_a <= x+image->get_width()-1)&&(_a>=x+image->get_width()-10)&&(_b<=y+22)&&(_b > y) ) 
+                                               return true;
+               case 1: if ( (_a <= x+10)&&(_a > x)&&(_b<=y+22)&&(_b > y) ) 
+                                               return true;
+       }
+       return false;
+}