X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/be1908f8097dbbc871bfd7c55432de43d25647b7..9322e49b932d824e5664aa8c0e0f9a41464537b1:/Model/src/exclusa.cpp?ds=inline

diff --git a/Model/src/exclusa.cpp b/Model/src/exclusa.cpp
index ea62712..96c8f99 100644
--- a/Model/src/exclusa.cpp
+++ b/Model/src/exclusa.cpp
@@ -12,10 +12,13 @@ Exclusa::Exclusa(const std::string &_name):Control(_name)
 	input = new ByPass();
 	output = new ByPass();
 	((ByPass *)output)->set_control(this);
+	updated = false;
 }
 
 Exclusa::~Exclusa()
 {
+	delete input;
+	delete output;
 }
 
 void Exclusa::update(int dir)
@@ -27,32 +30,36 @@ void Exclusa::update(int dir)
 		// mi estado
 		is_open = input->get_output();
 	}
+	if (updated) return;
+	actual_flow = temp = INFINITO;
 }
 
 void Exclusa::simulate()
 {
-	std::list<IConector *>::iterator i = in_list.begin();
-	if (i != in_list.end()) {
-		PlantItem *o = (PlantItem *)(*i);
-		set_color( o->get_color() );
-	}
 #ifdef DEBUG
 	std::cout << name << ": " << ((is_open)?"Abierta":"Cerrada") << std::endl;
 #endif
+
+	updated = false;
+	color_updated = false;
 }
 
 void Exclusa::recieve_msg(int msg, IConector *who, void *data)
 {
 	switch (msg) {
 		case MSG_QUERY_MAX_FLOW_OUT:
-			temp = *((float *)data);
-			if (!is_open) temp = 0;
+			if (updated) {
+				who->recieve_msg(MSG_RESPONSE_MAX_FLOW, this, &temp);
+			}
+			actual_flow = temp = *((float *)data);
+			if (!is_open) actual_flow = temp = 0;
+			updated = true;
 			send_msg(OUT, MSG_QUERY_MAX_FLOW_OUT, &temp);
 			who->recieve_msg(MSG_RESPONSE_MAX_FLOW, this, &temp);
 		break;
 		case MSG_RESPONSE_MAX_FLOW:
 			if (is_open)
-				temp = *((float *)data);
+				actual_flow = temp = *((float *)data);
 		break;
 		default:
 			Control::recieve_msg(msg, who, data);
@@ -61,12 +68,10 @@ void Exclusa::recieve_msg(int msg, IConector *who, void *data)
 	
 void Exclusa::get_state_as_xml(std::stringstream &out)
 {
-	// Datos comunes
-	// hack to avoid output problems :-)
-	actual_flow = temp;
 	PlantItem::get_state_as_xml(out);
 	out << "\t<exclusa name=\"" << name << "\">" << std::endl;
 	out << "\t\t<active>" << ((is_open)?"true":"false") << "</active>" << std::endl;
 	out << "\t</exclusa>" << std::endl;
+	temp = actual_flow = INFINITO;
 }