Se agrega la consante INFINITO pendiente desde el primer commit :-)

diff --git a/Client/src/principal.cpp b/Client/src/principal.cpp
index 5066b52176d2aa165379deb789e46a0ad73489da..7b441eec9ef970bbe0a7e79c557ca59de00b7134 100644 (file)
--- a/Client/src/principal.cpp
+++ b/Client/src/principal.cpp
@@ -16,6 +16,8 @@
 #include <unistd.h>
 #include <glibmm/thread.h>
 
+#define INFINITO 99999999
+
 Principal::Principal(BaseObjectType *co, const Glib::RefPtr<Gnome::Glade::Xml> &rg):Gtk::Window(co),refXml(rg)
 {
        Gtk::MenuItem *conect=0, *exit=0, *about=0, *mnu_prop=0, *mnu_disconnect=0;
@@ -850,6 +852,7 @@ float Principal::get_float_from_xml(xmlNodePtr nodo)
                }
                nodo = nodo->next;
        }
+       if (tmp == INFINITO) tmp = 0;
        return tmp;
 }
 

diff --git a/Model/include/plantitem.h b/Model/include/plantitem.h
index a85f62dbe98f678f45a46c841aa7aba1e976d53d..25b7eb2d53dd820c9311444cd6b94b58d5545fe2 100644 (file)
--- a/Model/include/plantitem.h
+++ b/Model/include/plantitem.h
@@ -8,6 +8,8 @@
 #include "rgb.h"
 #include <sstream>
 
+#define INFINITO 99999999
+
 namespace PlaQui {
 
 namespace Model {

diff --git a/Model/src/conduct.cpp b/Model/src/conduct.cpp
index 08098d4f3486e40effd38cc7e345ae48a0d8074b..a0e40fe7019a40c57192c385bc424f792f9aec97 100644 (file)
--- a/Model/src/conduct.cpp
+++ b/Model/src/conduct.cpp
@@ -10,7 +10,7 @@ Conduct::Conduct(const std::string &_name):Transport(_name)
        // Inicio los parametros de conectores
        in_slots = 1;
        out_slots = 1;
-       actual_flow = 99999;
+       actual_flow = INFINITO;
        updated = false;
 }
 

diff --git a/Model/src/drainage.cpp b/Model/src/drainage.cpp
index 85fec867fdc062154761dea2fa09c399bb97ded3..d421662330a541a834e9e86f4e42e7adf18b0b83 100644 (file)
--- a/Model/src/drainage.cpp
+++ b/Model/src/drainage.cpp
@@ -9,7 +9,7 @@ Drainage::Drainage(const std::string &_name):Drain(_name),Control(_name)
        in_slots = 1;
        out_slots = 0;
        // FIXME hacer INFINITO!
-       capacity = 99999;
+       capacity = INFINITO;
        actual_flow = 0.0f;
 }
 
@@ -41,7 +41,7 @@ void Drainage::recieve_msg(int msg, IConector *who, void *data)
                case MSG_QUERY_MAX_FLOW_OUT:
                        // FIXME Hacer INFINITO !!!
                        actual_flow = *((float *)data);
-                       tmp = 999999;
+                       tmp = INFINITO;
                        who->recieve_msg(MSG_RESPONSE_MAX_FLOW, this, &tmp);
                        updated = true;
                break;

diff --git a/Model/src/plantitem.cpp b/Model/src/plantitem.cpp
index 75697223e2ee61a4eb2efe4d48f5f4df4fb7f7f5..34360b0485336bc0eb1b99ac16a68171820f9cd8 100644 (file)
--- a/Model/src/plantitem.cpp
+++ b/Model/src/plantitem.cpp
@@ -67,5 +67,5 @@ void PlantItem::get_state_as_xml(std::stringstream &out)
        out << "\t</color>" << std::endl;
 
        // Para que quede bonito
-       actual_flow = 99999;
+       actual_flow = INFINITO;
 }

diff --git a/Model/src/splitter.cpp b/Model/src/splitter.cpp
index 140bf7e58b9b9d3f52e6462cab1227c97a80df60..cd3ccad169eb7d057e291ae15c9c763bf7b71df1 100644 (file)
--- a/Model/src/splitter.cpp
+++ b/Model/src/splitter.cpp
@@ -72,7 +72,7 @@ void Splitter::update(int dir)
        // Si ya me actualice, no lo tengo que hacer de nuevo
        if (updated) return;
        // Seteo mi actualizar en true para evitar entrar de nuevo
-       actual_flow = 99999;
+       actual_flow = INFINITO;
        updated = true;
        switch (dir) {
                case IN:

diff --git a/Model/src/union.cpp b/Model/src/union.cpp
index a9397ddf10202b10cdc17b7b0c3eec9ea6700162..4e1a2acaf1546d6e6ef7d1cded5802d7651cda34 100644 (file)
--- a/Model/src/union.cpp
+++ b/Model/src/union.cpp
@@ -11,7 +11,7 @@ Union::Union(const std::string &_name):Transport(_name)
        max_flow = 0.0f;
        in_on_zero = 0;
        in_ready = 0;
-       actual_flow = 999999;
+       actual_flow = INFINITO;
        updated = false;
 }
 
@@ -144,8 +144,7 @@ void Union::update(int dir)
        if (updated) return;
        
        // Seteo mi actualizar en true para evitar entrar de nuevo
-       // FIXME : 99999 == INFINITO!!
-       actual_flow = 99999;
+       actual_flow = INFINITO;
        updated = true;
        switch (dir) {
                case IN: