X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/57ae549a3b51ba148315ff4e64da089203cc7c02..f1f01b21410b676a9c35c93251d5739bb65c711d:/Constructor/src/or.cpp?ds=sidebyside

diff --git a/Constructor/src/or.cpp b/Constructor/src/or.cpp
index 9668cac..4cbd535 100644
--- a/Constructor/src/or.cpp
+++ b/Constructor/src/or.cpp
@@ -1,18 +1,45 @@
 #include "or.h"
 
-Or::Or()
+Or::Or(int orientacion)
 {
-	in_x = x;
-	in_y = y+16;
-	out_x = x+32;
-	out_y = y+16;
+	is_logic = true;
+	out_connected = false;
 	imageN = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/or_n.png");
 	imageS = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/or_s.png");
 	imageE = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/or_e.png");
 	imageO = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/or_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 = "or";
 	menulist.push_back( Gtk::Menu_Helpers::ImageMenuElem("Conectar", menu_image_linea,SigC::slot(*this, &CItem::on_menu_popup_conectar) ) ) ;
@@ -25,10 +52,19 @@ Or::~Or()
 bool Or::on_button_press_event(GdkEventButton *event)
 {
 	if ((event->type == GDK_BUTTON_PRESS) && ( event->button == 1)) {
-		CItem::logic_connect = true;
-		CItem::gate_id = ID;
-		combo_entry->set_text(name);
-		WorkPlace::pointed = 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);
 	}
 	
 	if ((event->type == GDK_BUTTON_PRESS) && ( event->button == 2)){
@@ -100,7 +136,7 @@ void Or::save(FILE *archivo)
 	dato += c_img;
 	dato += c_x;
 	dato += c_y;
-	for ( int i=0; i<=vec_connector.size()-1; i++) {
+	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";
@@ -119,9 +155,9 @@ bool Or::check_connection()
 	t_logic_connector temp;
 	std::list<t_line>::iterator i = workplace->lista_lineas_in.begin();
 	while ( i != workplace->lista_lineas_in.end() ) {
-		if ( (*i).logic->get_id() == ID ) {
+		if ( workplace->get_logic_item((*i).logic_id)->get_id() == ID ) {
 			temp.type = OUT;
-			temp.name_dest = (*i).store->get_name();
+			temp.name_dest = workplace->get_item((*i).store_id)->get_name();
 			vec_connector.push_back(temp);
 			cant_out++;
 		}
@@ -130,17 +166,17 @@ bool Or::check_connection()
 
 	i = workplace->lista_lineas_out.begin();
 	while ( i != workplace->lista_lineas_out.end() ) {
-		if ( (*i).logic->get_id() == ID ) {
+		if ( workplace->get_logic_item((*i).logic_id)->get_id() == ID ) {
 			temp.type = IN;
-			temp.name_dest = (*i).store->get_name();
+			temp.name_dest = workplace->get_item((*i).store_id)->get_name();
 			vec_connector.push_back(temp);
 			cant_in++;
 		}
 		i++;
 	}
 
-	//FIXME   la or tiene n entradas y una salida!!!!!!!!!!!!!!!!!!
-	return true;// (cant_in == cant_out );
+	
+	return true;// out_connected;
 }
 
 ConnectorType Or::detect_click_position(int _a, int _b)
@@ -213,3 +249,8 @@ void Or::get_out_logic_connect_position(int& _a, int& _b)
 	_a =out_x;
 	_b =out_y;
 }
+
+void Or::set_out_connected(bool _o)
+{
+	out_connected = _o;
+}