Se corrige un bug.

[z.facultad/75.42/plaqui.git] / Constructor / cistern.cpp

diff --git a/Constructor/cistern.cpp b/Constructor/cistern.cpp
index 31bd36745dee3b05dfc0ff997ac835b155c9ff83..fd49a6eb4d0c88b9c71b5603f0c4bab01ef3cf26 100644 (file)
--- a/Constructor/cistern.cpp
+++ b/Constructor/cistern.cpp
@@ -1,13 +1,27 @@
 #include "cistern.h"
 #include "cistern.h"

+#include "cisternptywnd.h"

 
 Cistern::Cistern()
 {
        imageE = Gdk::Pixbuf::create_from_file("tanque_e.png");
        imageO = Gdk::Pixbuf::create_from_file("tanque_o.png");
 
 Cistern::Cistern()
 {
        imageE = Gdk::Pixbuf::create_from_file("tanque_e.png");
        imageO = Gdk::Pixbuf::create_from_file("tanque_o.png");

-       null = Gdk::Pixbuf::create_from_file("null.png");
+       null = Gdk::Pixbuf::create_from_file("tanque_null.png");

        imgActual = 0;
        image = imageE;
        set_size_request(image->get_width(), image->get_height());
        imgActual = 0;
        image = imageE;
        set_size_request(image->get_width(), image->get_height());

+
+       Glib::RefPtr<Gnome::Glade::Xml> 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";
+       
+       Connector temp;
+       temp.id_dest = -1;
+       temp.type = IN;
+       connect_vec.push_back(temp); // entrada arriba
+       temp.type = OUT;
+       connect_vec.push_back(temp); // salida abajo

 }
 
 Cistern::~Cistern()
 }
 
 Cistern::~Cistern()


@@ -16,7 +30,9 @@ Cistern::~Cistern()
 
 bool Cistern::on_button_press_event(GdkEventButton *event)
 {
 
 bool Cistern::on_button_press_event(GdkEventButton *event)
 {

-       int w, h;
+       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);
        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);


@@ -29,14 +45,21 @@ bool Cistern::on_button_press_event(GdkEventButton *event)
                                imgActual = 0;
                                image = imageE;                 
                }
                                imgActual = 0;
                                image = imageE;                 
                }

-               get_size_request(w, h);
-               set_size_request(h, w);         
+               set_size_request(image->get_width(),image->get_height());

                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);
        }
                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);
        }

+       

        if ((event->type == GDK_BUTTON_PRESS) && ( event->button == 3)){
                menu_popup.popup(event->button, event->time);
                 return true; //It has been handled.
        }
        if ((event->type == GDK_BUTTON_PRESS) && ( event->button == 3)){
                menu_popup.popup(event->button, event->time);
                 return true; //It has been handled.
        }

+       
+       if ((event->type == GDK_2BUTTON_PRESS) && (event->button ==1)){
+               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;
 }
 
        return true;
 }
 


@@ -47,3 +70,110 @@ void Cistern::on_menu_popup_rotar()
                event.button = 2;
        Cistern::on_button_press_event(&event);
 }
                event.button = 2;
        Cistern::on_button_press_event(&event);
 }

+
+void Cistern::on_menu_popup_propiedades()
+{
+       GdkEventButton event; 
+               event.type = GDK_2BUTTON_PRESS;
+               event.button = 1;
+       Cistern::on_button_press_event(&event);
+}
+
+void Cistern::set_capacidad(double _cap)
+{
+       capacidad = _cap;
+}
+
+void Cistern::set_liquid_color(Gdk::Color _color)
+{
+       liquid_color = _color;
+}
+
+void Cistern::set_contenido_inicial(double _ini)
+{
+       contenido_inicial = _ini;
+}
+
+double Cistern::get_capacidad()
+{
+       return capacidad;
+}
+
+double Cistern::get_contenido_inicial()
+{
+       return contenido_inicial;
+}
+
+Gdk::Color Cistern::get_liquid_color()
+{
+       return 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];
+       sprintf(c_red,"\t\t\t<rojo>%d</rojo>\n",liquid_color.get_red());
+       sprintf(c_green,"\t\t\t<verde>%d</verde>\n",liquid_color.get_green());
+       sprintf(c_blue,"\t\t\t<azul>%d</azul>\n",liquid_color.get_blue());
+       sprintf(c_x,"\t\t<x>%d</x>\n",x);
+       sprintf(c_y,"\t\t<y>%d</y>\n",y);
+       sprintf(c_id,"%d",ID);
+       sprintf(c_cap,"\t\t<capacidad>%.2f</capacidad>\n", capacidad);
+       sprintf(c_ini,"\t\t<inicial>%.2f</inicial>\n", contenido_inicial);
+       sprintf(c_img,"\t\t<orientacion>%d</orientacion>\n",imgActual);
+       Glib::ustring dato;
+       dato = "\t<tanque nombre=\""+name+"\" id=\"";
+       dato += c_id;
+       dato += "\">\n";
+       dato += c_cap;
+       dato += c_ini;
+       dato += "\t<color>\n";
+       dato += c_red;
+       dato += c_green;
+       dato += c_blue;
+       dato += "\t</color>\n";
+       dato += c_img;
+       dato += c_x; 
+       dato += c_y;
+       dato += "\t</tanque>\n";
+       fprintf(archivo,dato.c_str());  
+}
+
+bool Cistern::check_connection()
+{
+       ConnectorType temp0, temp1;
+       switch (get_img_actual()) {
+               case 0:
+                       temp0 = is_other_connection_area( get_position_x()+get_image()->get_width() + 5 , get_position_y()+get_image()->get_height() -16);
+                       temp1 = is_other_connection_area( get_position_x() + 16, get_position_y() - 5);
+                       break;
+               case 1:
+                       temp0 = is_other_connection_area( get_position_x() -5, get_position_y()+get_image()->get_height()-16);
+                       temp1 = is_other_connection_area( get_position_x()+get_image()->get_width() - 16, get_position_y() - 5);
+       }
+       if (temp0 == OUT && temp1 == IN)
+               return (is_connected = true);
+       return is_connected;
+}
+
+ConnectorType Cistern::get_connector_type(int _a, int _b)
+{
+       switch (imgActual) {
+               case 0: if ( (_a <= x+22)&&(_a>=x+10)&&(_b<=y+10)&&(_b > y) )
+                                               return connect_vec[0].type;
+                                       if ( (_a <= x+image->get_width()-1)&&(_a >=x+image->get_width()-10)&&(_b<=y+image->get_height()-10)&&(_b >=y+image->get_height()-22) )
+                                               return connect_vec[1].type;
+                                       break;
+               case 1: if ( (_a <= x+image->get_width()-10)&&(_a>=x+image->get_width()-22)&&(_b<=y+10)&&(_b > y) )
+                                               return connect_vec[0].type;
+                                       if ( (_a <= x +10)&&(_a > x)&&(_b<=y+image->get_height()-10)&&(_b >=y+image->get_height()-22) )
+                                               return connect_vec[1].type;
+       }
+       return UNDEF;
+}
+
+void Cistern::set_default_connector()
+{
+       connect_vec[0].type = IN;
+       connect_vec[1].type = OUT;
+}