X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/c45e0693cd6b07a5123955102de53d96143f7fd8..dfabbe2822ffdfb241105cff491b4331096e4af3:/Model/src/union.cpp diff --git a/Model/src/union.cpp b/Model/src/union.cpp index 450b6e6..0d2c18c 100644 --- a/Model/src/union.cpp +++ b/Model/src/union.cpp @@ -35,11 +35,16 @@ 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++; @@ -67,7 +72,8 @@ void Union::recieve_msg(int msg, IConector *who, void *data) case 2: actual_flow = 0; } - send_msg(OUT, MSG_QUERY_MAX_FLOW_OUT, &actual_flow); + if (!updated) + send_msg(OUT, MSG_QUERY_MAX_FLOW_OUT, &actual_flow); tmp = (in_on_zero==0)?actual_flow/2.0f:actual_flow; who->recieve_msg(MSG_RESPONSE_MAX_FLOW, this, &tmp); }