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 769e94397e855125a6674c955e1ede48fd9b029e..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();
                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)){
        }
        
        if ((event->type == GDK_BUTTON_PRESS) && ( event->button ==2)){


@@ -146,7 +152,7 @@ ConnectorType Conduct::get_connector_type(int _a, int _b)
        CItem *_item;
        switch (imgActual) {
                case 0:
        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 ) {
                                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 ) {


@@ -185,7 +191,7 @@ ConnectorType Conduct::get_connector_type(int _a, int _b)
                        }
                break;
                case 1: 
                        }
                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 ) {
                                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 ) {