* Se agregan #ifdef DEBUG a los simulate() del modelo, para poder sacar

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

diff --git a/Model/src/iconector.cpp b/Model/src/iconector.cpp
index 4a27a9c2b758afbf635facf3a377b1efe1fab305..7cbdd5670720b38622cd605abf8ec9abf1e95543 100644 (file)
--- a/Model/src/iconector.cpp
+++ b/Model/src/iconector.cpp
@@ -2,7 +2,7 @@
 
 #include "iconector.h"
 
 
 #include "iconector.h"
 

-using namespace PlaQui;
+using namespace PlaQui::Model;

 
 IConector::IConector(unsigned in, unsigned out)
 {
 
 IConector::IConector(unsigned in, unsigned out)
 {


@@ -17,7 +17,7 @@ IConector::~IConector()
        out_list.clear();
 }
 
        out_list.clear();
 }
 

-void IConector::send_msg(int where, int msg)
+void IConector::send_msg(int where, int msg, void *data)

 {
        // Recorro toda la lista y envío el mensage a cada
        // elemento conectado en "where"
 {
        // Recorro toda la lista y envío el mensage a cada
        // elemento conectado en "where"


@@ -25,11 +25,11 @@ void IConector::send_msg(int where, int msg)
        switch (where) {
                case IN:
                        for(it=in_list.begin(); it!=in_list.end(); it++)
        switch (where) {
                case IN:
                        for(it=in_list.begin(); it!=in_list.end(); it++)

-                               (*it)->recieve_msg(msg, this, NULL);
+                               (*it)->recieve_msg(msg, this, data);

                        break;
                case OUT:
                        for(it=out_list.begin(); it!=out_list.end(); it++)
                        break;
                case OUT:
                        for(it=out_list.begin(); it!=out_list.end(); it++)

-                               (*it)->recieve_msg(msg, this, NULL);
+                               (*it)->recieve_msg(msg, this, data);

        }
 }
 
        }
 }
 


@@ -54,6 +54,7 @@ bool IConector::connect(IConector *obj, int place)
                        } else {
                                return false; // no se pudo conectar!
                        }
                        } else {
                                return false; // no se pudo conectar!
                        }

+               break;

                case OUT:
                        if (out_list.size() <= out_slots) {
                                out_list.push_back(obj);
                case OUT:
                        if (out_list.size() <= out_slots) {
                                out_list.push_back(obj);