Se agrega XML para otros items (no todos ya implementados en el cliente).

[z.facultad/75.42/plaqui.git] / Model / src / pump.cpp

diff --git a/Model/src/pump.cpp b/Model/src/pump.cpp
index 086138f4844358407790d7d32da462ba3b3fc108..9c2a9b45b71a482e3db719324e8784d29d5ce92e 100644 (file)
--- 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
@@ -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;
+}
+