aregle lo del id, pero seria conveniente que hagan la prueba, creo que anda bien

[z.facultad/75.42/plaqui.git] / Constructor / src / constructor.cpp

diff --git a/Constructor/src/constructor.cpp b/Constructor/src/constructor.cpp
index a7e44aa6846217a34d88ae2a0fbdc02dd1bf339c..29c399f246b42c2836a19fe63587bffd7612e17e 100644 (file)
--- a/Constructor/src/constructor.cpp
+++ b/Constructor/src/constructor.cpp
@@ -272,11 +272,21 @@ void Constructor::on_load_from_xml()
                                        current = loadUnion(items);
                                } else if (xmlStrcmp(items->name, BAD_CAST"drenaje")==0) {
                                        current = loadDrain(items);
+                               } else if (xmlStrcmp(items->name, BAD_CAST"and")==0) {
+                                       current = loadAnd(items);
+                               } else if (xmlStrcmp(items->name, BAD_CAST"not")==0) {
+                                       current = loadNot(items);
+                               } else if (xmlStrcmp(items->name, BAD_CAST"or")==0) {
+                                       current = loadOr(items);
                                }
 
                                if (current != NULL) {
+                                       if (! current->is_logic )
+                                               listaItems.push_back(current);
+                                       else {
+                                               lista_logic_Items.push_back(current);
+                                       }
                                        // Agrego y conecto la bomba
-                                       listaItems.push_back(current);
                                        current->drag_source_set(listTargets);
                                        workplace->put(*current, current->get_position_x(), current->get_position_y());
                                        //Apunto al workplace
@@ -299,13 +309,35 @@ void Constructor::on_load_from_xml()
                        }
                        items = items->next;
                }
+
+               create_lines(document->children);
                xmlFreeDoc(document);
+               workplace->update_logic_position();
+               workplace->queue_draw();
        } else {
                // TODO : avisar que el XML no es valido!!
        }
        std::cout << "CARGA COMPLETA" << std::endl;
        file_open_selection->hide();
-       id = listaItems.size()+lista_logic_Items.size()+1;
+       
+       int id_1 = -1 , id_2 = -1;
+       std::list<CItem *>::iterator i = listaItems.begin();
+       while ( i != listaItems.end() ){
+               if ( (*i)->get_id() >= id_1 ) 
+                       id_1 = (*i)->get_id();
+       i++;
+       }
+       id_1++;
+       
+       i = lista_logic_Items.begin();
+       while ( i != lista_logic_Items.end() ){
+               if ( (*i)->get_id() >= id_2 ) 
+                       id_2 = (*i)->get_id();
+       i++;
+       }
+       id_2++;
+       if ( id_1 < id_2 ) id = id_2;
+       else id = id_1;
 }
 
 void Constructor::on_btn_file_ok_clicked()
@@ -609,6 +641,91 @@ bool Constructor::check_connection(Glib::ustring& name)
        return true;
 }      
 
