Se agrega generacion de XML para dar el estado actual de la planta simulada.

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

diff --git a/Constructor/splitter.cpp b/Constructor/splitter.cpp
index 5e61abd60397e88b97e506e76c74d995cf3788fd..4804849f998c131bb09e2463e5e13bc05c5a4497 100644 (file)
--- a/Constructor/splitter.cpp
+++ b/Constructor/splitter.cpp
@@ -11,6 +11,12 @@ Splitter::Splitter()
        image = imageO;
        set_size_request(image->get_width(), image->get_height());
        property_wnd->set_title("Propiedades del Codo");        
        image = imageO;
        set_size_request(image->get_width(), image->get_height());
        property_wnd->set_title("Propiedades del Codo");        

+       name = "codo";
+       Connector temp;
+       temp.id_dest = -1;
+       temp.type = UNDEF;
+       connect_vec.push_back(temp);
+       connect_vec.push_back(temp);

 }
 
 Splitter::~Splitter()
 }
 
 Splitter::~Splitter()


@@ -95,24 +101,86 @@ bool Splitter::check_connection()
 {
        switch (get_img_actual()) {
                        case 0:
 {
        switch (get_img_actual()) {
                        case 0:

-                               if ( is_other_occupied_area( get_position_x()-10, get_position_y()+10) && 
-                                        is_other_occupied_area( get_position_x()+get_image()->get_width()-10, +get_position_y()+get_image()->get_height() + 10) )
-                                       return true;                            
+                               connect_vec[0].type = is_other_connection_area( get_position_x()-5, get_position_y()+16); //arriba-izquierda h
+                               connect_vec[1].type = is_other_connection_area( get_position_x()+get_image()->get_width()-16, +get_position_y()+get_image()->get_height() + 5);//abajo-derecha v

                                break;  
                        case 1:
                                break;  
                        case 1:

-                               if ( is_other_occupied_area( get_position_x()+get_image()->get_width() - 10, get_position_y() -10) && 
-                                        is_other_occupied_area( get_position_x()-10, get_position_y()+get_image()->get_height()-10) )
-                                       return true;
+                               connect_vec[0].type = is_other_connection_area( get_position_x()+get_image()->get_width() - 16, get_position_y() -5);//arriba-derecha v
+                               connect_vec[1].type = is_other_connection_area( get_position_x()-5, get_position_y()+get_image()->get_height()-16);//abajo-izquierda h

                                break;
                        case 2:
                                break;
                        case 2:

-                               if ( is_other_occupied_area( get_position_x() + 10, get_position_y() -10) &&
-                                        is_other_occupied_area( get_position_x()+get_image()->get_width()+10, get_position_y()+get_image()->get_height()-10) )
-                                       return true;
+                               connect_vec[1].type = is_other_connection_area( get_position_x() + 16, get_position_y() - 5);//arriba-izquierda v
+                               connect_vec[0].type = is_other_connection_area( get_position_x()+get_image()->get_width()+5, get_position_y()+get_image()->get_height() - 16); //abajo-derecha h

                                break;
                        case 3:
                                break;
                        case 3:

-                               if ( is_other_occupied_area( get_position_x()+get_image()->get_width()+10, get_position_y() +10) &&
-                                        is_other_occupied_area( get_position_x() + 10, get_position_y()+get_image()->get_height() + 10) )
-                                       return true;
+                               connect_vec[1].type = is_other_connection_area( get_position_x()+get_image()->get_width()+5, get_position_y() +16);//arriba-derecha h
+                               connect_vec[0].type = is_other_connection_area( get_position_x() + 16, get_position_y()+get_image()->get_height() + 5); //abajo-izquierda v

        }
        }

-       return false;
+       if (connect_vec[0].type != UNDEF && connect_vec[1].type != UNDEF) 
+               return ( is_connected = (connect_vec[0].type == connect_vec[1].type) );
+       else return false;
+}
+
+ConnectorType Splitter::get_connector_type(int _a, int _b)
+{
+       if ( ! is_connected ) {
+               switch (imgActual) {
+                       case 0: 
+                               if ( (_a <= x+10)&&(_a > x) && (_b <=y+22)&&(_b>=y+10) ) // arriba - izquierda h
+                                       return is_other_connection_area (get_position_x()+get_image()->get_width()-16, +get_position_y()+get_image()->get_height() + 5);
+                               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) )//abajo-derecha v
+                                       return is_other_connection_area( get_position_x()-5, get_position_y()+16);
+                               break;
+                       case 1:
+                                if ( (_a <= x+image->get_width()-10)&&(_a >= x+image->get_width()-22) && (_b <=y+10)&&(_b > y) ) //arriba-derecha v
+                                        return  is_other_connection_area( get_position_x()-5, get_position_y()+get_image()->get_height()-16);
+                                if ( (_a <= x+10)&&(_a > x)&&(_b<=y+image->get_height()-10)&&(_b>=y+image->get_height()-22) ) // abajo-izquierda h
+                                        return is_other_connection_area( get_position_x()+get_image()->get_width() - 16, get_position_y() -5);
+                                break;
+                       case 2:
+                               if ( (_a <= x+22)&&(_a >= x+10) && (_b <=y+10)&&(_b > y) ) //arriba-izquierda v
+                                       return is_other_connection_area( get_position_x()+get_image()->get_width()+5, get_position_y()+get_image()->get_height() - 16); 
+                               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) ) // abajo-derecha h
+                                       return is_other_connection_area( get_position_x() + 16, get_position_y() - 5);
+                               break;
+                       case 3:
+                               if ( (_a <= x+image->get_width()-1)&&(_a >= x+image->get_width()-10) && (_b <=y+22)&&(_b>=y+10) ) //arriba-derecha h
+                                       return is_other_connection_area( get_position_x() + 16, get_position_y()+get_image()->get_height() + 5);
+                               if ( (_a <= x+22)&&(_a>=x+10)&&(_b<=y+image->get_height()-1)&&(_b>=y+image->get_height()-10) ) // abajo-izquierda v
+                                       return is_other_connection_area( get_position_x()+get_image()->get_width()+5, get_position_y() +16);
+               }
+       } else {
+               switch (imgActual) {
+                       case 0: 
+                               if ( (_a <= x+10)&&(_a > x) && (_b <=y+22)&&(_b>=y+10) ) // arriba - izquierda h
+                                       return connect_vec[0].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) )//abajo-derecha v
+                                       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) ) //arriba-derecha v
+                                        return  connect_vec[0].type;
+                                if ( (_a <= x+10)&&(_a > x)&&(_b<=y+image->get_height()-10)&&(_b>=y+image->get_height()-22) ) // abajo-izquierda h
+                                        return connect_vec[1].type;
+                                break;
+                       case 2:
+                               if ( (_a <= x+22)&&(_a >= x+10) && (_b <=y+10)&&(_b > y) ) //arriba-izquierda v
+                                       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) ) // abajo-derecha h
+                                       return connect_vec[0].type;
+                               break;
+                       case 3:
+                               if ( (_a <= x+image->get_width()-1)&&(_a >= x+image->get_width()-10) && (_b <=y+22)&&(_b>=y+10) ) //arriba-derecha h
+                                       return connect_vec[1].type;
+                               if ( (_a <= x+22)&&(_a>=x+10)&&(_b<=y+image->get_height()-1)&&(_b>=y+image->get_height()-10) ) // abajo-izquierda v
+                                       return connect_vec[0].type;
+               }
+       }
+       return UNDEF;
+}      
+
+void Splitter::set_default_connector()
+{
+       connect_vec[0].type = UNDEF;
+       connect_vec[1].type = UNDEF;

 }
 }