Se corrige un bug.

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

diff --git a/Constructor/union.cpp b/Constructor/union.cpp
index d0955bbd2e31c565b06e73b216a46fe99768e923..1311bd509c7336bb479da53d58ae1de6d140a7f1 100644 (file)
--- a/Constructor/union.cpp
+++ b/Constructor/union.cpp
@@ -15,6 +15,13 @@ Union::Union()
        property_wnd->rd_btn_union->property_visible() = true;
        property_wnd->lb_type->property_visible() = true;
        name = "union";
        property_wnd->rd_btn_union->property_visible() = true;
        property_wnd->lb_type->property_visible() = true;
        name = "union";

+       Connector temp;
+       temp.id_dest = -1;
+       temp.type = IN;
+       connect_vec.push_back(temp); //izquierda
+       connect_vec.push_back(temp); //derecha
+       temp.type = OUT;
+       connect_vec.push_back(temp); //medio

 }
 
 Union::~Union()
 }
 
 Union::~Union()


@@ -103,53 +110,81 @@ void Union::save(FILE *archivo)
 
 bool Union::check_connection()
 {
 
 bool Union::check_connection()
 {

+       ConnectorType temp0, temp1, temp2;

        switch (get_img_actual()) {
                        case 0:
        switch (get_img_actual()) {
                        case 0:

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

                                break;
                        case 1:
                                break;
                        case 1:

-                               if ( is_other_connection_area( get_position_x()-5, get_position_y()+get_image()->get_height()/2) &&
-                                        is_other_connection_area( get_position_x()+get_image()->get_width()-16, get_position_y()-5) &&
-                                        is_other_connection_area( get_position_x()+get_image()->get_width()-16, get_position_y()+get_image()->get_height()+5) )
-                                       return true;                            
+                               temp2 = is_other_connection_area( get_position_x()-5, get_position_y()+get_image()->get_height()/2);
+                               temp0 = is_other_connection_area( get_position_x()+get_image()->get_width()-16, get_position_y()-5);
+                               temp1 = is_other_connection_area( get_position_x()+get_image()->get_width()-16, get_position_y()+get_image()->get_height()+5);

                                break;
                        case 2:
                                break;
                        case 2:

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

                                break;
                        case 3:
                                break;
                        case 3:

-                               if ( is_other_connection_area( get_position_x()+16, get_position_y()-5) &&
-                                        is_other_connection_area( get_position_x()+get_image()->get_width()+5, get_position_y()+get_image()->get_height()/2) &&
-                                        is_other_connection_area( get_position_x()+16, get_position_y()+get_image()->get_height()+5) )
-                                       return true;
+                               temp1 = is_other_connection_area( get_position_x()+16, get_position_y()-5);
+                               temp2 = is_other_connection_area( get_position_x()+get_image()->get_width()+5, get_position_y()+get_image()->get_height()/2);
+                               temp0 = is_other_connection_area( get_position_x()+16, get_position_y()+get_image()->get_height()+5);

        }
        }

-       return false;   
+       if ( is_union ) {
+               if ( temp0 == OUT && temp1 == OUT && temp2 == IN ) 
+                       return (is_connected = true);
+       } else {
+               if ( temp0 == IN && temp1 == IN && temp2 == OUT )
+                       return (is_connected = true);
+       }
+       return false;

 }
 
 }
 

