Se agrega una referencia (espero que bien) ...mas ya no se me ocurre que poner

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

diff --git a/Model/src/pump.cpp b/Model/src/pump.cpp
index fb355a06e23c9c167a6136b6106bc758b997e1ab..7332c91e1d4d8186ddc15c8a0b325e7805bedf57 100644 (file)
--- a/Model/src/pump.cpp
+++ b/Model/src/pump.cpp
@@ -14,10 +14,14 @@ Pump::Pump(const std::string &_name):Source(_name),Control(_name)
        input = new ByPass();
        output = new ByPass();
        ((ByPass *)output)->set_control(this);
        input = new ByPass();
        output = new ByPass();
        ((ByPass *)output)->set_control(this);

+       /* El color de la bomba siempre esta actualizado */
+       color_updated = true;

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

+       delete input;
+       delete output;

 }
 
 void Pump::update(int dir)
 }
 
 void Pump::update(int dir)


@@ -36,8 +40,11 @@ void Pump::update(int dir)
 
 void Pump::simulate()
 {
 
 void Pump::simulate()
 {

+#ifdef DEBUG

        std::cout << ((active && open)?" (funcionando)":" (apagada)") << std::endl;
        std::cout << ((active && open)?" (funcionando)":" (apagada)") << std::endl;

+#endif

        updated = false;
        updated = false;

+       color_updated = true;

 }
 
 bool Pump::get_output()
 }
 
 bool Pump::get_output()


@@ -58,6 +65,10 @@ void Pump::recieve_msg(int msg, IConector *who, void *data)
                        if (tmp < actual_flow) actual_flow = tmp;
                }
                break;
                        if (tmp < actual_flow) actual_flow = tmp;
                }
                break;

+               case MSG_RESPONSE_COLOR:
+                       /* Por las dudas, la bomba no debe cambiar de color */
+                       ;
+               break;

                default:
                        Source::recieve_msg(msg, who, data);
        }
                default:
                        Source::recieve_msg(msg, who, data);
        }