-ahi borre lo que se me escapo

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

diff --git a/Constructor/cistern.cpp b/Constructor/cistern.cpp
index 71d8cceb92fac1d70a6d1641fadb31019e0b4f19..88eae2de4e82aaa32b97502637bdd159ce99fcce 100644 (file)
--- a/Constructor/cistern.cpp
+++ b/Constructor/cistern.cpp
@@ -77,9 +77,9 @@ void Cistern::set_capacidad(double _cap)
        capacidad = _cap;
 }
 
-double Cistern::get_capacidad()
+void Cistern::set_liquid_color(Gdk::Color _color)
 {
-       return capacidad;
+       liquid_color = _color;
 }
 
 void Cistern::set_contenido_inicial(double _ini)
@@ -87,14 +87,27 @@ void Cistern::set_contenido_inicial(double _ini)
        contenido_inicial = _ini;
 }
 
+double Cistern::get_capacidad()
+{
+       return capacidad;
+}
+
 double Cistern::get_contenido_inicial()
 {
        return contenido_inicial;
 }
 
+Gdk::Color Cistern::get_liquid_color()
+{
+       return liquid_color;
+}
+
 void Cistern::save(FILE *archivo)
 {
-       char c_id[50], c_cap[50], c_x[50], c_y[50], c_img[50], c_ini[50];
+       char c_id[50], c_cap[50], c_x[50], c_y[50], c_img[50], c_ini[50], c_red[50], c_green[50], c_blue[50];
+       sprintf(c_red,"\t\t\t<rojo>%d</rojo>\n",liquid_color.get_red());
+       sprintf(c_green,"\t\t\t<verde>%d</verde>\n",liquid_color.get_green());
+       sprintf(c_blue,"\t\t\t<azul>%d</azul>\n",liquid_color.get_blue());
        sprintf(c_x,"\t\t<x>%d</x>\n",x);
        sprintf(c_y,"\t\t<y>%d</y>\n",y);
        sprintf(c_id,"%d",ID);
@@ -107,6 +120,11 @@ void Cistern::save(FILE *archivo)
        dato += "\">\n";
        dato += c_cap;
        dato += c_ini;
+       dato += "\t<color>\n";
+       dato += c_red;
+       dato += c_green;
+       dato += c_blue;
+       dato += "\t</color>\n";
        dato += c_img;
        dato += c_x; 
        dato += c_y;
@@ -118,14 +136,26 @@ bool Cistern::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) &&
-                                is_other_occupied_area( get_position_x() + 10, get_position_y() - 10) ) 
+                       if ( is_other_connection_area( get_position_x()+get_image()->get_width() + 5 , get_position_y()+get_image()->get_height() -16) &&
+                                is_other_connection_area( get_position_x() + 16, get_position_y() - 5) ) 
                                return true;                            
-                       break;
                case 1:
-                       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) )
+                       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() - 16, get_position_y() - 5) )
                                return true;
        }
        return false;
 }
+
+bool Cistern::is_connection_area(int _a, int _b)
+{
+       switch (imgActual) {
+               case 0: 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 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;
+       }
+       return false;
+}