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

diff --git a/Constructor/src/and.cpp b/Constructor/src/and.cpp
index 3e52876..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()
@@ -57,7 +56,7 @@ bool And::on_button_press_event(GdkEventButton *event)
 		std::cout << CItem::gate_id << std::endl;
 		if (CItem::logic_connect) {
 			if (CItem::gate_id != -1 ) {
-				if ( detect_click_position((int)event->x, (int)event->y ) == IN && CItem::gate_id != ID ) {
+				if ( detect_click_position((int)event->x, (int)event->y ) == IN && CItem::gate_id != ID && !workplace->get_logic_item(CItem::gate_id)->get_out_logic_connect()) {
 					tmp_line.logic_id =  CItem::gate_id;
 					workplace->get_logic_item(CItem::gate_id)->set_out_connected(true);
 					tmp_line.store_id = ID;
@@ -76,6 +75,11 @@ bool And::on_button_press_event(GdkEventButton *event)
 		combo_entry->set_popdown_strings(*list_pointed);
 		combo_entry->get_entry()->set_text (name);
 		workplace->queue_draw();
+		char f[20];
+		Glib::ustring text;
+		sprintf(f,"  Conector OUT = %d",out_connected);
+		text = name+f;
+		status_bar->push ( text, 0);
 	}
 	
 	if ((event->type == GDK_BUTTON_PRESS) && ( event->button == 2)){
@@ -117,7 +121,7 @@ bool And::on_button_press_event(GdkEventButton *event)
 	}
 	if ((event->type == GDK_BUTTON_PRESS) && ( event->button == 3)){
 		menu_popup.popup(event->button, event->time);
-   		 return true; //It has been handled.
+   		return true; //It has been handled.
   	}
 	workplace->queue_draw();
 	return true;
@@ -148,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";
@@ -161,29 +175,54 @@ void And::save(FILE *archivo)
 
 bool And::check_connection()
 {
-	int cant_in = 0, cant_out =0;
 	t_logic_connector temp;
 	std::list<t_line>::iterator i = workplace->lista_lineas_in.begin();
 	while ( i != workplace->lista_lineas_in.end() ) {
-		if ( workplace->get_logic_item((*i).logic_id)->get_id() == ID ) {
+		if ( (*i).logic_id== ID ) {
 			temp.type = OUT;
 			temp.name_dest = workplace->get_item((*i).store_id)->get_name();
 			vec_connector.push_back(temp);
-			cant_out++;
 		}
 		i++;
 	}
 
 	i = workplace->lista_lineas_out.begin();
 	while ( i != workplace->lista_lineas_out.end() ) {
-		if ( workplace->get_logic_item((*i).logic_id)->get_id() == ID ) {
+		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++;
+	}
+
+	i = workplace->lista_lineas_logic.begin();
+	while ( i != workplace->lista_lineas_logic.end() ) {
+		if ( (*i).logic_id == ID ) {
+			temp.type = OUT;
+			temp.name_dest = workplace->get_logic_item((*i).store_id)->get_name();
 			vec_connector.push_back(temp);
-			cant_in++;
 		}
 		i++;
 	}
+
+	i = workplace->lista_lineas_logic.begin();
+	while ( i != workplace->lista_lineas_logic.end() ) {
+		if ( (*i).store_id == ID ) {
+			temp.type = IN;
+			temp.name_dest = workplace->get_logic_item((*i).logic_id)->get_name();
+			vec_connector.push_back(temp);
+		}
+		i++;
+	}
+
 	return true; //out_connected;
 }
 
@@ -263,6 +302,11 @@ void And::set_out_connected(bool _o)
 	out_connected = _o;
 }
 
+bool And::get_out_logic_connect()
+{
+	return out_connected;
+}
+
 void And::draw_connectors()
 {
 	Glib::RefPtr<Gdk::Window> window = get_window();