X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/f1f01b21410b676a9c35c93251d5739bb65c711d..913bfb3f1238e29dfcc564fd1d4c836dbd412227:/Constructor/src/or.cpp

diff --git a/Constructor/src/or.cpp b/Constructor/src/or.cpp
index 4cbd535..ae6cf2c 100644
--- a/Constructor/src/or.cpp
+++ b/Constructor/src/or.cpp
@@ -1,4 +1,5 @@
 #include "or.h"
+#include "cistern.h"
 
 Or::Or(int orientacion)
 {
@@ -42,7 +43,6 @@ Or::Or(int orientacion)
 	}
 	set_size_request(image->get_width(), image->get_height());
 	name = "or";
-	menulist.push_back( Gtk::Menu_Helpers::ImageMenuElem("Conectar", menu_image_linea,SigC::slot(*this, &CItem::on_menu_popup_conectar) ) ) ;
 }
 
 Or::~Or()
@@ -52,19 +52,33 @@ Or::~Or()
 bool Or::on_button_press_event(GdkEventButton *event)
 {
 	if ((event->type == GDK_BUTTON_PRESS) && ( event->button == 1)) {
+		WorkPlace::pointed = ID;
+		t_line tmp_line;
+		if (CItem::logic_connect) {
+			if (CItem::gate_id != -1) {
+				if ( detect_click_position((int)event->x, (int)event->y) == IN && !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;
+					workplace->lista_lineas_logic.push_back(tmp_line);
+					workplace->queue_draw();
+				}
+			} else 
+				CItem::gate_id = ID;
+		}
 		if ( CItem::logic_connect ) {
 			if ( detect_click_position((int)event->x, (int)event->y ) == OUT && !out_connected) {
 				CItem::gate_id = ID;
-				WorkPlace::pointed = ID;
 			} 
-			if ( detect_click_position((int)event->x, (int)event->y ) == IN ) {
-				CItem::gate_id = ID;
-				WorkPlace::pointed = ID;
-			}
 		}
 		list_pointed->push_back(name);
 		combo_entry->set_popdown_strings(*list_pointed);
 		combo_entry->get_entry()->set_text (name);
+		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)){
@@ -138,8 +152,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 += "\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";
@@ -149,15 +173,18 @@ void Or::save(FILE *archivo)
 	fprintf(archivo, dato.c_str() );
 }
 
+//<entrada><tanque id="superior">tanque1</tanque></entrada>
+
 bool Or::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();
+			temp.cistern_connector = -1;
 			vec_connector.push_back(temp);
 			cant_out++;
 		}
@@ -166,17 +193,46 @@ bool Or::check_connection()
 
 	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.
+			std::cout<<"cistern_connector = "<<temp.cistern_connector<<std::endl;
 			vec_connector.push_back(temp);
 			cant_in++;
 		}
 		i++;
 	}
 
-	
-	return true;// out_connected;
+	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();
+			temp.cistern_connector = -1;
+			vec_connector.push_back(temp);
+			cant_out++;
+		}
+		i++;
+	}
+	return true;
 }
 
 ConnectorType Or::detect_click_position(int _a, int _b)
@@ -254,3 +310,46 @@ void Or::set_out_connected(bool _o)
 {
 	out_connected = _o;
 }
+
+bool Or::get_out_logic_connect()
+{
+	return out_connected;
+}
+
+void Or::draw_connectors()
+{
+	Glib::RefPtr<Gdk::Window> window = get_window();
+	int a,b,c,d;
+	switch (imgActual) {
+		case 0: 
+			a = in_x-x; 
+			b = in_y-y-5;
+			c = out_x-x-10;
+			d = out_y-y-5;
+		break;
+		case 1: 
+			a = in_x-x-5;
+			b = in_y-y;
+			c = out_x-x-5;
+			d = out_y-y-10;
+		break;
+		case 2:
+			a = in_x-x-10;
+			b = in_y-y-5;
+			c = out_x-x;
+			d = out_y-y-5;
+		break;
+		case 3:
+			a = in_x-x-5;
+			b = in_y-y-10;
+			c = out_x-x-5;
+			d = out_y-y;
+	}
+	gc->set_foreground(red);
+	gc->set_background(red);
+	window->draw_rectangle(gc, 1, a, b, 10, 10);
+	gc->set_foreground(blue);
+	gc->set_background(blue);
+	window->draw_rectangle(gc, 1, c, d, 10, 10);
+	queue_draw();
+}