Sigo con la docu que empezo Luca, y castellanice un poco los menues del constructor

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

diff --git a/Constructor/src/conduct.cpp b/Constructor/src/conduct.cpp
index 6cad0bf1a1854a60704b2ac862155dcead518d33..70782c5b559d48a3c59102ca82faf69d2cea56cb 100644 (file)
--- a/Constructor/src/conduct.cpp
+++ b/Constructor/src/conduct.cpp
@@ -37,6 +37,12 @@ bool Conduct::on_button_press_event(GdkEventButton *event)
                WorkPlace::pointed = ID;
                combo_entry->get_entry()->set_text (name);
                workplace->queue_draw();
+               char f[10];
+               Glib::ustring text;
+               sprintf(f,"%.1f",caudal_max);
+               text = name+"  Caudal Maximo: ";
+               text += f;
+               status_bar->push ( text, 0);
        }
        
        if ((event->type == GDK_BUTTON_PRESS) && ( event->button ==2)){
@@ -115,28 +121,27 @@ void Conduct::save(FILE *archivo)
 
 bool Conduct::check_connection()
 {
-       ConnectorType aux;
+       ConnectorType aux, aux1, aux2;
        CItem *_item0, *_item1;
-       if ( is_connected )
-                                       return is_connected;
        switch (get_img_actual()) {
-                       case 0:
-                               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);
+               case 0:
+                       aux1 = is_other_connection_area( get_position_x()+16, get_position_y()-5, &_item0);
+                       aux2 = is_other_connection_area( get_position_x()+16, get_position_y()+get_image()->get_height() +5,& _item1);
+               break;          
+               case 1:
+                       aux1 = is_other_connection_area( get_position_x()-5, get_position_y()+16, &_item0);
+                       aux2 = 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;
+       if ( (aux1 != UNDEF) && (aux2 != UNDEF) ) {
+               if (!is_connected) {
+                       connect_vec[0].type = aux2;
+                       connect_vec[1].type = aux1;
+               }
                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;
+       return is_connected = false;
 }
 
 /*si no estoy conectado pregunto por el del otro lado, y ahi puedo setear los dos
@@ -147,21 +152,22 @@ ConnectorType Conduct::get_connector_type(int _a, int _b)
        CItem *_item;
        switch (imgActual) {
                case 0:
-                       if ( (_a <= x+image->get_width()-10 )&&(_a >= x + 10) && (_b <= y+10) &&(_b > 0 ) ){  //arriba
+                       if ( (_a <= x+image->get_width()-10 )&&(_a >= x + 10) && (_b <= y+10) &&(_b > y ) ){  //arriba
                                if ( is_connected ) return connect_vec[0].type;                 
                                connect_vec[1].type = is_other_connection_area(get_position_x()+16, get_position_y()+get_image()->get_height() +5, &_item); //pregunto que hay abajo
                                switch ( connect_vec[1].type ) {
                                        case IN: 
-                                       connect_vec[1] = OUT;
-                                       connect_vec[0] = IN;            
+                                       connect_vec[1].type = OUT;
+                                       connect_vec[0].type = IN;               
                                        break;
                                        case OUT:
-                                       connect_vec[1] = IN;
-                                       connect_vec[0] = OUT;           
+                                       connect_vec[1].type = IN;
+                                       connect_vec[0].type = OUT;              
                                        break;
                                        case UNDEF:
                                        return UNDEF;
                                }
+                               is_connected = true;
                                return connect_vec[0].type;
                        }
                        
@@ -170,31 +176,32 @@ ConnectorType Conduct::get_connector_type(int _a, int _b)
                                connect_vec[0].type = is_other_connection_area( get_position_x()+16, get_position_y()-5,& _item);//pregunto que hay arriba.
                                switch ( connect_vec[0].type ) {
                                        case IN: 
-                                       connect_vec[0] = OUT;
-                                       connect_vec[1] = IN;            
+                                       connect_vec[0].type = OUT;
+                                       connect_vec[1].type = IN;               
                                        break;
                                        case OUT:
-                                       connect_vec[0] = IN;
-                                       connect_vec[1] = OUT;           
+                                       connect_vec[0].type = IN;
+                                       connect_vec[1].type = OUT;              
                                        break;
                                        case UNDEF:
                                        return UNDEF;
                                }
+                               is_connected = true;
                                return connect_vec[1].type;
                        }
                break;
                case 1: 
-                       if ((_a <= x+10 )&&(_a > 0) && (_b <= y+image->get_height()-10) &&(_b >= y+10 )){ //izquierda
+                       if ((_a <= x+10 )&&(_a > x) && (_b <= y+image->get_height()-10) &&(_b >= y+10 )){ //izquierda
                                if ( is_connected ) return connect_vec[0].type;                 
                                connect_vec[1].type = is_other_connection_area(get_position_x()+get_image()->get_width()+5, get_position_y()+16, &_item);//pregunto por la derecha
                                switch ( connect_vec[1].type ) {
                                        case IN: 
-                                       connect_vec[1] = OUT;
-                                       connect_vec[0] = IN;            
+                                       connect_vec[1].type = OUT;
+                                       connect_vec[0].type = IN;               
                                        break;
                                        case OUT:
-                                       connect_vec[1] = IN;
-                                       connect_vec[0] = OUT;           
+                                       connect_vec[1].type = IN;
+                                       connect_vec[0].type = OUT;              
                                        break;
                                        case UNDEF:
                                        return UNDEF;
@@ -207,12 +214,12 @@ ConnectorType Conduct::get_connector_type(int _a, int _b)
                                connect_vec[0].type =   is_other_connection_area(get_position_x()-5, get_position_y()+16, &_item); //pregunto por la izquierda. 
                                switch ( connect_vec[0].type ) {
                                        case IN: 
-                                       connect_vec[0] = OUT;
-                                       connect_vec[1] = IN;            
+                                       connect_vec[0].type = OUT;
+                                       connect_vec[1].type = IN;               
                                        break;
                                        case OUT:
-                                       connect_vec[0] = IN;
-                                       connect_vec[1] = OUT;           
+                                       connect_vec[0].type = IN;
+                                       connect_vec[1].type = OUT;              
                                        break;
                                        case UNDEF:
                                        return UNDEF;