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

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

diff --git a/Model/src/simulator.cpp b/Model/src/simulator.cpp
index 106f6e39ef69fc2f51508fb7f6c08745a738575d..72c59ca61561f2888b6413d106613f680339e0a9 100644 (file)
--- a/Model/src/simulator.cpp
+++ b/Model/src/simulator.cpp
@@ -10,9 +10,12 @@ Simulator::Simulator(const std::string &filename)
        xmlDocPtr document;
        document = xmlParseFile(filename.c_str());
        if (document == NULL) {
        xmlDocPtr document;
        document = xmlParseFile(filename.c_str());
        if (document == NULL) {

+               is_load_ok = false;

                return;
        }
 
                return;
        }
 

+       is_load_ok = true;
+

        /* bien, el archivo se parseo bien! */
        xmlNodePtr nodo, items;
        nodo = document->children;
        /* bien, el archivo se parseo bien! */
        xmlNodePtr nodo, items;
        nodo = document->children;


@@ -40,17 +43,25 @@ Simulator::Simulator(const std::string &filename)
                // Bien, la planta esta cargada, conectemos todo!!
                do_connections(nodo->children);
        }
                // Bien, la planta esta cargada, conectemos todo!!
                do_connections(nodo->children);
        }

+       xmlFreeDoc(document);

 }
 
 Simulator::~Simulator()
 {
 }
 
 Simulator::~Simulator()
 {

-       // FIXME REMOVER TODOOOOOO
+       std::list<PlantItem *>::iterator i = items.begin();
+       PlantItem *o;
+
+       while (i != items.end()) {
+               o = (*i);
+               items.remove(o);
+               delete o;
+               i = items.begin();
+       }

 }
 
 void Simulator::add_pump(const std::string &name, float max_flow, RGB color)
 {
        Pump *p = new Pump(name);
 }
 
 void Simulator::add_pump(const std::string &name, float max_flow, RGB color)
 {
        Pump *p = new Pump(name);

-       // FIXME no va!!

        p->set_max_flow(max_flow);
        p->set_color(color);
        pump_lst.push_back(p);
        p->set_max_flow(max_flow);
        p->set_color(color);
        pump_lst.push_back(p);


@@ -60,7 +71,6 @@ void Simulator::add_pump(const std::string &name, float max_flow, RGB color)
 void Simulator::add_union(const std::string &name, float max_flow)
 {
        Union *u = new Union(name);
 void Simulator::add_union(const std::string &name, float max_flow)
 {
        Union *u = new Union(name);

-       // FIXME no va!!

        u->set_max_flow(max_flow);
        union_lst.push_back(u);
        items.push_back(u);
        u->set_max_flow(max_flow);
        union_lst.push_back(u);
        items.push_back(u);


@@ -77,8 +87,6 @@ void Simulator::add_splitter(const std::string &name, float max_flow)
 void Simulator::add_conduct(const std::string &name, float flujo)
 {
        Conduct *p = new Conduct(name);
 void Simulator::add_conduct(const std::string &name, float flujo)
 {
        Conduct *p = new Conduct(name);

-       // FIXME no va!!
-       std::cout << flujo << std::endl;

        p->set_max_flow(flujo);
        conduct_lst.push_back(p);
        items.push_back(p);
        p->set_max_flow(flujo);
        conduct_lst.push_back(p);
        items.push_back(p);


@@ -201,8 +209,7 @@ void Simulator::loadBomba(xmlNodePtr nodo)
                        } else if (xmlStrcmp(nodo->name, BAD_CAST"entrega") == 0) {
                                flujo = atof( (char *)XML_GET_CONTENT(nodo->children) );
                        } else if (xmlStrcmp(nodo->name, BAD_CAST"color") == 0) {
                        } else if (xmlStrcmp(nodo->name, BAD_CAST"entrega") == 0) {
                                flujo = atof( (char *)XML_GET_CONTENT(nodo->children) );
                        } else if (xmlStrcmp(nodo->name, BAD_CAST"color") == 0) {

-                               // FIXME !
-                               color = RGB();
+                               color = loadRGB(nodo->children);

                        }
                }
                nodo = nodo->next;
                        }
                }
                nodo = nodo->next;


@@ -270,7 +277,7 @@ void Simulator::loadTank(xmlNodePtr nodo)
        std::string name = (char *)xmlGetProp(nodo, BAD_CAST"nombre");
        int orientacion=0, x, y;
        float capacidad, inicial;
        std::string name = (char *)xmlGetProp(nodo, BAD_CAST"nombre");
        int orientacion=0, x, y;
        float capacidad, inicial;

-       RGB color; // TODO
+       RGB color;

 
        nodo = nodo->children;
        while (nodo != NULL) {
 
        nodo = nodo->children;
        while (nodo != NULL) {


@@ -285,6 +292,8 @@ void Simulator::loadTank(xmlNodePtr nodo)
                                capacidad = atoi( (char *)XML_GET_CONTENT(nodo->children) );
                        } else if (xmlStrcmp(nodo->name, BAD_CAST"inicial") == 0) {
                                inicial = atof( (char *)XML_GET_CONTENT(nodo->children) );
                                capacidad = atoi( (char *)XML_GET_CONTENT(nodo->children) );
                        } else if (xmlStrcmp(nodo->name, BAD_CAST"inicial") == 0) {
                                inicial = atof( (char *)XML_GET_CONTENT(nodo->children) );

+                       } else if (xmlStrcmp(nodo->name, BAD_CAST"") == 0) {
+                               color = loadRGB(nodo->children);

                        }
                }
                nodo = nodo->next;
                        }
                }
                nodo = nodo->next;


@@ -443,3 +452,20 @@ std::string Simulator::get_state_as_xml()
        return out.str();;
 }
 
        return out.str();;
 }
 

+RGB Simulator::loadRGB(xmlNodePtr nodo)
+{
+       unsigned r,g,b;
+       while (nodo != NULL) {
+               if (nodo->type == XML_ELEMENT_NODE) {
+                       if (xmlStrcmp(nodo->name, BAD_CAST"rojo")==0)
+                               r = atoi( (char *)XML_GET_CONTENT(nodo->children) );
+                       if (xmlStrcmp(nodo->name, BAD_CAST"verde")==0)
+                               g = atoi( (char *)XML_GET_CONTENT(nodo->children) );
+                       if (xmlStrcmp(nodo->name, BAD_CAST"azul")==0)
+                               b = atoi( (char *)XML_GET_CONTENT(nodo->children) );
+               }
+               nodo = nodo->next;
+       }
+       return RGB(r,g,b);
+}
+