Se agrega drenaje copado

[z.facultad/75.42/plaqui.git] / Constructor / src / cisternptywnd.cpp

diff --git a/Constructor/src/cisternptywnd.cpp b/Constructor/src/cisternptywnd.cpp
index d12595cd068e16245dae91f34bb39c1cd4909918..c63c57f377863073748551b9c48ecefc716a7351 100644 (file)
--- a/Constructor/src/cisternptywnd.cpp
+++ b/Constructor/src/cisternptywnd.cpp
@@ -15,6 +15,12 @@ CisternPtyWnd::CisternPtyWnd(BaseObjectType* cobject, const Glib::RefPtr<Gnome::
        ref->get_widget("color_select_dlg",color_select_dlg);
        ref->get_widget("dlg_select_color_cancel",dlg_select_color_cancel);
        ref->get_widget("dlg_select_color_ok",dlg_select_color_ok);
        ref->get_widget("color_select_dlg",color_select_dlg);
        ref->get_widget("dlg_select_color_cancel",dlg_select_color_cancel);
        ref->get_widget("dlg_select_color_ok",dlg_select_color_ok);

+
+       Glib::RefPtr<Gnome::Glade::Xml> ref2 = Gnome::Glade::Xml::create(PACKAGE_DATA_DIR"/plaqui-constructor/dialogs/constructor.glade", "dlg_flot");
+       ref2->get_widget("dlg_flot",dlg_flot);
+       ref2->get_widget("btn_dlg_flot_ok",btn_dlg_flot_ok);
+       
+       btn_dlg_flot_ok->signal_clicked().connect(SigC::slot(*this,&CisternPtyWnd::on_btn_dlg_flot_ok_clicked));

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


@@ -37,7 +43,7 @@ CisternPtyWnd::~CisternPtyWnd()
 void CisternPtyWnd::on_btn_accept_clicked()
 {
        CisternPtyWnd::on_btn_apply_clicked();
 void CisternPtyWnd::on_btn_accept_clicked()
 {
        CisternPtyWnd::on_btn_apply_clicked();

-       if ( !cistern->workplace->chek_name(txt_cistern_name->get_text(), cistern->get_id()) ) 
+       if ( !cistern->workplace->chek_name(txt_cistern_name->get_text(), cistern->get_id()) && ( spin_flot_inf->get_value() < spin_flot_sup->get_value() )     )

        hide();
 }
 
        hide();
 }
 


@@ -46,13 +52,17 @@ 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_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() );
        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() );

+       if ( spin_flot_inf->get_value() >= spin_flot_sup->get_value() ) 
+               dlg_flot->show();
+       else {
+               cistern->set_flotante_inf(spin_flot_inf->get_value() );
+               cistern->set_flotante_sup(spin_flot_sup->get_value() );
+       }               

 }
 
 void CisternPtyWnd::on_btn_select_color_clicked()
 }
 
 void CisternPtyWnd::on_btn_select_color_clicked()


@@ -72,3 +82,8 @@ void CisternPtyWnd::on_dlg_select_color_ok_clicked()
        color_preview->modify_bg( Gtk::STATE_NORMAL , cistern->get_liquid_color() );
        color_select_dlg->hide();
 }
        color_preview->modify_bg( Gtk::STATE_NORMAL , cistern->get_liquid_color() );
        color_select_dlg->hide();
 }

+
+void CisternPtyWnd::on_btn_dlg_flot_ok_clicked()
+{
+       dlg_flot->hide();
+}