X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/f567cc2cc693372bb3f920f0eb068cde3dffaa44..a4fcf877753b034b1df7fa73d41388849fbc9000:/Model/src/union.cpp?ds=sidebyside

diff --git a/Model/src/union.cpp b/Model/src/union.cpp
index 443cb2b..58bc8e1 100644
--- a/Model/src/union.cpp
+++ b/Model/src/union.cpp
@@ -8,9 +8,11 @@ Union::Union(const std::string &_name):Transport(_name)
 {
 	in_slots = 2;
 	out_slots = 1;
-	max_flow = actual_flow = 0.0f;
+	max_flow = 0.0f;
 	in_on_zero = 0;
 	in_ready = 0;
+	actual_flow = 999999;
+	updated = false;
 }
 
 Union::~Union()
@@ -26,7 +28,6 @@ void Union::recieve_msg(int msg, IConector *who, void *data)
 	for(i=in_list.begin(); i!=in_list.end(); i++) {
 		if ((*i) == who) pos = IN;
 	}
-	
 	switch (msg) {
 		case MSG_QUERY_MAX_FLOW_OUT: {
 			// Me preguntan por el flujo máximo.
@@ -34,6 +35,11 @@ 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);
+				break;
+			}
+			updated = true;
 			if (m_data == 0) {
 				in_on_zero++;
 				tmp = 0.0f;
@@ -42,7 +48,7 @@ void Union::recieve_msg(int msg, IConector *who, void *data)
 					if (in_ready == 0)
 						tmp = max_flow;
 					else
-						tmp = max_flow/2.0f;
+						tmp = actual_flow/2.0f;
 				}
 				send_msg(OUT, MSG_QUERY_MAX_FLOW_OUT, &tmp);
 			} else {
@@ -61,7 +67,6 @@ void Union::recieve_msg(int msg, IConector *who, void *data)
 						actual_flow = 0;
 				}
 				send_msg(OUT, MSG_QUERY_MAX_FLOW_OUT, &actual_flow);
-				std::cout << in_on_zero << " " << actual_flow << std::endl;
 				tmp = (in_on_zero==0)?actual_flow/2.0f:actual_flow;
 				who->recieve_msg(MSG_RESPONSE_MAX_FLOW, this, &tmp);
 			}
@@ -75,8 +80,10 @@ void Union::recieve_msg(int msg, IConector *who, void *data)
 				if (max < actual_flow)	actual_flow = max;
 				if (in_on_zero == 2) actual_flow = 0;
 			} else {
-					if (((2*max) < actual_flow) && (max != 0))
+					if (((2*max) < actual_flow) && (max != 0)) {
 						actual_flow = 2*max;
+						if (in_on_zero == 1) actual_flow /= 2.0;
+					}
 			}
 		}
 		break;
@@ -104,13 +111,45 @@ void Union::update(int dir)
 
 void Union::simulate()
 {
+	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) {
 		return;
 	}
+	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
+		r = ((c_in1.r()+c_in2.r())/2)%256;
+		g = ((c_in1.g()+c_in2.g())/2)%256;
+		b = ((c_in1.b()+c_in2.b())/2)%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 );
+		}
+	}
+		
+#ifdef DEBUG
 	std::cout << name << "::Flujo actual = " << actual_flow << std::endl;
+#endif
 	updated = false;
-	actual_flow = 99999;
 	in_on_zero = 0;
 	in_ready = 0;
 }