Se termina de poner prolijo Runnable:

[z.facultad/75.42/plaqui.git] / Model / include / pump.h

diff --git a/Model/include/pump.h b/Model/include/pump.h
index 6d137623b4e9336b72e677c83141bde609e258e7..b8b12f0ab3f3a1188ef97c6160efd852f4347bdf 100644 (file)
--- a/Model/include/pump.h
+++ b/Model/include/pump.h
@@ -3,6 +3,7 @@
 #define _BOMB_H_
 
 #include "source.h"
 #define _BOMB_H_
 
 #include "source.h"

+#include "bypass.h"

 
 namespace PlaQui {
 
 
 namespace PlaQui {
 


@@ -41,6 +42,7 @@ public:
        void activate() { active = true; }
        /// Desactiva la bomba
        void deactivate() { active = false; }
        void activate() { active = true; }
        /// Desactiva la bomba
        void deactivate() { active = false; }

+       void get_state_as_xml(std::stringstream &out);

 protected:
        /** Define si la bomba esta abierta o no. Esto lo maneja la logica de
         * control
 protected:
        /** Define si la bomba esta abierta o no. Esto lo maneja la logica de
         * control


@@ -51,7 +53,7 @@ protected:
         */
        bool active;
 private:
         */
        bool active;
 private:

-       Pump(const Pump &):Source("null"),Control("null") {}
+       Pump(const Pump &):Control("null"),Source("null") {}

        Pump &operator = (const Pump &) { return *this; }
 };
 
        Pump &operator = (const Pump &) { return *this; }
 };