El modelo ya carga el XML completo, completo (todos los items y sos

[z.facultad/75.42/plaqui.git] / Model / src / pump.cpp

diff --git a/Model/src/pump.cpp b/Model/src/pump.cpp
index 78d4dcd9f2e4ee6d3aaf96072e2700093f95f5a3..7f1ace4a325ffba404d61f15492e57fbd8dd16f5 100644 (file)
--- a/Model/src/pump.cpp
+++ b/Model/src/pump.cpp
@@ -11,6 +11,9 @@ Pump::Pump(const std::string &_name):Source(_name),Control(_name)
        active = true;
        open = true;
        max_flow = actual_flow = 0.0f;
        active = true;
        open = true;
        max_flow = actual_flow = 0.0f;

+       input = new ByPass();
+       output = new ByPass();
+       ((ByPass *)output)->set_control(this);

 }
 
 Pump::~Pump()
 }
 
 Pump::~Pump()


@@ -20,6 +23,8 @@ Pump::~Pump()
 void Pump::update(int dir)
 {
        if (updated) return;
 void Pump::update(int dir)
 {
        if (updated) return;

+       // Me fijo si me tengo que apagar automaticamente
+       open = input->get_output();

        if (active && open)
                actual_flow = max_flow;
        else
        if (active && open)
                actual_flow = max_flow;
        else