X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/f031c89fa8a00ea12ff7290569ec507f44402458..cafdb587ee6e195e5a917cea7570c2ea7e22a003:/Model/src/pump.cpp?ds=sidebyside

diff --git a/Model/src/pump.cpp b/Model/src/pump.cpp
index 78d4dcd..9c2a9b4 100644
--- a/Model/src/pump.cpp
+++ b/Model/src/pump.cpp
@@ -11,6 +11,9 @@ Pump::Pump(const std::string &_name):Source(_name),Control(_name)
 	active = true;
 	open = true;
 	max_flow = actual_flow = 0.0f;
+	input = new ByPass();
+	output = new ByPass();
+	((ByPass *)output)->set_control(this);
 }
 
 Pump::~Pump()
@@ -20,6 +23,8 @@ Pump::~Pump()
 void Pump::update(int dir)
 {
 	if (updated) return;
+	// Me fijo si me tengo que apagar automaticamente
+	open = input->get_output();
 	if (active && open)
 		actual_flow = max_flow;
 	else
@@ -69,3 +74,14 @@ void Pump::recieve_msg(int msg, IConector *who, void *data)
 
 }
 
+void Pump::get_state_as_xml(std::stringstream &out)
+{
+	// Saco el item basico por XML
+	PlantItem::get_state_as_xml(out);
+
+	// Saco lo importante de este item
+	out << "\t<pump name=\"" << name << "\">" << std::endl;
+	out << "\t\t<active>" << ((open&&active)?"true":"false") << "</active>" << std::endl;
+	out << "\t</pump>" << std::endl;
+}
+