X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/667418327423ba116d24751926a95a2f1235849c..c0e0cf58ce033421d125afb813636f102456592c:/Constructor/src/cistern.cpp?ds=sidebyside

diff --git a/Constructor/src/cistern.cpp b/Constructor/src/cistern.cpp
index 6cb0323..d39a66c 100644
--- a/Constructor/src/cistern.cpp
+++ b/Constructor/src/cistern.cpp
@@ -1,13 +1,20 @@
 #include "cistern.h"
 #include "cisternptywnd.h"
 
-Cistern::Cistern()
+Cistern::Cistern(int orientacion)
 {
 	imageE = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/tanque_e.png");
 	imageO = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/tanque_o.png");
 	null = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/tanque_null.png");
-	imgActual = 0;
-	image = imageE;
+	imgActual = orientacion;
+	switch (imgActual) {
+		case 1:
+			image = imageO;
+			break;
+		default: 
+			imgActual = 0;
+			image = imageE;			
+	}
 	set_size_request(image->get_width(), image->get_height());
 
 	Glib::RefPtr<Gnome::Glade::Xml> ref = Gnome::Glade::Xml::create(PACKAGE_DATA_DIR"/plaqui-constructor/dialogs/constructor.glade", "cistern_pty_wnd");
@@ -34,13 +41,13 @@ bool Cistern::on_button_press_event(GdkEventButton *event)
 	t_line tmp_line;
 	if ((event->type == GDK_BUTTON_PRESS) && ( event->button == 1)) {
 		combo_entry->set_text(name);
+		WorkPlace::pointed = ID;
 		if (CItem::logic_connect) {
 			tmp_line.logic =  workplace->get_logic_item(CItem::quien);
 			tmp_line.store = this;
 			workplace->lista_lineas.push_back(tmp_line);
 			workplace->on_expose_event(&e);
 		}
-		CItem::logic_connect = false;	
 	}
 	
 	if ((event->type == GDK_BUTTON_PRESS) && ( event->button ==2)){
@@ -70,6 +77,7 @@ bool Cistern::on_button_press_event(GdkEventButton *event)
 		cistern_pty_wnd->txt_cistern_name->set_text( name );
 		cistern_pty_wnd->show();
 	}		
+	workplace->on_expose_event(&e);
 	return true;
 }
 
@@ -195,3 +203,16 @@ void Cistern::set_default_connector()
 	connect_vec[0].type = IN;
 	connect_vec[1].type = OUT;
 }
+
+void Cistern::get_logic_connect_position(int& _a, int& _b)
+{
+	switch(imgActual) {
+		case 0: 
+			_a = x;
+			_b = y + 10;
+			break;
+		case 1: 
+			_a = x +image->get_width();
+			_b = y + 10;
+	}
+}