Se arreglan un par de huevadas y ahora se ve 10 puntos el exclusa_inteligente.xml

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

diff --git a/Model/src/drainage.cpp b/Model/src/drainage.cpp
index 95c55e8c2bfbbefed375c2762cc4d026d167193b..22b57b0bb5f942237111c1368c89ca48e5f12226 100644 (file)
--- a/Model/src/drainage.cpp
+++ b/Model/src/drainage.cpp
@@ -4,12 +4,11 @@
 
 using namespace PlaQui::Model;
 
 
 using namespace PlaQui::Model;
 

-Drainage::Drainage(const std::string &_name):Drain(_name)
+Drainage::Drainage(const std::string &_name):Drain(_name),Control(_name)

 {
        in_slots = 1;
        out_slots = 0;
 {
        in_slots = 1;
        out_slots = 0;

-       // FIXME hacer INFINITO!
-       capacity = 99999;
+       capacity = INFINITO;

        actual_flow = 0.0f;
 }
 
        actual_flow = 0.0f;
 }
 


@@ -27,9 +26,11 @@ void Drainage::update(int dir)
 
 void Drainage::simulate()
 {
 
 void Drainage::simulate()
 {

+#ifdef DEBUG

        std::cout << name << "::Flujo recibido = " << actual_flow << std::endl;
        std::cout << name << "::Flujo recibido = " << actual_flow << std::endl;

+#endif

        updated = false;
        updated = false;

-       actual_flow = 0;
+       color_updated = false;

 }
 
 void Drainage::recieve_msg(int msg, IConector *who, void *data)
 }
 
 void Drainage::recieve_msg(int msg, IConector *who, void *data)


@@ -39,9 +40,7 @@ void Drainage::recieve_msg(int msg, IConector *who, void *data)
                case MSG_QUERY_MAX_FLOW_OUT:
                        // FIXME Hacer INFINITO !!!
                        actual_flow = *((float *)data);
                case MSG_QUERY_MAX_FLOW_OUT:
                        // FIXME Hacer INFINITO !!!
                        actual_flow = *((float *)data);

-                       std::cout << "DD" << std::endl;
-                       tmp = 999999;
-                       who->recieve_msg(MSG_RESPONSE_MAX_FLOW, this, &tmp);
+                       who->recieve_msg(MSG_RESPONSE_MAX_FLOW, this, &actual_flow);

                        updated = true;
                break;
                default:
                        updated = true;
                break;
                default: