X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/cc77948bedbd851e009ad3b8a421dea93c3ceeff..dc805abad5bf3fee5e72f42fec64bdf9fe9dda4e:/Constructor/src/and.cpp?ds=inline

diff --git a/Constructor/src/and.cpp b/Constructor/src/and.cpp
index 504747b..bdc1f0e 100644
--- a/Constructor/src/and.cpp
+++ b/Constructor/src/and.cpp
@@ -1,5 +1,5 @@
 #include "and.h"
-
+#include "cistern.h"
 And::And(int orientacion)
 {
 	is_logic = true;
@@ -42,7 +42,6 @@ And::And(int orientacion)
 	}
 	set_size_request(image->get_width(), image->get_height());
 	name = "and";
-	menulist.push_back( Gtk::Menu_Helpers::ImageMenuElem("Conectar", menu_image_linea,SigC::slot(*this, &CItem::on_menu_popup_conectar) ) ) ;
 }
 
 And::~And()
@@ -153,8 +152,18 @@ void And::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 += "\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";
@@ -182,6 +191,13 @@ bool And::check_connection()
 		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.
 			vec_connector.push_back(temp);
 		}
 		i++;