+Not *Constructor::loadNot(xmlNodePtr nodo)
+{
+       std::string name = (char *)xmlGetProp(nodo, BAD_CAST"nombre");
+       std::string id = (char *)xmlGetProp(nodo, BAD_CAST"id");
+       int orientacion=0, x, y;
+
+       nodo = nodo->children;
+       while (nodo != NULL) {
+               if (nodo->type == XML_ELEMENT_NODE) {
+                       if (xmlStrcmp(nodo->name, BAD_CAST"orientacion") == 0) {
+                               orientacion = atoi( (char *)XML_GET_CONTENT(nodo->children) );
+                       } else if (xmlStrcmp(nodo->name, BAD_CAST"x") == 0) {
+                               x = atoi( (char *)XML_GET_CONTENT(nodo->children) );
+                       } else if (xmlStrcmp(nodo->name, BAD_CAST"y") == 0) {
+                               y = atoi( (char *)XML_GET_CONTENT(nodo->children) );
+                       }
+               }
+               nodo = nodo->next;
+       }
+
+       Not *p = new Not(orientacion);
+       p->set_position(x,y);
+       p->set_id( atoi(id.c_str()) );
+       p->set_name(name);
+
+       return p;
+}
+
+Or *Constructor::loadOr(xmlNodePtr nodo)
+{
+       std::string name = (char *)xmlGetProp(nodo, BAD_CAST"nombre");
+       std::string id = (char *)xmlGetProp(nodo, BAD_CAST"id");
+       int orientacion=0, x, y;
+
+       nodo = nodo->children;
+       while (nodo != NULL) {
+               if (nodo->type == XML_ELEMENT_NODE) {
+                       if (xmlStrcmp(nodo->name, BAD_CAST"orientacion") == 0) {
+                               orientacion = atoi( (char *)XML_GET_CONTENT(nodo->children) );
+                       } else if (xmlStrcmp(nodo->name, BAD_CAST"x") == 0) {
+                               x = atoi( (char *)XML_GET_CONTENT(nodo->children) );
+                       } else if (xmlStrcmp(nodo->name, BAD_CAST"y") == 0) {
+                               y = atoi( (char *)XML_GET_CONTENT(nodo->children) );
+                       }
+               }
+               nodo = nodo->next;
+       }
+
+       Or *p = new Or(orientacion);
+       p->set_position(x,y);
+       p->set_id( atoi(id.c_str()) );
+       p->set_name(name);
+
+       return p;
+}
+
+And *Constructor::loadAnd(xmlNodePtr nodo)
+{
+       std::string name = (char *)xmlGetProp(nodo, BAD_CAST"nombre");
+       std::string id = (char *)xmlGetProp(nodo, BAD_CAST"id");
+       int orientacion=0, x, y;
+       float flujo;
+       xmlNodePtr inicial = nodo;
+
+       nodo = nodo->children;
+       while (nodo != NULL) {
+               if (nodo->type == XML_ELEMENT_NODE) {
+                       if (xmlStrcmp(nodo->name, BAD_CAST"orientacion") == 0) {
+                               orientacion = atoi( (char *)XML_GET_CONTENT(nodo->children) );
+                       } else if (xmlStrcmp(nodo->name, BAD_CAST"x") == 0) {
+                               x = atoi( (char *)XML_GET_CONTENT(nodo->children) );
+                       } else if (xmlStrcmp(nodo->name, BAD_CAST"y") == 0) {
+                               y = atoi( (char *)XML_GET_CONTENT(nodo->children) );
+                       }
+               }
+               nodo = nodo->next;
+       }
+
+       And *p = new And(orientacion);
+       p->set_position(x,y);
+       p->set_id( atoi(id.c_str()) );
+       p->set_name(name);
+       return p;
+}
+
 Pump *Constructor::loadBomba(xmlNodePtr nodo)
 {
        std::string name = (char *)xmlGetProp(nodo, BAD_CAST"nombre");
@@ -838,3 +955,55 @@ Splitter *Constructor::loadCodo(xmlNodePtr nodo)
 
        return p;
 }
+
+void Constructor::create_lines(xmlNodePtr nodo)
+{
+       std::string name;
+       
+       nodo = nodo->children;
+       while (nodo != NULL) {
+               if (nodo->type == XML_ELEMENT_NODE) {
+                       if (xmlStrcmp(nodo->name, BAD_CAST"and")==0) {
+                               name = (char *)xmlGetProp(nodo, BAD_CAST"nombre");
+                               std::cout << name << std::endl;
+                               create_line(nodo->children, workplace->get_logic_id(name));
+                       } else if (xmlStrcmp(nodo->name, BAD_CAST"not")==0) {
+                               name = (char *)xmlGetProp(nodo, BAD_CAST"nombre");
+                               std::cout << name << std::endl;
+                               create_line(nodo->children, workplace->get_logic_id(name));
+                       } else if (xmlStrcmp(nodo->name, BAD_CAST"or")==0) {
+                               name = (char *)xmlGetProp(nodo, BAD_CAST"nombre");
+                               std::cout << name << std::endl;
+                               create_line(nodo->children, workplace->get_logic_id(name));
+                       }
+               }
+               nodo = nodo->next;
+       }
+}
+
+void Constructor::create_line(xmlNodePtr nodo, int logic_id)
+{
+       std::string otro;
+       std::cout << "Buscando lineas ..." << std::endl;
+       while (nodo != NULL) {
+               if (nodo->type == XML_ELEMENT_NODE) {
+                       if (xmlStrcmp(nodo->name, BAD_CAST"salida")==0) {
+                               otro = (char *)XML_GET_CONTENT(nodo->children);
+                               t_line tmp_line;
+                               tmp_line.logic_id = logic_id;
+                               //workplace->get_logic_item(logic_id)->set_out_connected(true);
+                               tmp_line.store_id = workplace->get_item_id(otro);
+                               std::cout << otro << " " << tmp_line.logic_id << " " << tmp_line.store_id << std::endl;
+                               workplace->lista_lineas_in.push_back(tmp_line);
+                       } else if (xmlStrcmp(nodo->name, BAD_CAST"entrada")==0) {
+                               otro = (char *)XML_GET_CONTENT(nodo->children);
+                               t_line tmp_line;
+                               tmp_line.logic_id = logic_id;
+                               tmp_line.store_id = workplace->get_item_id(otro);
+                               workplace->lista_lineas_out.push_back(tmp_line);
+                               std::cout << otro << " " << tmp_line.logic_id << " " << tmp_line.store_id << std::endl;
+                       }
+               }
+               nodo = nodo->next;
+       }
+}