* Se mejora la deteccion de conexiones en el constructor

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

diff --git a/Model/src/tank.cpp b/Model/src/tank.cpp
index e951254a92de82d3ceeb553a899ab3b74d48b914..3f2fe43b73d7a903c091b478928619ca8e80d3db 100644 (file)
--- a/Model/src/tank.cpp
+++ b/Model/src/tank.cpp
@@ -26,14 +26,36 @@ void Tank::update(int dir)
 void Tank::simulate()
 {
        if (!updated) return;
 void Tank::simulate()
 {
        if (!updated) return;

+       RGB in_color;
+
+       std::list<IConector *>::iterator i = in_list.begin();
+       if (i != in_list.end()) {
+               PlantItem *o = (PlantItem *)(*i);
+               in_color = o->get_color();
+       }

 
 

-       // le resto lo que entrego
-       litros -= actual_out_flow;

        // le sumo lo que recibo
        litros += actual_in_flow;
        // le sumo lo que recibo
        litros += actual_in_flow;

+       // calculo el nuevo color
+       int r, g, b;
+       float l = litros;
+
+       r = (int)(fluid_color.r()*litros/l + in_color.r()*actual_in_flow/l);
+       g = (int)(fluid_color.g()*litros/l + in_color.g()*actual_in_flow/l);
+       b = (int)(fluid_color.b()*litros/l + in_color.b()*actual_in_flow/l);

 
 

+       if (r>255) r = 255;
+       if (g>255) g = 255;
+       if (b>255) b = 255;
+       fluid_color = RGB(r,g,b);
+
+       // le resto lo que entrego
+       litros -= actual_out_flow;
+
+#ifdef DEBUG

        std::cout << name << "Capacidad: " << capacity;
        std::cout << "  Litros : " << litros << std::endl;
        std::cout << name << "Capacidad: " << capacity;
        std::cout << "  Litros : " << litros << std::endl;

+#endif

        updated = false;
 }
 
        updated = false;
 }
 


@@ -49,6 +71,9 @@ void Tank::recieve_msg(int msg, IConector *who, void *data)
        
        switch (msg) {
                case MSG_QUERY_MAX_FLOW_OUT:
        
        switch (msg) {
                case MSG_QUERY_MAX_FLOW_OUT:

+                       if (updated) {
+                               who->recieve_msg(MSG_RESPONSE_MAX_FLOW, this, &actual_in_flow);
+                       }

                        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);


@@ -68,7 +93,8 @@ void Tank::recieve_msg(int msg, IConector *who, void *data)
 
 void Tank::get_state_as_xml(std::stringstream &out)
 {
 
 void Tank::get_state_as_xml(std::stringstream &out)
 {

-       // El tanque no emite flujo actual!
+       PlantItem::get_state_as_xml(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;