Ya se mandan seniales cuando se reciben comandos.

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

diff --git a/Model/src/pump.cpp b/Model/src/pump.cpp
index 086138f4844358407790d7d32da462ba3b3fc108..7f1ace4a325ffba404d61f15492e57fbd8dd16f5 100644 (file)
--- a/Model/src/pump.cpp
+++ b/Model/src/pump.cpp
@@ -4,13 +4,16 @@
 
 using namespace PlaQui::Model;
 
 
 using namespace PlaQui::Model;
 

-Pump::Pump(const std::string &_name):Source(_name)
+Pump::Pump(const std::string &_name):Source(_name),Control(_name)

 {
        in_slots = 0;
        out_slots = 1;
        active = true;
        open = true;
        max_flow = actual_flow = 0.0f;
 {
        in_slots = 0;
        out_slots = 1;
        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