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

diff --git a/Model/src/pump.cpp b/Model/src/pump.cpp
index 086138f..7f1ace4 100644
--- a/Model/src/pump.cpp
+++ b/Model/src/pump.cpp
@@ -4,13 +4,16 @@
 
 using namespace PlaQui::Model;
 
-Pump::Pump(const std::string &_name):Source(_name)
+Pump::Pump(const std::string &_name):Source(_name),Control(_name)
 {
 	in_slots = 0;
 	out_slots = 1;
 	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