X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/5f3d1517e8f6cd322669c60257ca28400e0399ab..08b5e1548c364c96cdd2ce4661f886d8ee24799a:/Constructor/src/cistern.cpp diff --git a/Constructor/src/cistern.cpp b/Constructor/src/cistern.cpp index 147cc5b..7fd6108 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,10 @@ Cistern::Cistern(int orientacion) in_y = y+16; out_x = x + 48; out_y = y + 64; + capacidad = 100.0; + contenido_inicial = 0; + flotante_inf = 20; + flotante_sup = 80; 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 +37,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,21 +49,55 @@ bool Cistern::on_button_press_event(GdkEventButton *event) GdkEventExpose e; t_line tmp_line; if ((event->type == GDK_BUTTON_PRESS) && ( event->button == 1)) { - combo_entry->set_text(name); WorkPlace::pointed = ID; + list_pointed->push_back(name); + combo_entry->set_popdown_strings(*list_pointed); + combo_entry->get_entry()->set_text (name); 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_in_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)){ @@ -94,6 +133,8 @@ bool Cistern::on_button_press_event(GdkEventButton *event) cistern_pty_wnd->spin_capacidad->set_value( capacidad ); cistern_pty_wnd->spin_inicial->set_value( contenido_inicial ); cistern_pty_wnd->txt_cistern_name->set_text( name ); + cistern_pty_wnd->spin_flot_inf->set_value ( flotante_inf ); + cistern_pty_wnd->spin_flot_sup->set_value ( flotante_sup ); cistern_pty_wnd->show(); } workplace->queue_draw(); @@ -131,6 +172,17 @@ void Cistern::set_contenido_inicial(double _ini) contenido_inicial = _ini; } + +void Cistern::set_flotante_sup(double _s) +{ + flotante_sup = _s; +} + +void Cistern::set_flotante_inf(double _i) +{ + flotante_inf = _i; +} + double Cistern::get_capacidad() { return capacidad; @@ -141,6 +193,16 @@ double Cistern::get_contenido_inicial() return contenido_inicial; } +double Cistern::get_flotante_sup() +{ + return flotante_sup; +} + +double Cistern::get_flotante_inf() +{ + return flotante_inf; +} + Gdk::Color Cistern::get_liquid_color() { return liquid_color; @@ -148,7 +210,7 @@ Gdk::Color Cistern::get_liquid_color() void Cistern::save(FILE *archivo) { - char c_id[50], c_cap[50], c_x[50], c_y[50], c_img[50], c_ini[50], c_red[50], c_green[50], c_blue[50]; + char c_id[50], c_cap[50], c_x[50], c_y[50], c_img[50], c_ini[50], c_red[50], c_green[50], c_blue[50], c_float_s[50], c_float_i[50]; Glib::ustring con0, con1; con0 = "\t\t\t"+get_other_name(connect_vec[0].id_dest)+"\n"; con1 = "\t\t\t"+get_other_name(connect_vec[1].id_dest)+"\n"; @@ -160,7 +222,9 @@ void Cistern::save(FILE *archivo) sprintf(c_id,"%d",ID); sprintf(c_cap,"\t\t%.2f\n", capacidad); sprintf(c_ini,"\t\t%.2f\n", contenido_inicial); - sprintf(c_img,"\t\t%d\n",imgActual); + sprintf(c_float_s,"\t\t%.0f\n",flotante_sup); + sprintf(c_float_i,"\t\t\t%.0f\n",flotante_inf); + sprintf(c_img,"\t\t\t%d\n",imgActual); Glib::ustring dato; dato = "\t\n"; + dato += "\t\t\n"; + dato += c_float_s; + dato += c_float_i; + dato += "\t\t\n"; dato += c_img; dato += c_x; dato += c_y; @@ -237,7 +305,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) ) @@ -258,15 +325,26 @@ void Cistern::update_logic_position() { switch (imgActual) { case 1: - in_x = x + image->get_width(); + in_x = x + image->get_width()-5; in_y = y + 16; out_x = x+16; out_y = y + image->get_height(); break; case 0: - in_x = x; + in_x = x+5; in_y = y+16; out_x = x + image->get_width() -16; 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(); + } +}