X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/70d2e24643727ab1ea48e1793d609d27b7d21fed..5e9414c4a70c6f2a33f399dd1f92a3adf3fe73ea:/Model/src/drainage.cpp diff --git a/Model/src/drainage.cpp b/Model/src/drainage.cpp index 95c55e8..09fd79d 100644 --- a/Model/src/drainage.cpp +++ b/Model/src/drainage.cpp @@ -4,7 +4,7 @@ using namespace PlaQui::Model; -Drainage::Drainage(const std::string &_name):Drain(_name) +Drainage::Drainage(const std::string &_name):Drain(_name),Control(_name) { in_slots = 1; out_slots = 0; @@ -27,6 +27,11 @@ void Drainage::update(int dir) void Drainage::simulate() { + std::list::iterator i = in_list.begin(); + if (i != in_list.end()) { + PlantItem *o = (PlantItem *)(*i); + set_color( o->get_color() ); + } std::cout << name << "::Flujo recibido = " << actual_flow << std::endl; updated = false; actual_flow = 0; @@ -39,7 +44,6 @@ void Drainage::recieve_msg(int msg, IConector *who, void *data) case MSG_QUERY_MAX_FLOW_OUT: // FIXME Hacer INFINITO !!! actual_flow = *((float *)data); - std::cout << "DD" << std::endl; tmp = 999999; who->recieve_msg(MSG_RESPONSE_MAX_FLOW, this, &tmp); updated = true;