cambio la sintaxis XML de las compuertas

diff --git a/Constructor/src/and.cpp b/Constructor/src/and.cpp
index 86b774fa2a1935c4072fe85f2645d9e8892ee119..1a36cfd72ca310b217bbe55f97eb30dab540a185 100644 (file)
--- a/Constructor/src/and.cpp
+++ b/Constructor/src/and.cpp
@@ -154,12 +154,12 @@ void And::save(FILE *archivo)
        for ( int i=0; i<=vec_connector.size()-1&&!vec_connector.empty(); i++) {
                if ( vec_connector[i].type == IN ) {
                        if ( vec_connector[i].cistern_connector == 1 ) {
        for ( int i=0; i<=vec_connector.size()-1&&!vec_connector.empty(); i++) {
                if ( vec_connector[i].type == IN ) {
                        if ( vec_connector[i].cistern_connector == 1 ) {

-                               dato += "\t\t<entrada><tanque id = \"superior\">";
-                               dato += vec_connector[i].name_dest + "</tanque></entrada>\n";
+                               dato += "\t\t<entrada id = \"superior\">";
+                               dato += vec_connector[i].name_dest + "</entrada>\n";

                        }
                        if ( vec_connector[i].cistern_connector == 0 ) {
                        }
                        if ( vec_connector[i].cistern_connector == 0 ) {

-                               dato += "\t\t<entrada><tanque id = \"inferior\">";
-                               dato += vec_connector[i].name_dest + "</tanque></entrada>\n";
+                               dato += "\t\t<entrada id = \"inferior\">";
+                               dato += vec_connector[i].name_dest + "</entrada>\n";

                        }
                        if ( vec_connector[i].cistern_connector == -1 ) {
                                dato += "\t\t<entrada>";
                        }
                        if ( vec_connector[i].cistern_connector == -1 ) {
                                dato += "\t\t<entrada>";

diff --git a/Constructor/src/not.cpp b/Constructor/src/not.cpp
index e69a94a1a2f31e38972a8302cd9fabc1b1637fb1..3568dbb420efa8d098b403f8cdd573f00ba5a988 100644 (file)
--- a/Constructor/src/not.cpp
+++ b/Constructor/src/not.cpp
@@ -157,12 +157,12 @@ void Not::save(FILE *archivo)
        for ( int i=0; i<=vec_connector.size()-1&&!vec_connector.empty(); i++) {
                if ( vec_connector[i].type == IN ) {
                        if ( vec_connector[i].cistern_connector == 1 ) {
        for ( int i=0; i<=vec_connector.size()-1&&!vec_connector.empty(); i++) {
                if ( vec_connector[i].type == IN ) {
                        if ( vec_connector[i].cistern_connector == 1 ) {

-                               dato += "\t\t<entrada><tanque id = \"superior\">";
-                               dato += vec_connector[i].name_dest + "</tanque></entrada>\n";
+                               dato += "\t\t<entrada id = \"superior\">";
+                               dato += vec_connector[i].name_dest + "</entrada>\n";

                        }
                        if ( vec_connector[i].cistern_connector == 0 ) {
                        }
                        if ( vec_connector[i].cistern_connector == 0 ) {

-                               dato += "\t\t<entrada><tanque id = \"inferior\">";
-                               dato += vec_connector[i].name_dest + "</tanque></entrada>\n";
+                               dato += "\t\t<entrada id = \"inferior\">";
+                               dato += vec_connector[i].name_dest + "</entrada>\n";

                        }
                        if ( vec_connector[i].cistern_connector == -1 ) {
                                dato += "\t\t<entrada>";
                        }
                        if ( vec_connector[i].cistern_connector == -1 ) {
                                dato += "\t\t<entrada>";

diff --git a/Constructor/src/or.cpp b/Constructor/src/or.cpp
index 2c17f7aaeb81909938e32a908fb189a7d0dfdb47..d7ba294d645a76a1f06cb504caee443d6c69a95b 100644 (file)
--- a/Constructor/src/or.cpp
+++ b/Constructor/src/or.cpp
@@ -154,12 +154,12 @@ void Or::save(FILE *archivo)
        for ( int i=0; i<=vec_connector.size()-1&&!vec_connector.empty(); i++) {
                if ( vec_connector[i].type == IN ) {
                        if ( vec_connector[i].cistern_connector == 1 ) {
        for ( int i=0; i<=vec_connector.size()-1&&!vec_connector.empty(); i++) {
                if ( vec_connector[i].type == IN ) {
                        if ( vec_connector[i].cistern_connector == 1 ) {

-                               dato += "\t\t<entrada><tanque id = \"superior\">";
-                               dato += vec_connector[i].name_dest + "</tanque></entrada>\n";
+                               dato += "\t\t<entrada id = \"superior\">";
+                               dato += vec_connector[i].name_dest + "</entrada>\n";

                        }
                        if ( vec_connector[i].cistern_connector == 0 ) {
                        }
                        if ( vec_connector[i].cistern_connector == 0 ) {

-                               dato += "\t\t<entrada><tanque id = \"inferior\">";
-                               dato += vec_connector[i].name_dest + "</tanque></entrada>\n";
+                               dato += "\t\t<entrada id = \"inferior\">";
+                               dato += vec_connector[i].name_dest + "</entrada>\n";

                        }
                        if ( vec_connector[i].cistern_connector == -1 ) {
                                dato += "\t\t<entrada>";
                        }
                        if ( vec_connector[i].cistern_connector == -1 ) {
                                dato += "\t\t<entrada>";