X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/dfabbe2822ffdfb241105cff491b4331096e4af3..HEAD:/Model/src/tank.cpp

diff --git a/Model/src/tank.cpp b/Model/src/tank.cpp
index a557c0b..16e745c 100644
--- a/Model/src/tank.cpp
+++ b/Model/src/tank.cpp
@@ -12,6 +12,8 @@ Tank::Tank(const std::string &_name):Source(_name),Drain(_name),Control(_name)
 	/* 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);
+	input->set_name(name+" superior");
+	output->set_name(name+" inferior");
 }
 
 Tank::~Tank()
@@ -22,6 +24,7 @@ Tank::~Tank()
 
 bool Tank::get_output()
 {
+	std::cout << "TODO MAL" << std::endl;
 	return litros > 0;
 }
 
@@ -67,7 +70,7 @@ 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);
 
@@ -76,7 +79,7 @@ void Tank::recieve_msg(int msg, IConector *who, void *data)
 		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:
@@ -108,5 +111,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;
 }