Se arreglan un par de huevadas y ahora se ve 10 puntos el exclusa_inteligente.xml

[z.facultad/75.42/plaqui.git] / Client / src / principal.cpp

diff --git a/Client/src/principal.cpp b/Client/src/principal.cpp
index c3c553ad6789086f91dd171a778779367aceea90..e70f36d50f831a89321d8bd436ccd94e9f597da5 100644 (file)
--- a/Client/src/principal.cpp
+++ b/Client/src/principal.cpp
@@ -494,6 +494,7 @@ void Principal::loadNot(xmlNodePtr nodo)
                                y = atoi( (char *)XML_GET_CONTENT(nodo->children) );
                        } else if (xmlStrcmp(nodo->name, BAD_CAST"salida") == 0) {
                                linea.dst = (char *)XML_GET_CONTENT(nodo->children);
                                y = atoi( (char *)XML_GET_CONTENT(nodo->children) );
                        } else if (xmlStrcmp(nodo->name, BAD_CAST"salida") == 0) {
                                linea.dst = (char *)XML_GET_CONTENT(nodo->children);

+                               linea.is_tank = false;

                                p->out_lines.push_back(linea);
                        } else if (xmlStrcmp(nodo->name, BAD_CAST"entrada") == 0) {
                                linea.dst = (char *)XML_GET_CONTENT(nodo->children);
                                p->out_lines.push_back(linea);
                        } else if (xmlStrcmp(nodo->name, BAD_CAST"entrada") == 0) {
                                linea.dst = (char *)XML_GET_CONTENT(nodo->children);


@@ -539,6 +540,7 @@ void Principal::loadOr(xmlNodePtr nodo)
                                y = atoi( (char *)XML_GET_CONTENT(nodo->children) );
                        } else if (xmlStrcmp(nodo->name, BAD_CAST"salida") == 0) {
                                linea.dst = (char *)XML_GET_CONTENT(nodo->children);
                                y = atoi( (char *)XML_GET_CONTENT(nodo->children) );
                        } else if (xmlStrcmp(nodo->name, BAD_CAST"salida") == 0) {
                                linea.dst = (char *)XML_GET_CONTENT(nodo->children);

+                               linea.is_tank = false;

                                p->out_lines.push_back(linea);
                        } else if (xmlStrcmp(nodo->name, BAD_CAST"entrada") == 0) {
                                linea.dst = (char *)XML_GET_CONTENT(nodo->children);
                                p->out_lines.push_back(linea);
                        } else if (xmlStrcmp(nodo->name, BAD_CAST"entrada") == 0) {
                                linea.dst = (char *)XML_GET_CONTENT(nodo->children);


@@ -844,7 +846,6 @@ void Principal::read_status_xml(const std::string &_frame)
                                if (xmlStrcmp(items->name, BAD_CAST"float")==0) {
                                        tmp = get_float_from_xml(items->children);
                                        item_name = (char *)xmlGetProp(items, BAD_CAST"name");
                                if (xmlStrcmp(items->name, BAD_CAST"float")==0) {
                                        tmp = get_float_from_xml(items->children);
                                        item_name = (char *)xmlGetProp(items, BAD_CAST"name");

-                                       std::cout << item_name << " " << tmp << std::endl;

                                        mapItems[item_name]->set_actual_flow(tmp);
                                } else if (xmlStrcmp(items->name, BAD_CAST"exclusa")==0) {
                                        tmp_b = get_bool_from_xml(items->children);
                                        mapItems[item_name]->set_actual_flow(tmp);
                                } else if (xmlStrcmp(items->name, BAD_CAST"exclusa")==0) {
                                        tmp_b = get_bool_from_xml(items->children);


@@ -873,7 +874,7 @@ void Principal::read_status_xml(const std::string &_frame)
                                                        else if (xmlStrcmp(nodo_tmp->name, BAD_CAST"litros")==0)
                                                                lit= atof( (char *)XML_GET_CONTENT(nodo_tmp->children) );
                                                        else if (xmlStrcmp(nodo_tmp->name, BAD_CAST"salida")==0) {
                                                        else if (xmlStrcmp(nodo_tmp->name, BAD_CAST"litros")==0)
                                                                lit= atof( (char *)XML_GET_CONTENT(nodo_tmp->children) );
                                                        else if (xmlStrcmp(nodo_tmp->name, BAD_CAST"salida")==0) {

-                                                               if (xmlStrcmp(xmlGetProp(items, BAD_CAST"id"), BAD_CAST"inferior")==0) {
+                                                               if (xmlStrcmp(xmlGetProp(nodo_tmp, BAD_CAST"id"), BAD_CAST"inferior")==0) {

                                                                        b_inf = get_bool_from_xml(nodo_tmp->children);
                                                                } else {
                                                                        b_sup = get_bool_from_xml(nodo_tmp->children);
                                                                        b_inf = get_bool_from_xml(nodo_tmp->children);
                                                                } else {
                                                                        b_sup = get_bool_from_xml(nodo_tmp->children);