X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/70d2e24643727ab1ea48e1793d609d27b7d21fed..4f94fbe0a1d217c7410e5396aad365c85f1fc5af:/Model/include/drain.h?ds=inline

diff --git a/Model/include/drain.h b/Model/include/drain.h
index a24c9a3..34958a4 100644
--- a/Model/include/drain.h
+++ b/Model/include/drain.h
@@ -9,7 +9,7 @@ namespace PlaQui {
 namespace Model {
 
 /** Modela objetos que recibe liquido */
-class Drain:public Control {
+class Drain:virtual public Control {
 public:
 	/// Constructor
 	Drain(const std::string &_name);
@@ -20,14 +20,11 @@ public:
 
 	virtual void simulate();
 	/// Retorna el flujo que entrega actualmente
-	float get_actual_flow() { return actual_flow; }
-	/// Retorna el flujo máximo capaz de entregar
 	float get_capacity() { return capacity; }
 	/// Asigna el flojo máximo capaz de entregar
 	virtual void  set_capacity(float _f) { capacity = _f; }
 protected:
 	float capacity;
-	float actual_flow;
 private:
 	Drain(const Drain &):Control("null") {}
 	Drain &operator = (const Drain &) { return *this; }
@@ -35,5 +32,6 @@ private:
 
 }
 }
+
 #endif // _H_SOURCE_H_