X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/ea7708f0d91b00a54cc5f136a67e9f9bd272329d..4ddd90e71988f16c5ea79f5de86a9fcb63973ded:/Constructor/src/cistern.cpp?ds=sidebyside diff --git a/Constructor/src/cistern.cpp b/Constructor/src/cistern.cpp index f58df18..bdc2190 100644 --- a/Constructor/src/cistern.cpp +++ b/Constructor/src/cistern.cpp @@ -1,5 +1,6 @@ #include "cistern.h" #include "cisternptywnd.h" +#include "not.h" Cistern::Cistern(int orientacion) { @@ -7,6 +8,8 @@ Cistern::Cistern(int orientacion) in_y = y+16; out_x = x + 48; out_y = y + 64; + capacidad = 100.0; + contenido_inicial = 0; imageE = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/tanque_e.png"); imageO = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/tanque_o.png"); null = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/tanque_null.png"); @@ -32,7 +35,7 @@ Cistern::Cistern(int orientacion) temp.type = IN; connect_vec.push_back(temp); // entrada arriba temp.type = OUT; - connect_vec.push_back(temp); // salida abajo + connect_vec.push_back(temp); // entrada abajo } Cistern::~Cistern() @@ -44,23 +47,55 @@ bool Cistern::on_button_press_event(GdkEventButton *event) GdkEventExpose e; t_line tmp_line; if ((event->type == GDK_BUTTON_PRESS) && ( event->button == 1)) { + WorkPlace::pointed = ID; list_pointed->push_back(name); combo_entry->set_popdown_strings(*list_pointed); combo_entry->get_entry()->set_text (name); - WorkPlace::pointed = ID; if (CItem::logic_connect && CItem::gate_id != -1) { - if ( detect_click_position((int)event->x, (int)event->y) == IN ){ - tmp_line.logic_id = workplace->get_logic_item(CItem::gate_id)->get_id(); - tmp_line.store_id = ID; - workplace->lista_lineas_in.push_back(tmp_line); - workplace->queue_draw(); - } else if (detect_click_position((int)event->x, (int)event->y) == OUT) { - tmp_line.logic_id = workplace->get_logic_item(CItem::gate_id)->get_id(); - tmp_line.store_id = ID; - workplace->lista_lineas_out.push_back(tmp_line); - workplace->queue_draw(); + if ( detect_click_position((int)event->x, (int)event->y) == IN){ + if (dynamic_cast(workplace->get_logic_item(CItem::gate_id))) { + if ( !dynamic_cast(workplace->get_logic_item(CItem::gate_id))->get_out_logic_connect()) { + workplace->get_logic_item(CItem::gate_id)->set_in_connected(true); + tmp_line.logic_id = CItem::gate_id; + tmp_line.cistern_out1 = true; + tmp_line.store_id = ID; + workplace->lista_lineas_out.push_back(tmp_line); + workplace->queue_draw(); + } + } else { + tmp_line.logic_id = CItem::gate_id; + tmp_line.cistern_out1 = true; + tmp_line.store_id = ID; + workplace->lista_lineas_out.push_back(tmp_line); + 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_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; + tmp_line.cistern_out1 = false; + workplace->lista_lineas_out.push_back(tmp_line); + workplace->queue_draw(); + } + } else { + tmp_line.logic_id = CItem::gate_id; + tmp_line.store_id = ID; + tmp_line.cistern_out1 = false; + workplace->lista_lineas_out.push_back(tmp_line); + workplace->queue_draw(); + } } + CItem::gate_id = -1; } + char f[20], g[25]; + Glib::ustring text; + sprintf(f," Capacidad: %.1f ",capacidad); + sprintf(g,"Contenido Inicial: %.1f",contenido_inicial); + text = name+ f; + text += g; + status_bar->push ( text, 0); } if ((event->type == GDK_BUTTON_PRESS) && ( event->button ==2)){ @@ -239,7 +274,6 @@ void Cistern::get_out_logic_connect_position(int& _a, int& _b) ConnectorType Cistern::detect_click_position(int _a, int _b) { - //VER DONDE CAEN LOS CLICKS!!!!!!!!!!!!!! SI ES CON RESPECTO AL WORKPLACE O AL ITEM!!! switch(imgActual) { case 0: if ( (_a<=32) &&(_a>=0)&&(_b<=32)&&(_b>=0) ) @@ -272,3 +306,14 @@ void Cistern::update_logic_position() out_y = y + image->get_height(); } } + +void Cistern::draw_connectors() +{ + if ( in_x != -1 ) { + Glib::RefPtr window = get_window(); + gc->set_foreground(blue); + window->draw_rectangle(gc, 1, in_x-5-x, in_y-y, 10, 10); + window->draw_rectangle(gc, 1, out_x-5-x, out_y-y-10, 10, 10); + queue_draw(); + } +}