Se agregan Makefiles simples para genera los PDF de los manuales :)

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

diff --git a/Model/src/union.cpp b/Model/src/union.cpp
index f581a67033e1211f2bc2dedec8973623f6cebfea..4e1a2acaf1546d6e6ef7d1cded5802d7651cda34 100644 (file)
--- a/Model/src/union.cpp
+++ b/Model/src/union.cpp
@@ -11,7 +11,7 @@ Union::Union(const std::string &_name):Transport(_name)
        max_flow = 0.0f;
        in_on_zero = 0;
        in_ready = 0;
-       actual_flow = 999999;
+       actual_flow = INFINITO;
        updated = false;
 }
 
@@ -35,20 +35,35 @@ void Union::recieve_msg(int msg, IConector *who, void *data)
                        float m_data =  *((float *)data)*2;
                        float tmp;
 
-                       if (updated) {
-                               who->recieve_msg(MSG_RESPONSE_MAX_FLOW, this, &actual_flow);
+/*                     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 {
@@ -87,6 +102,37 @@ void Union::recieve_msg(int msg, IConector *who, void *data)
                        }
                }
                break;
+               case MSG_RESPONSE_COLOR:
+                       if (in_colors == 0) {
+                               color1 = *((RGB *)data);
+                               entrada1 = static_cast<PlantItem *>(who);
+                               flow1 = entrada1->get_actual_flow();
+                               in_colors++;
+                       } else if ((in_colors == 1) && (entrada1 != who)) {
+                               color2  = *((RGB *)data);
+                               flow2 = static_cast<PlantItem *>(who)->get_actual_flow();
+                               in_colors++;
+                               if (color1 == color2) {
+                                               std::cout << "TODO MAL" << std::endl << std::endl;
+                               }
+
+                               /* Ya tengo mis 2 colores, los sumo */
+                               int r,g,b;
+                               int n=2;
+                               if (flow1 == 0) n--;
+                               if (flow2 == 0) n--;
+                               float suma = flow1+flow2;
+                               if (n != 0) {
+                                       r = (int)(color1.r()*flow1/suma + color2.r()*flow2/suma);
+                                       g = (int)(color1.g()*flow1/suma + color2.g()*flow2/suma);
+                                       b = (int)(color1.b()*flow1/suma + color2.b()*flow2/suma);
+                                       set_color(RGB(r,g,b));
+                               } else {
+                                       set_color(RGB(0,0,0));
+                               }
+                               color_updated = true;
+                       }
+               break;
                default:
                        Transport::recieve_msg(msg, who, data);
        }
@@ -95,44 +141,10 @@ void Union::recieve_msg(int msg, IConector *who, void *data)
 void Union::update(int dir)
 {
        // Si ya me actualice, no lo tengo que hacer de nuevo
-       RGB c_in1, c_in2;
-       unsigned r=0,g=0,b=0;
-       float c_f1, c_f2; // para ver los flujos de cada uno
-
-       if (updated) {
-               std::list<IConector *>::iterator i = in_list.begin();
-               if (i != in_list.end()) {
-                       PlantItem *o = (PlantItem *)(*i);
-                       c_in1 = o->get_color();
-                       c_f1 = o->get_actual_flow();
-                       i++;
-                       o = (PlantItem *)(*i);
-                       c_in2 = o->get_color();
-                       c_f2 = o->get_actual_flow();
-               }
-
-               set_color( RGB(r,g,b) );
-               if ((c_f1 != 0) && (c_f2 != 0)) {
-                       // Si ambas entradas traen flujo, sumo sus colores
-                       int total = c_f1+c_f2;
-                       r = ((int)((c_in1.r()*c_f1/total+c_in2.r()*c_f2/total)))%256;
-                       g = ((int)((c_in1.g()*c_f1/total+c_in2.g()*c_f2/total)))%256;
-                       b = ((int)((c_in1.b()*c_f1/total+c_in2.b()*c_f2/total)))%256;
-                       set_color(RGB(r,g,b));
-               } else {
-                       // Veo que entrada trae color
-                       if (c_f1 != 0) {
-                               set_color( c_in1 );
-                       }
-                       if (c_f2 != 0) {
-                               set_color( c_in2 );
-                       }
-               }
-               return;
-       }
+       if (updated) return;
+       
        // Seteo mi actualizar en true para evitar entrar de nuevo
-       // FIXME : 99999 == INFINITO!!
-       actual_flow = 99999;
+       actual_flow = INFINITO;
        updated = true;
        switch (dir) {
                case IN:
@@ -151,7 +163,10 @@ void Union::simulate()
        std::cout << name << "::Flujo actual = " << actual_flow << std::endl;
 #endif
        updated = false;
+       color_updated = false;
        in_on_zero = 0;
        in_ready = 0;
+       color_updated = false;
+       in_colors = 0;
 }