X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/ea7708f0d91b00a54cc5f136a67e9f9bd272329d..2b9e6a32187b73d68b8be741a408bd08c137b256:/Constructor/src/union.cpp?ds=sidebyside diff --git a/Constructor/src/union.cpp b/Constructor/src/union.cpp index 3e98e6d..ca61727 100644 --- a/Constructor/src/union.cpp +++ b/Constructor/src/union.cpp @@ -50,6 +50,12 @@ bool Union::on_button_press_event(GdkEventButton *event) combo_entry->get_entry()->set_text (name); workplace->queue_draw(); WorkPlace::pointed = ID; + 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 )){ @@ -141,6 +147,7 @@ bool Union::check_connection() { CItem * _item0, *_item1, *_item2; ConnectorType temp0, temp1, temp2; + std::cout << get_img_actual() << std::endl; switch (get_img_actual()) { case 0: temp0 = is_other_connection_area( get_position_x() - 5, get_position_y() +16, &_item0); @@ -159,8 +166,8 @@ bool Union::check_connection() break; case 3: temp1 = is_other_connection_area( get_position_x()+16, get_position_y()-5, &_item1); - temp2 = is_other_connection_area( get_position_x()+get_image()->get_width()+5, get_position_y()+get_image()->get_height()/2,& _item0); - temp0 = is_other_connection_area( get_position_x()+16, get_position_y()+get_image()->get_height()+5, &_item1); + temp2 = is_other_connection_area( get_position_x()+get_image()->get_width()+5, get_position_y()+get_image()->get_height()/2,& _item2); + temp0 = is_other_connection_area( get_position_x()+16, get_position_y()+get_image()->get_height()+5, &_item0); } if ( is_union ) { if ( temp0 == OUT && temp1 == OUT && temp2 == IN ) {