X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/235ee3a1e830ab839163ad2585c11d760bcd841c..10118a94647fab1466bf51f17c131ee34e3c0766:/Constructor/cistern.cpp?ds=inline

diff --git a/Constructor/cistern.cpp b/Constructor/cistern.cpp
index 1764a40..81d0fad 100644
--- a/Constructor/cistern.cpp
+++ b/Constructor/cistern.cpp
@@ -1,24 +1,19 @@
 #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<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;
-	}
+
+	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");	
 }
 
 Cistern::~Cistern()
@@ -49,6 +44,9 @@ bool Cistern::on_button_press_event(GdkEventButton *event)
   	}
 	
 	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;
@@ -64,10 +62,28 @@ 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);
 	GdkEventButton event; 
 		event.type = GDK_2BUTTON_PRESS;
 		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;
+}