-Se conectan como trompada!!!!!

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

diff --git a/Constructor/conduct.cpp b/Constructor/conduct.cpp
index 2a582fb9f82fc8c432276bbc97063a4aa284c74c..2493f32a24fc3506ca94d14c9e1f7353fd80e696 100644 (file)
--- a/Constructor/conduct.cpp
+++ b/Constructor/conduct.cpp
@@ -9,6 +9,12 @@ Conduct::Conduct()
        image = imageN;
        set_size_request(image->get_width(), image->get_height());
        property_wnd->set_title("Propiedades del Tubo");
        image = imageN;
        set_size_request(image->get_width(), image->get_height());
        property_wnd->set_title("Propiedades del Tubo");

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

 }
 
 Conduct::~Conduct()
 }
 
 Conduct::~Conduct()


@@ -69,6 +75,15 @@ void Conduct::on_menu_popup_propiedades()
 void Conduct::save(FILE *archivo)
 {
        char c_id[50], c_caudal[50], c_x[50], c_y[50], c_img[50];
 void Conduct::save(FILE *archivo)
 {
        char c_id[50], c_caudal[50], c_x[50], c_y[50], c_img[50];

+       Glib::ustring  con0, con1;
+       if (connect_vec[0].type == IN)
+               con0 = "\t\t\t<entrada>"+get_other_name(connect_vec[0].id_dest)+"</entrada>\n";
+       else
+               con0 = "\t\t\t<salida>"+get_other_name(connect_vec[0].id_dest)+"</salida>\n";
+       if (connect_vec[1].type == IN) 
+               con1 = "\t\t\t<entrada>"+get_other_name(connect_vec[1].id_dest)+"</entrada>\n";
+       else
+               con1 = "\t\t\t<salida>"+get_other_name(connect_vec[1].id_dest)+"</salida>\n";

        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);


@@ -79,6 +94,7 @@ void Conduct::save(FILE *archivo)
        dato += c_id;
        dato += "\">\n";
        dato += c_caudal;
        dato += c_id;
        dato += "\">\n";
        dato += c_caudal;

+       dato += "\t\t<conector>\n"+con0 + con1+"\t\t</conector>\n";     

        dato += c_img;
        dato += c_x; 
        dato += c_y;
        dato += c_img;
        dato += c_x; 
        dato += c_y;


@@ -88,16 +104,68 @@ void Conduct::save(FILE *archivo)
 
 bool Conduct::check_connection()
 {
 
 bool Conduct::check_connection()
 {

+       ConnectorType aux;
+       CItem *_item0, *_item1;

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

-                               if ( is_other_occupied_area( get_position_x()+get_image()->get_width()/2, get_position_y()+get_image()->get_height()+10) && 
-                                        is_other_occupied_area( get_position_x()+get_image()->get_width()/2, get_position_y() - 10) )
-                                       return true;                            
+                               connect_vec[0].type = is_other_connection_area( get_position_x()+16, get_position_y()-5, &_item0);
+                               connect_vec[1].type = is_other_connection_area( get_position_x()+16, get_position_y()+get_image()->get_height() +5,& _item1);
+                       break;          
+                       case 1:
+                               connect_vec[0].type = is_other_connection_area( get_position_x()-5, get_position_y()+16, &_item0);
+                               connect_vec[1].type = is_other_connection_area( get_position_x()+get_image()->get_width()+5, get_position_y()+16, &_item1);
+       }
+       if ( connect_vec[0].type != UNDEF && connect_vec[1].type != UNDEF ) {
+               aux = connect_vec[0].type; 
+               connect_vec[0].type = connect_vec[1].type;
+               connect_vec[1].type = aux;
+               connect_vec[0].id_dest = _item0->get_id();
+               connect_vec[1].id_dest = _item1->get_id();
+               return ( is_connected = (connect_vec[0].type != connect_vec[1].type) );
+       }
+       else return is_connected;
+}
+
+ConnectorType Conduct::get_connector_type(int _a, int _b)
+{ 
+       CItem *_item;
+       if ( ! is_connected ) {
+               switch (imgActual) {
+                       case 0:
+                               if ( (_a <= x+image->get_width()-10 )&&(_a >= x + 10) && (_b <= y+10) &&(_b > 0 ) )  //arriba
+                                       return is_other_connection_area(get_position_x()+16, get_position_y()+get_image()->get_height() +5, &_item); //pregunto que hay abajo
+                               if ((_a <= x+22 )&&(_a >= x + 10) && (_b <= y+image->get_height()-1) &&(_b >= y+image->get_height()-10 ))//abajo
+                                       return is_other_connection_area( get_position_x()+16, get_position_y()-5,& _item);//pregunto que hay arriba.
+                               break;
+                       case 1: 
+                               if ((_a <= x+10 )&&(_a > 0) && (_b <= y+image->get_height()-10) &&(_b >= y+10 )) //izquierda
+                                       return is_other_connection_area(get_position_x()+get_image()->get_width()+5, get_position_y()+16, &_item);//pregunto por la derecha
+                               if ((_a <= x+image->get_width()-1)&&(_a >= x+image->get_width()-10) && (_b <= y+image->get_height()-10) &&(_b >= y +10 )) //derecha
+                                       return is_other_connection_area(get_position_x()-5, get_position_y()+16, &_item); //pregunto por la izquierda.
+               }
+       } else {
+               switch (imgActual) {
+                       case 0: 
+                               if ( (_a <= x+image->get_width()-10 )&&(_a >= x + 10) && (_b <= y+10) &&(_b > 0 ) ) //arriba
+                                       return connect_vec[0].type;
+                               if ((_a <= x+22 )&&(_a >= x + 10) && (_b <= y+image->get_height()-1) &&(_b >= y+image->get_height()-10 )) //abajo
+                                       return connect_vec[1].type;

                                break;
                        case 1:
                                break;
                        case 1:

-                               if ( is_other_occupied_area( get_position_x()-10, get_position_y()+get_image()->get_height()/2) && 
-                                        is_other_occupied_area( get_position_x()+get_image()->get_width()+10, get_position_y()+get_image()->get_height()/2) )
-                               return true;
+                               if ((_a <= x+10 )&&(_a > 0) && (_b <= y+image->get_height()-10) &&(_b >= y+10 )) //izquierda
+                                       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 +10 )) //derecha
+                                       return connect_vec[1].type;
+               }

        }
        }

-       return false;
+       return UNDEF;
+}
+/*si no estoy conectado pregunto por el del otro lado, y ahi puedo setear los dos
+ *si ya estoy devuelvo.
+*/
+
+void Conduct::set_default_connector()
+{
+       connect_vec[0].type = UNDEF;
+       connect_vec[1].type = UNDEF;

 }
 }