-bool Union::is_connection_area(int _a, int _b)
+ConnectorType Union::get_connector_type(int _a, int _b)

 {
        switch ( imgActual) {
 {
        switch ( imgActual) {

-               case 0: if ( ((_a <= x+10) && (_a > x+1) && (_b<= y + 22) && (_b >= y+10)) ||
-                                                 ((_a <= x+image->get_width()-1) && (_a >= x+image->get_width()-10)&&(_b <= y+22) && (_b >= y+10)) ||
-                                                 ((_a <= x+image->get_width()/2 + 5)&&( _a>= x+image->get_width()/2 - 5) && (_b<=y+image->get_height()-1)&&(_b >= y+image->get_height()-10)) )
-                                               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()/2+5 ) && (_b >= y+image->get_height()/2-5)) ||
-                                                 ((_a <= x+image->get_width() - 10)&&( _a>= x+image->get_width()-22) && (_b<=y+image->get_height()-1)&&(_b >= y+image->get_height()-10)) )
-                                               return true;
-               case 2: if ( ((_a <= x+10) && (_a > x) && (_b<= y+image->get_height()-10) && (_b >= y+image->get_height()-22)) ||
-                                                 ((_a <= x+image->get_width()-1) && (_a >= x+image->get_width()-10)&&(_b <= y+image->get_height()-10) && (_b >= y+image->get_height()-22)) ||
-                                                 ((_a <= x+image->get_width()/2 + 5)&&( _a>= x+image->get_width()/2 - 5) && (_b<=y+10)&&(_b > y)) )
-                                               return true;
-               case 3: if ( ((_a <= x+22) && (_a >= x+10) && (_b<= y + 10) && (_b > y )) ||
-                                                 ((_a <= x+22) && (_a >= x+10 )&&(_b <= y+image->get_height()-1 ) && (_b >= y+image->get_height()-10)) ||
-                                                 ((_a <= x+image->get_width() -1)&&( _a>= x+image->get_width()-10) && (_b<=y+image->get_height()/2+5)&&(_b >= y+image->get_height()/2-5)) )
-                                               return true;
+               case 0: if ((_a <= x+10) && (_a > x+1) && (_b<= y + 22) && (_b >= y+10))
+                                               return connect_vec[0].type;
+                                       if ((_a <= x+image->get_width()-1) && (_a >= x+image->get_width()-10)&&(_b <= y+22) && (_b >= y+10))
+                                               return connect_vec[1].type;
+                                       if ((_a <= x+image->get_width()/2 + 5)&&( _a>= x+image->get_width()/2 - 5) && (_b<=y+image->get_height()-1)&&(_b >= y+image->get_height()-10)) 
+                                               return connect_vec[2].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()/2+5 ) && (_b >= y+image->get_height()/2-5))
+                                               return connect_vec[2].type;
+                                       if ((_a <= x+image->get_width() - 10)&&( _a>= x+image->get_width()-22) && (_b<=y+image->get_height()-1)&&(_b >= y+image->get_height()-10))
+                                               return connect_vec[1].type;
+                                       break;
+               case 2: if ((_a <= x+10) && (_a > x) && (_b<= y+image->get_height()-10) && (_b >= y+image->get_height()-22))
+                                               return connect_vec[1].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[0].type;
+                                       if ((_a <= x+image->get_width()/2 + 5)&&( _a>= x+image->get_width()/2 - 5) && (_b<=y+10)&&(_b > y))
+                                               return connect_vec[2].type;
+                                       break;
+               case 3: if ((_a <= x+22) && (_a >= x+10) && (_b<= y + 10) && (_b > y ))
+                                               return connect_vec[1].type;
+                                       if ((_a <= x+22) && (_a >= x+10 )&&(_b <= y+image->get_height()-1 ) && (_b >= y+image->get_height()-10))
+                                               return connect_vec[0].type;
+                                       if ((_a <= x+image->get_width() -1)&&( _a>= x+image->get_width()-10) && (_b<=y+image->get_height()/2+5)&&(_b >= y+image->get_height()/2-5))
+                                               return connect_vec[2].type;
+       }
+       return UNDEF;
+}
+
+void Union::set_default_connector()
+{
+       if (is_union) {
+               connect_vec[0].type = IN;
+               connect_vec[1].type = IN;
+               connect_vec[2].type = OUT;
+       } else {
+               connect_vec[0].type = OUT;
+               connect_vec[1].type = OUT;
+               connect_vec[2].type = IN;

        }
        }

-       return false;

 }
 }