X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/67143e098c00b0ee414bde39a78441d8e11fed8b..7f099f6374e9606735fb9766b51b5e86d83de815:/Constructor/cistern.cpp diff --git a/Constructor/cistern.cpp b/Constructor/cistern.cpp index 1495443..71d8cce 100644 --- a/Constructor/cistern.cpp +++ b/Constructor/cistern.cpp @@ -1,24 +1,20 @@ #include "cistern.h" +#include "cisternptywnd.h" Cistern::Cistern() { - caudal = 56; - fluido_max = 23; imageE = Gdk::Pixbuf::create_from_file("tanque_e.png"); imageO = Gdk::Pixbuf::create_from_file("tanque_o.png"); null = Gdk::Pixbuf::create_from_file("tanque_null.png"); imgActual = 0; image = imageE; set_size_request(image->get_width(), image->get_height()); - - Glib::RefPtr ref; - try { - ref = Gnome::Glade::Xml::create("constructor.glade", "cistern_pty_wnd"); - } - catch(const Gnome::Glade::XmlError &ex) { - std::cerr << ex.what() << std::endl; - } + + Glib::RefPtr ref = Gnome::Glade::Xml::create("constructor.glade", "cistern_pty_wnd"); ref->get_widget_derived("cistern_pty_wnd",cistern_pty_wnd); + cistern_pty_wnd->cistern = this; + cistern_pty_wnd->set_title("Propiedades del Tanque"); + name = "tanque"; } Cistern::~Cistern() @@ -27,6 +23,9 @@ Cistern::~Cistern() bool Cistern::on_button_press_event(GdkEventButton *event) { + if ((event->type == GDK_BUTTON_PRESS) && ( event->button == 1)) + combo_entry->set_text(name); + if ((event->type == GDK_BUTTON_PRESS) && ( event->button ==2)){ image = null; image->render_to_drawable(get_window(),get_style()->get_black_gc(),0,0,0,0,image->get_width(),image->get_height(),Gdk::RGB_DITHER_NONE,0,0); @@ -49,8 +48,9 @@ bool Cistern::on_button_press_event(GdkEventButton *event) } if ((event->type == GDK_2BUTTON_PRESS) && (event->button ==1)){ - cistern_pty_wnd->spin_caudal->set_value((double)x); - cistern_pty_wnd->spin_fluido_max->set_value((double)y); + 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->show(); } return true; @@ -66,11 +66,66 @@ void Cistern::on_menu_popup_rotar() void Cistern::on_menu_popup_propiedades() { -// cistern_pty_wnd->spin_caudal->set_value(caudal); -// cistern_pty_wnd->spin_fluido_max->set_value(fluido_max); - std::cout<< "posicion = "<< x <<" "<< y <%d\n",x); + sprintf(c_y,"\t\t%d\n",y); + 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); + Glib::ustring dato; + dato = "\t\n"; + dato += c_cap; + dato += c_ini; + dato += c_img; + dato += c_x; + dato += c_y; + dato += "\t\n"; + fprintf(archivo,dato.c_str()); +} + +bool Cistern::check_connection() +{ + switch (get_img_actual()) { + case 0: + if ( is_other_occupied_area( get_position_x()+get_image()->get_width()+10 , get_position_y()+get_image()->get_height() -10) && + is_other_occupied_area( get_position_x() + 10, get_position_y() - 10) ) + return true; + break; + case 1: + if ( is_other_occupied_area( get_position_x() -10, get_position_y()+get_image()->get_height()-10) && + is_other_occupied_area( get_position_x()+get_image()->get_width() - 10, get_position_y() - 10) ) + return true; + } + return false; +}