X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/6fcc8fcf6b98f413f813904fe0f078d2782fb9d5..2b9e6a32187b73d68b8be741a408bd08c137b256:/Constructor/src/pump.cpp?ds=sidebyside diff --git a/Constructor/src/pump.cpp b/Constructor/src/pump.cpp index cafa7d5..2d7f2a8 100644 --- a/Constructor/src/pump.cpp +++ b/Constructor/src/pump.cpp @@ -57,7 +57,7 @@ bool Pump::on_button_press_event(GdkEventButton *event) workplace->queue_draw(); } else if (detect_click_position((int)event->x, (int)event->y) == OUT ) { if (dynamic_cast(workplace->get_logic_item(CItem::gate_id))) { - if ( !dynamic_cast(workplace->get_logic_item(CItem::gate_id))->get_out_logic_connect()) { + if ( !dynamic_cast(workplace->get_logic_item(CItem::gate_id))->get_in_logic_connect()) { workplace->get_logic_item(CItem::gate_id)->set_in_connected(true); tmp_line.logic_id = CItem::gate_id; tmp_line.store_id = ID; @@ -73,11 +73,10 @@ bool Pump::on_button_press_event(GdkEventButton *event) } CItem::gate_id = -1; } - char f[10]; + char f[20]; Glib::ustring text; - sprintf(f,"%.1f",entrega); - text = name+" Entrega: "; - text += f; + sprintf(f," Entrega:%.1f",entrega); + text = name+f; status_bar->push ( text, 0); } @@ -199,6 +198,7 @@ bool Pump::check_connection() temp = is_other_connection_area( get_position_x() -5, get_position_y() +16, &_item); } if (is_connected = ( temp == IN) ) { + std::cout << "PUMP " << _item->get_id() << std::endl; connect_vec[0].id_dest = _item->get_id(); return is_connected; }