* Los colores ya estan completamente arreglados

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

diff --git a/Model/src/union.cpp b/Model/src/union.cpp
index 450b6e630211cb341e3d6ea8cdfa74d1dbb124ec..0d2c18c85e8fc8798113c3fee616fe5fd41827ff 100644 (file)
--- 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;
 
                        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;
                                who->recieve_msg(MSG_RESPONSE_MAX_FLOW, this, &tmp);
                                break;

-                       }
+                       }*/

                        updated = true;
                        if (m_data == 0) {
                                in_on_zero++;
                        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;
                                }
                                        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);
                        }
                                tmp = (in_on_zero==0)?actual_flow/2.0f:actual_flow;
                                who->recieve_msg(MSG_RESPONSE_MAX_FLOW, this, &tmp);
                        }