X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/667418327423ba116d24751926a95a2f1235849c..e0692531e30300b671ba7b474de2e0b4644aa421:/Constructor/src/cisternptywnd.cpp?ds=sidebyside

diff --git a/Constructor/src/cisternptywnd.cpp b/Constructor/src/cisternptywnd.cpp
index f12867c..d12595c 100644
--- a/Constructor/src/cisternptywnd.cpp
+++ b/Constructor/src/cisternptywnd.cpp
@@ -8,6 +8,8 @@ CisternPtyWnd::CisternPtyWnd(BaseObjectType* cobject, const Glib::RefPtr<Gnome::
 	refGlade->get_widget("txt_cistern_name", txt_cistern_name);
 	refGlade->get_widget("btn_select_color", btn_select_color);		
 	refGlade->get_widget("color_preview",color_preview);
+	refGlade->get_widget("spin_flot_inf", spin_flot_inf);
+	refGlade->get_widget("spin_flot_sup", spin_flot_sup);
 	
 	Glib::RefPtr<Gnome::Glade::Xml> ref = Gnome::Glade::Xml::create(PACKAGE_DATA_DIR"/plaqui-constructor/dialogs/constructor.glade", "color_select_dlg");
 	ref->get_widget("color_select_dlg",color_select_dlg);
@@ -17,6 +19,15 @@ CisternPtyWnd::CisternPtyWnd(BaseObjectType* cobject, const Glib::RefPtr<Gnome::
 	btn_select_color->signal_clicked().connect(SigC::slot(*this,&CisternPtyWnd::on_btn_select_color_clicked));
 	dlg_select_color_cancel->signal_clicked().connect(SigC::slot(*this,&CisternPtyWnd::on_dlg_select_color_cancel_clicked));
 	dlg_select_color_ok->signal_clicked().connect(SigC::slot(*this,&CisternPtyWnd::on_dlg_select_color_ok_clicked));
+	cistern = NULL;
+}
+
+void CisternPtyWnd::show()
+{
+	if (cistern != NULL) {
+		color_preview->modify_bg( Gtk::STATE_NORMAL , cistern->get_liquid_color() );
+	}
+	PropertyWnd::show();
 }
 
 CisternPtyWnd::~CisternPtyWnd()
@@ -26,6 +37,7 @@ CisternPtyWnd::~CisternPtyWnd()
 void CisternPtyWnd::on_btn_accept_clicked()
 {
 	CisternPtyWnd::on_btn_apply_clicked();
+	if ( !cistern->workplace->chek_name(txt_cistern_name->get_text(), cistern->get_id()) ) 
 	hide();
 }
 
@@ -34,7 +46,13 @@ void CisternPtyWnd::on_btn_apply_clicked()
 	cistern->set_capacidad( spin_capacidad->get_value() );
 	cistern->set_contenido_inicial( spin_inicial->get_value() );
 	cistern->set_name( txt_cistern_name->get_text() );
+	cistern->set_flotante_inf(spin_flot_inf->get_value() );
+	cistern->set_flotante_sup(spin_flot_sup->get_value() );
 	color_select_dlg->get_colorsel()->set_current_color(cistern->get_liquid_color());
+	if ( cistern->workplace->chek_name(txt_cistern_name->get_text(), cistern->get_id()) ) 
+		dlg_name->show();
+	else 
+		cistern->set_name( txt_cistern_name->get_text() );
 }
 
 void CisternPtyWnd::on_btn_select_color_clicked()