Se corrige un bug.

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

diff --git a/Constructor/cistern.cpp b/Constructor/cistern.cpp
index 71d8cceb92fac1d70a6d1641fadb31019e0b4f19..fd49a6eb4d0c88b9c71b5603f0c4bab01ef3cf26 100644 (file)
--- a/Constructor/cistern.cpp
+++ b/Constructor/cistern.cpp
@@ -15,6 +15,13 @@ Cistern::Cistern()
        cistern_pty_wnd->cistern = this;
        cistern_pty_wnd->set_title("Propiedades del Tanque");   
        name = "tanque";
        cistern_pty_wnd->cistern = this;
        cistern_pty_wnd->set_title("Propiedades del Tanque");   
        name = "tanque";

+       
+       Connector temp;
+       temp.id_dest = -1;
+       temp.type = IN;
+       connect_vec.push_back(temp); // entrada arriba
+       temp.type = OUT;
+       connect_vec.push_back(temp); // salida abajo

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


@@ -77,9 +84,9 @@ void Cistern::set_capacidad(double _cap)
        capacidad = _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)
 }
 
 void Cistern::set_contenido_inicial(double _ini)


@@ -87,14 +94,27 @@ void Cistern::set_contenido_inicial(double _ini)
        contenido_inicial = _ini;
 }
 
        contenido_inicial = _ini;
 }
 

+double Cistern::get_capacidad()
+{
+       return capacidad;
+}
+

 double Cistern::get_contenido_inicial()
 {
        return contenido_inicial;
 }
 
 double Cistern::get_contenido_inicial()
 {
        return contenido_inicial;
 }
 

+Gdk::Color Cistern::get_liquid_color()
+{
+       return liquid_color;
+}
+

 void Cistern::save(FILE *archivo)
 {
 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);
        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 +127,11 @@ void Cistern::save(FILE *archivo)
        dato += "\">\n";
        dato += c_cap;
        dato += c_ini;
        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;
        dato += c_img;
        dato += c_x; 
        dato += c_y;


@@ -116,16 +141,39 @@ void Cistern::save(FILE *archivo)
 
 bool Cistern::check_connection()
 {
 
 bool Cistern::check_connection()
 {

+       ConnectorType temp0, temp1;

        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) &&
-                                is_other_occupied_area( get_position_x() + 10, get_position_y() - 10) ) 
-                               return true;                            
+                       temp0 = is_other_connection_area( get_position_x()+get_image()->get_width() + 5 , get_position_y()+get_image()->get_height() -16);
+                       temp1 = is_other_connection_area( get_position_x() + 16, get_position_y() - 5);

                        break;
                case 1:
                        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) )
-                               return true;
+                       temp0 = is_other_connection_area( get_position_x() -5, get_position_y()+get_image()->get_height()-16);
+                       temp1 = is_other_connection_area( get_position_x()+get_image()->get_width() - 16, get_position_y() - 5);

        }
        }

-       return false;
+       if (temp0 == OUT && temp1 == IN)
+               return (is_connected = true);
+       return is_connected;
+}
+
+ConnectorType Cistern::get_connector_type(int _a, int _b)
+{
+       switch (imgActual) {
+               case 0: if ( (_a <= x+22)&&(_a>=x+10)&&(_b<=y+10)&&(_b > y) )
+                                               return connect_vec[0].type;
+                                       if ( (_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 connect_vec[1].type;
+                                       break;
+               case 1: if ( (_a <= x+image->get_width()-10)&&(_a>=x+image->get_width()-22)&&(_b<=y+10)&&(_b > y) )
+                                               return connect_vec[0].type;
+                                       if ( (_a <= x +10)&&(_a > x)&&(_b<=y+image->get_height()-10)&&(_b >=y+image->get_height()-22) )
+                                               return connect_vec[1].type;
+       }
+       return UNDEF;
+}
+
+void Cistern::set_default_connector()
+{
+       connect_vec[0].type = IN;
+       connect_vec[1].type = OUT;

 }
 }