Se elimina el directorio tests del server del configure.in y Makefile.am para

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

diff --git a/Model/src/plantitem.cpp b/Model/src/plantitem.cpp
index efca4c18ef1ca0835399761e2a6c2ebf9dd1ddc4..9405a945455e2191f23b9df591bcd5fd32e69482 100644 (file)
--- a/Model/src/plantitem.cpp
+++ b/Model/src/plantitem.cpp
@@ -8,6 +8,7 @@ PlantItem::PlantItem(const std::string &_name):IConector(0, 0)
 {
        name = _name;
        updated = false;
+       fluid_color = RGB(255,255,255);
 }
 
 PlantItem::PlantItem(unsigned ins, unsigned outs):IConector(ins, outs)
@@ -36,4 +37,12 @@ void PlantItem::get_state_as_xml(std::stringstream &out)
        out << "\t<float name=\"" << name << "\">" << std::endl;
        out << "\t\t<actual_flow>" << actual_flow << "</actual_flow>" << std::endl;
        out << "\t</float>" << std::endl;
+       out << "\t<color name=\"" << name << "\">" << std::endl;
+       out << "\t\t<r>" << fluid_color.r() << "</r>" << std::endl;
+       out << "\t\t<g>" << fluid_color.g() << "</g>" << std::endl;
+       out << "\t\t<b>" << fluid_color.b() << "</b>" << std::endl;
+       out << "\t</color>" << std::endl;
+
+       // Para que quede bonito
+       actual_flow = 99999;
 }