X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/65e0e3da6246674b0014c3a7c10aeecb61499725..4addf1434015a4a1212c7949c1a44dba977c0a39:/Constructor/src/cistern.cpp

diff --git a/Constructor/src/cistern.cpp b/Constructor/src/cistern.cpp
index 2f7a02c..8ba4e45 100644
--- a/Constructor/src/cistern.cpp
+++ b/Constructor/src/cistern.cpp
@@ -1,12 +1,15 @@
 #include "cistern.h"
 #include "cisternptywnd.h"
+#include "not.h"
 
 Cistern::Cistern(int orientacion)
 {
-	in_x = x;
+	in_x = x+5;
 	in_y = y+16;
 	out_x = x + 48;
 	out_y = y + 64;
+	capacidad = 100.0;
+	contenido_inicial = 0;
 	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");
@@ -32,7 +35,7 @@ Cistern::Cistern(int orientacion)
 	temp.type = IN;
 	connect_vec.push_back(temp); // entrada arriba
 	temp.type = OUT;
-	connect_vec.push_back(temp); // salida abajo
+	connect_vec.push_back(temp); // entrada abajo
 }
 
 Cistern::~Cistern()
@@ -44,21 +47,55 @@ bool Cistern::on_button_press_event(GdkEventButton *event)
 	GdkEventExpose e;
 	t_line tmp_line;
 	if ((event->type == GDK_BUTTON_PRESS) && ( event->button == 1)) {
-		combo_entry->set_text(name);
 		WorkPlace::pointed = ID;
+		list_pointed->push_back(name);
+		combo_entry->set_popdown_strings(*list_pointed);
+		combo_entry->get_entry()->set_text (name);
 		if (CItem::logic_connect && CItem::gate_id != -1) {
-			if ( detect_click_position(event->x, event->y) == IN ){
-				tmp_line.logic_id =  workplace->get_logic_item(CItem::gate_id)->get_id();
-				tmp_line.store_id = ID;
-				workplace->lista_lineas_in.push_back(tmp_line);
-				workplace->queue_draw();
-			} else if (detect_click_position(event->x, event->y) == OUT) { 
-				tmp_line.logic_id =  workplace->get_logic_item(CItem::gate_id)->get_id();
-				tmp_line.store_id = ID;
-				workplace->lista_lineas_out.push_back(tmp_line);
-				workplace->queue_draw();
+			if ( detect_click_position((int)event->x, (int)event->y) == IN){
+				if (dynamic_cast<Not *>(workplace->get_logic_item(CItem::gate_id))) {
+					if ( !dynamic_cast<Not *>(workplace->get_logic_item(CItem::gate_id))->get_in_logic_connect()) {
+						workplace->get_logic_item(CItem::gate_id)->set_in_connected(true);
+						tmp_line.logic_id =  CItem::gate_id;
+						tmp_line.cistern_out1 = true;
+						tmp_line.store_id = ID;
+						workplace->lista_lineas_out.push_back(tmp_line);
+						workplace->queue_draw();
+					}
+				} else {
+						tmp_line.logic_id =  CItem::gate_id;
+						tmp_line.cistern_out1 = true;
+						tmp_line.store_id = ID;
+						workplace->lista_lineas_out.push_back(tmp_line);
+						workplace->queue_draw();					
+				}
+			} else if (detect_click_position((int)event->x, (int)event->y) == OUT )  { 
+				if (dynamic_cast<Not *>(workplace->get_logic_item(CItem::gate_id))) {
+					if ( !dynamic_cast<Not *>(workplace->get_logic_item(CItem::gate_id))->get_in_logic_connect()) {
+						workplace->get_logic_item(CItem::gate_id)->set_in_connected(true);
+						tmp_line.logic_id =  CItem::gate_id;
+						tmp_line.store_id = ID;
+						tmp_line.cistern_out1 = false;
+						workplace->lista_lineas_out.push_back(tmp_line);
+						workplace->queue_draw();
+					}
+				} else {
+					tmp_line.logic_id =  CItem::gate_id;
+					tmp_line.store_id = ID;
+					tmp_line.cistern_out1 = false;
+					workplace->lista_lineas_out.push_back(tmp_line);
+					workplace->queue_draw();
+				}					
 			}
+			CItem::gate_id = -1;
 		}
+		char f[20], g[25];
+		Glib::ustring text;
+		sprintf(f,"  Capacidad: %.1f  ",capacidad);
+		sprintf(g,"Contenido Inicial: %.1f",contenido_inicial);
+		text = name+ f;
+		text += g;
+		status_bar->push ( text, 0);		
 	}
 	
 	if ((event->type == GDK_BUTTON_PRESS) && ( event->button ==2)){
@@ -68,7 +105,7 @@ bool Cistern::on_button_press_event(GdkEventButton *event)
 		switch (imgActual) {
 			case 1:
 				image = imageO;
-				in_x = x + image->get_width();
+				in_x = x + image->get_width()-5;
 				in_y = y + 16;
 				out_x = x+16;
 				out_y = y + image->get_height();
@@ -76,7 +113,7 @@ bool Cistern::on_button_press_event(GdkEventButton *event)
 			default: 
 				imgActual = 0;
 				image = imageE;			
-				in_x = x;
+				in_x = x+5;
 				in_y = y+16;
 				out_x = x + image->get_width() -16;
 				out_y = y + image->get_height();
@@ -237,7 +274,6 @@ void Cistern::get_out_logic_connect_position(int& _a, int& _b)
 	
 ConnectorType Cistern::detect_click_position(int _a, int _b)
 {
-	//VER DONDE CAEN LOS CLICKS!!!!!!!!!!!!!! SI ES CON RESPECTO AL WORKPLACE O AL ITEM!!!
 	switch(imgActual) {
 		case 0:
 			if ( (_a<=32) &&(_a>=0)&&(_b<=32)&&(_b>=0) )
@@ -258,15 +294,26 @@ void Cistern::update_logic_position()
 {
 	switch (imgActual) {
 		case 1:
-			in_x = x + image->get_width();
+			in_x = x + image->get_width()-5;
 			in_y = y + 16;
 			out_x = x+16;
 			out_y = y + image->get_height();
 			break;
 		case 0: 
-			in_x = x;
+			in_x = x+5;
 			in_y = y+16;
 			out_x = x + image->get_width() -16;
 			out_y = y + image->get_height();
 	}
 }
+
+void Cistern::draw_connectors()
+{
+	if ( in_x != -1 ) {
+		Glib::RefPtr<Gdk::Window> window = get_window();
+		gc->set_foreground(blue);
+		window->draw_rectangle(gc, 1, in_x-5-x, in_y-y, 10, 10);
+		window->draw_rectangle(gc, 1, out_x-5-x, out_y-y-10, 10, 10);
+		queue_draw();
+	}
+}