X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/16f64e28170d4473eebaa309d3082785c32b809c..78a6866a5076cee1015d8985b5bbbb84adf32576:/Model/src/union.cpp diff --git a/Model/src/union.cpp b/Model/src/union.cpp index 450b6e6..a9397dd 100644 --- a/Model/src/union.cpp +++ b/Model/src/union.cpp @@ -35,21 +35,35 @@ void Union::recieve_msg(int msg, IConector *who, void *data) float m_data = *((float *)data)*2; float tmp; - if (updated) { - float tmp = actual_flow/2.0f; +/* if (updated) { + if (m_data == 0) { + tmp = 0; + actual_flow /= 2.0f; + } else { + tmp = actual_flow/2.0f; + } who->recieve_msg(MSG_RESPONSE_MAX_FLOW, this, &tmp); break; - } + }*/ updated = true; if (m_data == 0) { in_on_zero++; tmp = 0.0f; who->recieve_msg(MSG_RESPONSE_MAX_FLOW, this, &tmp); - if (in_on_zero == 1) { - if (in_ready == 0) - tmp = max_flow; - else - tmp = actual_flow/2.0f; + switch (in_on_zero) { + case 1: + if (in_ready == 0) + tmp = max_flow; + else + tmp = actual_flow/2.0f; + break; + case 0: + if (in_ready == 1) { + tmp = actual_flow/2.0f; + } + break; + case 2: + tmp = 0.0f; } send_msg(OUT, MSG_QUERY_MAX_FLOW_OUT, &tmp); } else {