* Se agrega carga de lineas entre compuertas.

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

diff --git a/Constructor/src/or.cpp b/Constructor/src/or.cpp
index ee96e2287ae7c249906a5eaa1a111e8e5feee23e..d7ba294d645a76a1f06cb504caee443d6c69a95b 100644 (file)
--- a/Constructor/src/or.cpp
+++ b/Constructor/src/or.cpp
@@ -1,4 +1,5 @@
 #include "or.h"
 #include "or.h"

+#include "cistern.h"

 
 Or::Or(int orientacion)
 {
 
 Or::Or(int orientacion)
 {


@@ -152,8 +153,18 @@ void Or::save(FILE *archivo)
        dato += c_y;
        for ( int i=0; i<=vec_connector.size()-1&&!vec_connector.empty(); i++) {
                if ( vec_connector[i].type == IN ) {
        dato += c_y;
        for ( int i=0; i<=vec_connector.size()-1&&!vec_connector.empty(); i++) {
                if ( vec_connector[i].type == IN ) {

-                       dato += "\t\t<entrada>";
-                       dato += vec_connector[i].name_dest + "</entrada>\n";
+                       if ( vec_connector[i].cistern_connector == 1 ) {
+                               dato += "\t\t<entrada id = \"superior\">";
+                               dato += vec_connector[i].name_dest + "</entrada>\n";
+                       }
+                       if ( vec_connector[i].cistern_connector == 0 ) {
+                               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>";
+                               dato += vec_connector[i].name_dest + "</entrada>\n";
+                       }

                } else {
                        dato += "\t\t<salida>";
                        dato += vec_connector[i].name_dest + "</salida>\n";
                } else {
                        dato += "\t\t<salida>";
                        dato += vec_connector[i].name_dest + "</salida>\n";


@@ -163,6 +174,8 @@ void Or::save(FILE *archivo)
        fprintf(archivo, dato.c_str() );
 }
 
        fprintf(archivo, dato.c_str() );
 }
 

+//<entrada><tanque id="superior">tanque1</tanque></entrada>
+

 bool Or::check_connection()
 {
        int cant_in = 0, cant_out =0;
 bool Or::check_connection()
 {
        int cant_in = 0, cant_out =0;


@@ -172,6 +185,7 @@ bool Or::check_connection()
                if ( (*i).logic_id== ID ) {
                        temp.type = OUT;
                        temp.name_dest = workplace->get_item((*i).store_id)->get_name();
                if ( (*i).logic_id== ID ) {
                        temp.type = OUT;
                        temp.name_dest = workplace->get_item((*i).store_id)->get_name();

+                       temp.cistern_connector = -1;

                        vec_connector.push_back(temp);
                        cant_out++;
                }
                        vec_connector.push_back(temp);
                        cant_out++;
                }


@@ -183,6 +197,14 @@ bool Or::check_connection()
                if ( (*i).logic_id== ID ) {
                        temp.type = IN;
                        temp.name_dest = workplace->get_item((*i).store_id)->get_name();
                if ( (*i).logic_id== ID ) {
                        temp.type = IN;
                        temp.name_dest = workplace->get_item((*i).store_id)->get_name();

+                       if ( dynamic_cast<Cistern *>(workplace->get_item((*i).store_id)) )  {
+                               if ( (*i).cistern_out1 )
+                                       temp.cistern_connector = 1; //arriba
+                               else 
+                                       temp.cistern_connector = 0; //abajo
+                       } else 
+                               temp.cistern_connector = -1; //si no es tanque.
+                       std::cout<<"cistern_connector = "<<temp.cistern_connector<<std::endl;

                        vec_connector.push_back(temp);
                        cant_in++;
                }
                        vec_connector.push_back(temp);
                        cant_in++;
                }


@@ -205,6 +227,7 @@ bool Or::check_connection()
                if ( (*i).store_id == ID ) {
                        temp.type = IN;
                        temp.name_dest = workplace->get_logic_item((*i).logic_id)->get_name();
                if ( (*i).store_id == ID ) {
                        temp.type = IN;
                        temp.name_dest = workplace->get_logic_item((*i).logic_id)->get_name();

+                       temp.cistern_connector = -1;

                        vec_connector.push_back(temp);
                        cant_out++;
                }
                        vec_connector.push_back(temp);
                        cant_out++;
                }