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

diff --git a/Model/src/tank.cpp b/Model/src/tank.cpp
index f21a2e8..4abbc6b 100644
--- a/Model/src/tank.cpp
+++ b/Model/src/tank.cpp
@@ -1,16 +1,23 @@
 
 #include "tank.h"
 #include <iostream>
+#include "condition.h"
 
 using namespace PlaQui::Model;
 
 Tank::Tank(const std::string &_name):Source(_name),Drain(_name),Control(_name)
 {
 	litros = 0.0f;
+
+	/* Utilizo en input como el flotante de arriba y el output como el de abajo */
+	input = new Condition(Condition::GT, 0.9, this);
+	output = new Condition(Condition::LT, 0.1, this);
 }
 
 Tank::~Tank()
 {
+	delete input;
+	delete output;
 }
 
 bool Tank::get_output()
@@ -26,14 +33,36 @@ 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 resto lo que entrego
-	litros -= actual_out_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;
+#endif
 	updated = false;
 }
 
@@ -49,6 +78,9 @@ void Tank::recieve_msg(int msg, IConector *who, void *data)
 	
 	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);
@@ -66,3 +98,12 @@ void Tank::recieve_msg(int msg, IConector *who, void *data)
 	}
 }
 
+void Tank::get_state_as_xml(std::stringstream &out)
+{
+	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>" << std::endl;
+}