agrege todos los items con sus respectivas ventanas pero falta arreglar el tema del...

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

diff --git a/Constructor/cistern.cpp b/Constructor/cistern.cpp
index 0cd46d8b13869edbb668e3e552fc6f490c3d5832..71d8cceb92fac1d70a6d1641fadb31019e0b4f19 100644 (file)
--- a/Constructor/cistern.cpp
+++ b/Constructor/cistern.cpp
@@ -1,4 +1,5 @@
 #include "cistern.h"
 #include "cistern.h"

+#include "cisternptywnd.h"

 
 Cistern::Cistern()
 {
 
 Cistern::Cistern()
 {


@@ -8,15 +9,12 @@ Cistern::Cistern()
        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;
-       try {
-               ref = Gnome::Glade::Xml::create("constructor.glade", "cistern_pty_wnd");
-       }
-       catch(const Gnome::Glade::XmlError &ex) {
-               std::cerr << ex.what() << std::endl;
-       }
-       ref->get_widget_derived("cistern_pty_wnd",property_wnd);
+
+       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";

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


@@ -25,6 +23,9 @@ Cistern::~Cistern()
 
 bool Cistern::on_button_press_event(GdkEventButton *event)
 {
 
 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);
        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);


@@ -47,7 +48,10 @@ bool Cistern::on_button_press_event(GdkEventButton *event)
        }
        
        if ((event->type == GDK_2BUTTON_PRESS) && (event->button ==1)){
        }
        
        if ((event->type == GDK_2BUTTON_PRESS) && (event->button ==1)){

-               property_wnd->show();
+               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;
 }


@@ -67,3 +71,61 @@ void Cistern::on_menu_popup_propiedades()
                event.button = 1;
        Cistern::on_button_press_event(&event);
 }
                event.button = 1;
        Cistern::on_button_press_event(&event);
 }

+
+void Cistern::set_capacidad(double _cap)
+{
+       capacidad = _cap;
+}
+
+double Cistern::get_capacidad()
+{
+       return capacidad;
+}
+
+void Cistern::set_contenido_inicial(double _ini)
+{
+       contenido_inicial = _ini;
+}
+
+double Cistern::get_contenido_inicial()
+{
+       return contenido_inicial;
+}
+
+void Cistern::save(FILE *archivo)
+{
+       char c_id[50], c_cap[50], c_x[50], c_y[50], c_img[50], c_ini[50];
+       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 += c_img;
+       dato += c_x; 
+       dato += c_y;
+       dato += "\t</tanque>\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;
+}