X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/663eccb7e27110aba6c79648c38254a7a5737bca..20f30a0ae955fb71428ab382aeaf025a5f93b7e1:/Constructor/src/and.cpp

diff --git a/Constructor/src/and.cpp b/Constructor/src/and.cpp
index 327e7c2..504747b 100644
--- a/Constructor/src/and.cpp
+++ b/Constructor/src/and.cpp
@@ -1,19 +1,45 @@
 #include "and.h"
 
-And::And()
+And::And(int orientacion)
 {
+	is_logic = true;
 	out_connected = false;
-	in_x = x;
-	in_y = y+16;
-	out_x = x+32;
-	out_y = y+16;
 	imageN = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/and_n.png");
 	imageS = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/and_s.png");
 	imageE = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/and_e.png");
 	imageO = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/and_o.png");
 	null = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/null.png");
-	imgActual = 0;
-	image = imageE;
+	imgActual = orientacion;
+	switch (imgActual) {
+		case 1:
+			image = imageS;
+			in_x = x +16;
+			in_y = y;
+			out_x = x+16;
+			out_y = y+32;
+			break;
+		case 2:
+			image = imageO;
+			in_x = x+32;
+			in_y = y+16;
+			out_x = x;
+			out_y = y+16;
+			break;
+		case 3:
+			image = imageN;
+			in_x = x+16;
+			in_y = y+32;
+			out_x = x+16;
+			out_y = y;
+			break;
+		default: 
+			imgActual = 0;
+			image = imageE;			
+			in_x = x;
+			in_y = y+16;
+			out_x = x+32;
+			out_y = y+16;
+	}
 	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) ) ) ;
@@ -26,20 +52,35 @@ And::~And()
 bool And::on_button_press_event(GdkEventButton *event)
 {
 	if ((event->type == GDK_BUTTON_PRESS) && ( event->button == 1)) {
-		if ( CItem::logic_connect ) {
-			if ( detect_click_position((int)event->x, (int)event->y ) == OUT && !out_connected) {
+		WorkPlace::pointed = ID;
+		t_line tmp_line;
+		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 && !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();
+					CItem::gate_id = -1;
+				}
+			} else {
 				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;
-			}
-		}			
+		}
+		if ( CItem::logic_connect && detect_click_position((int)event->x, (int)event->y ) == OUT && !out_connected) {
+			CItem::gate_id = ID;
+		}
 		list_pointed->push_back(name);
 		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)){
@@ -81,7 +122,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;
@@ -125,29 +166,47 @@ 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();
 			vec_connector.push_back(temp);
-			cant_in++;
 		}
 		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);
+		}
+		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;
 }
 
@@ -226,3 +285,46 @@ 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();
+	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();
+}