Mini bugfix.

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

diff --git a/Model/src/tank.cpp b/Model/src/tank.cpp
index a557c0b5cf83b8094bf7951867ede32ae4e8bd44..16e745cad67b3005156d7ecee06e9fd7de93ee90 100644 (file)
--- a/Model/src/tank.cpp
+++ b/Model/src/tank.cpp
@@ -12,6 +12,8 @@ Tank::Tank(const std::string &_name):Source(_name),Drain(_name),Control(_name)
        /* Utilizo en input como el flotante de arriba y el output como el de abajo */
        input = new Condition(Condition::GT, 0.9, this);
        output = new Condition(Condition::LT, 0.1, this);
        /* Utilizo en input como el flotante de arriba y el output como el de abajo */
        input = new Condition(Condition::GT, 0.9, this);
        output = new Condition(Condition::LT, 0.1, this);

+       input->set_name(name+" superior");
+       output->set_name(name+" inferior");

 }
 
 Tank::~Tank()
 }
 
 Tank::~Tank()


@@ -22,6 +24,7 @@ Tank::~Tank()
 
 bool Tank::get_output()
 {
 
 bool Tank::get_output()
 {

+       std::cout << "TODO MAL" << std::endl;

        return litros > 0;
 }
 
        return litros > 0;
 }
 


@@ -67,7 +70,7 @@ void Tank::recieve_msg(int msg, IConector *who, void *data)
                        actual_in_flow = capacity - litros;
                        if (*((float *)data) < actual_in_flow)
                                actual_in_flow = *((float *)data);
                        actual_in_flow = capacity - litros;
                        if (*((float *)data) < actual_in_flow)
                                actual_in_flow = *((float *)data);

-                       actual_out_flow = litros;
+                       actual_flow = actual_out_flow = litros;

                        updated = true;
                        send_msg(OUT, MSG_QUERY_MAX_FLOW_OUT, &actual_out_flow);
 
                        updated = true;
                        send_msg(OUT, MSG_QUERY_MAX_FLOW_OUT, &actual_out_flow);
 


@@ -76,7 +79,7 @@ void Tank::recieve_msg(int msg, IConector *who, void *data)
                case MSG_RESPONSE_MAX_FLOW:
                        if (pos == OUT) {
                                if (*((float *)data) < actual_out_flow)
                case MSG_RESPONSE_MAX_FLOW:
                        if (pos == OUT) {
                                if (*((float *)data) < actual_out_flow)

-                                       actual_out_flow = *((float *)data);
+                                       actual_flow = actual_out_flow = *((float *)data);

                        }
                break;
                case MSG_RESPONSE_COLOR:
                        }
                break;
                case MSG_RESPONSE_COLOR:


@@ -108,5 +111,7 @@ void Tank::get_state_as_xml(std::stringstream &out)
        out << "\t<tank name=\"" << name << "\">" << std::endl;
        out << "\t\t<capacity>" << capacity << "</capacity>" << std::endl;
        out << "\t\t<litros>" << litros << "</litros>" << std::endl;
        out << "\t<tank name=\"" << name << "\">" << std::endl;
        out << "\t\t<capacity>" << capacity << "</capacity>" << std::endl;
        out << "\t\t<litros>" << litros << "</litros>" << std::endl;

+       out << "\t\t<salida id=\"inferior\"><active>" << (output->get_output()?"true":"false") << "</active></salida>" << std::endl;
+       out << "\t\t<salida id=\"superior\"><active>" << (input->get_output()?"true":"false") << "</active></salida>" << std::endl;

        out << "\t</tank>" << std::endl;
 }
        out << "\t</tank>" << std::endl;
 }