Se termina de poner prolijo Runnable:

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

diff --git a/Model/src/pump.cpp b/Model/src/pump.cpp
index 78d4dcd9f2e4ee6d3aaf96072e2700093f95f5a3..fb355a06e23c9c167a6136b6106bc758b997e1ab 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,18 +23,19 @@ 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
                actual_flow = 0;
        if (active && open)
                actual_flow = max_flow;
        else
                actual_flow = 0;

-       updated = true;
+       

        send_msg(OUT, MSG_QUERY_MAX_FLOW_OUT, (void *)&actual_flow);
        send_msg(OUT, MSG_QUERY_MAX_FLOW_OUT, (void *)&actual_flow);

+       updated = true;

 }
 
 void Pump::simulate()
 {
 }
 
 void Pump::simulate()
 {

-       std::cout << name << "::Flujo actual = " << ((active && open)?actual_flow:0) \
-       << " de " << max_flow;

        std::cout << ((active && open)?" (funcionando)":" (apagada)") << std::endl;
        updated = false;
 }
        std::cout << ((active && open)?" (funcionando)":" (apagada)") << std::endl;
        updated = false;
 }


@@ -48,18 +52,9 @@ bool Pump::get_output()
 void Pump::recieve_msg(int msg, IConector *who, void *data)
 {
        switch (msg) {
 void Pump::recieve_msg(int msg, IConector *who, void *data)
 {
        switch (msg) {

-               case MSG_QUERY_MAX_FLOW_OUT: {
-                       // Me preguntan por el flujo máximo.
-                       // Primero me actualizo, y luego respondo
-                       // TODO la bomba nunca deberia ser consultada,pues el flujo sale ella
-               /*      update();
-                       float tmp;
-                       tmp = (actual_flow<max_flow)?actual_flow:max_flow;
-                       who->recieve_msg(MSG_RESPONSE_MAX_FLOW, this, &tmp);*/
-               }
-               break;

                case MSG_RESPONSE_MAX_FLOW: {
                        float tmp = *((float *)data);
                case MSG_RESPONSE_MAX_FLOW: {
                        float tmp = *((float *)data);

+                       if (max_flow < tmp) tmp = max_flow;

                        if (tmp < actual_flow) actual_flow = tmp;
                }
                break;
                        if (tmp < actual_flow) actual_flow = tmp;
                }
                break;


@@ -69,3 +64,14 @@ void Pump::recieve_msg(int msg, IConector *who, void *data)
 
 }
 
 
 }
 

+void Pump::get_state_as_xml(std::stringstream &out)
+{
+       // Saco el item basico por XML
+       PlantItem::get_state_as_xml(out);
+
+       // Saco lo importante de este item
+       out << "\t<pump name=\"" << name << "\">" << std::endl;
+       out << "\t\t<active>" << ((open&&active)?"true":"false") << "</active>" << std::endl;
+       out << "\t</pump>" << std::endl;
+}
+