X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/bd2c5ebb465f2265d618feefb66479e5259dcfaa..bdec65138826cc15529c0fc5454aa11bbd877c20:/Model/src/tank.cpp?ds=sidebyside

diff --git a/Model/src/tank.cpp b/Model/src/tank.cpp
index 4abbc6b..c9a4cc6 100644
--- a/Model/src/tank.cpp
+++ b/Model/src/tank.cpp
@@ -33,28 +33,10 @@ void Tank::update(int dir)
 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 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;
@@ -64,6 +46,7 @@ void Tank::simulate()
 	std::cout << "  Litros : " << litros << std::endl;
 #endif
 	updated = false;
+	color_updated = false;
 }
 
 void Tank::recieve_msg(int msg, IConector *who, void *data)
@@ -84,17 +67,37 @@ void Tank::recieve_msg(int msg, IConector *who, void *data)
 			actual_in_flow = capacity - litros;
 			if (*((float *)data) < actual_in_flow)
 				actual_in_flow = *((float *)data);
-			actual_out_flow = litros;
+			actual_flow = actual_out_flow = litros;
+			updated = true;
 			send_msg(OUT, MSG_QUERY_MAX_FLOW_OUT, &actual_out_flow);
 
 			who->recieve_msg(MSG_RESPONSE_MAX_FLOW, this, &actual_in_flow);
-			updated = true;
 		break;
 		case MSG_RESPONSE_MAX_FLOW:
 			if (pos == OUT) {
 				if (*((float *)data) < actual_out_flow)
-					actual_out_flow = *((float *)data);
+					actual_flow = actual_out_flow = *((float *)data);
 			}
+		break;
+		case MSG_RESPONSE_COLOR:
+		{
+			RGB c = *((RGB *)data);
+			PlantItem *ic = static_cast<PlantItem *>(*(in_list.begin()));
+			int r,g,b;
+			float total = litros + ic->get_actual_flow();
+			
+			r = (int)(get_color().r()*litros/total + c.r()*ic->get_actual_flow()/total);
+			g = (int)(get_color().g()*litros/total + c.g()*ic->get_actual_flow()/total);
+			b = (int)(get_color().b()*litros/total + c.b()*ic->get_actual_flow()/total);
+			r %= 256;
+			g %= 256;
+			b %= 256;
+			set_color(RGB(r,g,b));
+			color_updated = true;
+		}
+		break;
+		default:
+			Control::recieve_msg(msg, who, data);
 	}
 }
 
@@ -105,5 +108,7 @@ void Tank::get_state_as_xml(std::stringstream &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\t<salida id=\"inferior\"><active>" << (output->get_output()?"true":"false") << "</active></salida>" << std::endl;
+	out << "\t\t<salida id=\"superior\"><active>" << (input->get_output()?"true":"false") << "</active></salida>" << std::endl;
 	out << "\t</tank>" << std::endl;
 }