X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/fdff87853fcabe0b987f2706aad0e78503fa2058..ea3d0f30b8e44952b1b9ac3e2f5b2a08cd65ca48:/Constructor/src/workplace.cpp

diff --git a/Constructor/src/workplace.cpp b/Constructor/src/workplace.cpp
index 37b0aa4..5ebacf7 100644
--- a/Constructor/src/workplace.cpp
+++ b/Constructor/src/workplace.cpp
@@ -2,13 +2,13 @@
 #include "item.h"
 #include "pump.h"
 #include "exclusa.h"
+#include "not.h"
 
 int WorkPlace::pointed = -1;
 
 WorkPlace::WorkPlace(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml> &refGlade):Gtk::Fixed(cobject)
 {
 	gc = Gdk::GC::create(get_window());
-	std::cout << "Aca" << std::endl;
 	Glib::RefPtr<Gdk::Colormap> colormap = gc->get_colormap();
 	color_in = Gdk::Color("red");
 	color_out = Gdk::Color("blue");
@@ -26,7 +26,6 @@ void WorkPlace::on_realize()
 {
 	Gtk::Fixed::on_realize();
 	gc = Gdk::GC::create(get_window());
-	std::cout << "Aca" << std::endl;
 	Glib::RefPtr<Gdk::Colormap> colormap = gc->get_colormap();
 	color_in = Gdk::Color("red");
 	color_out = Gdk::Color("blue");
@@ -114,20 +113,33 @@ bool WorkPlace::on_expose_event(GdkEventExpose *event)
 				case 3:
 					y_offset = 15;
 			}
-			get_item(temp.store_id)->get_out_logic_connect_position(w,z);
+			if ( temp.cistern_out1 ) 
+				get_item(temp.store_id)->get_in_logic_connect_position(w,z);
+			else
+				get_item(temp.store_id)->get_out_logic_connect_position(w,z);
 			get_logic_item(temp.logic_id)->get_in_logic_connect_position(a, b);
 			draw_line(w+item_y_offset, z+item_y_offset, a+x_offset, b+y_offset,color_out);
 			get_window()->draw_line(gc, a, b, a+x_offset, b+y_offset);
 		}
 		i++;
 	}
+	
+	i = lista_lineas_logic.begin();
+	while ( i != lista_lineas_logic.end() ) {
+		t_line temp = *i;
+		if ( get_logic_item(temp.store_id) != NULL && get_logic_item(temp.logic_id) != NULL ) {
+			get_logic_item(temp.logic_id)->get_out_logic_connect_position(w,z);
+			get_logic_item(temp.store_id)->get_in_logic_connect_position(a, b);
+			get_window()->draw_line(gc, a, b, w,z);
+		}
+		i++;
+	}
 	return true;
 }
 
 void WorkPlace::delete_item(int _id)
 {
 	delete_line(_id);
-	CItem::logic_connect = false;
 	std::list<CItem*>::iterator i = listaItems->begin();
 	while ( i != listaItems->end() ){
 	CItem *temp = *i;
@@ -173,19 +185,44 @@ CItem *WorkPlace::get_item(int _id)
 	return NULL;
 }
 
+int WorkPlace::get_logic_id(const std::string &_s)
+{
+	std::list<CItem *>::iterator i = lista_logic_Items->begin();
+	while ( i != lista_logic_Items->end() ){
+		if ( (*i)->get_name() == _s ) 
+			return (*i)->get_id();
+		i++;
+	}
+	return -1;
+}
+
+int WorkPlace::get_item_id(const std::string &_s)
+{
+	std::list<CItem *>::iterator i = listaItems->begin();
+	while ( i != listaItems->end() ){
+		if ( (*i)->get_name() == _s ) 
+			return (*i)->get_id();
+		i++;
+	}
+	return -1;
+}
 	
 void WorkPlace::delete_line(int _id)
 {
+	/* LINEAS A LAS ENTRADAS DE LOS ITEMS */
+	/*	Borro la linea desde el item eliminado hasta el que este conectado */
 	std::list<t_line>::iterator i = lista_lineas_in.begin();
 	while ( i != lista_lineas_in.end() ){
 		if (get_item( (*i).store_id ) != NULL)
 			if ( get_item( (*i).store_id )->get_id() == _id ) {
+				get_logic_item((*i).logic_id)->set_out_connected(false);	
 				lista_lineas_in.erase(i);
 				i = lista_lineas_in.begin();
 			}
 		i++;
 	}
-
+	
+	/* Borra la linea desde la compuerta eliminada hasta el item conectado a ella */
 	i = lista_lineas_in.begin();
 	while ( i != lista_lineas_in.end() ){
 		if ( get_logic_item((*i).logic_id) != NULL)
@@ -195,17 +232,22 @@ void WorkPlace::delete_line(int _id)
 			}
 		i++;
 	}
-
+	
+	/* LINEAS A LAS SALIDAS DE LOS ITEMS */
+	/*	Borro la linea desde el item eliminado hasta el que este conectado */
 	std::list<t_line>::iterator j = lista_lineas_out.begin();
 	while ( j != lista_lineas_out.end() ){
 		if ( get_item((*j).store_id) != NULL )
 			if ( get_item((*j).store_id)->get_id() == _id ) {
+				if (dynamic_cast<Not *>(get_logic_item((*j).logic_id))) 
+					get_logic_item((*j).logic_id)->set_in_connected(false);
 				lista_lineas_out.erase(j);
 				j = lista_lineas_out.begin();
 			}
 		j++;
 	}	
-
+	
+	/* Borra la linea desde la compuerta eliminada hasta el item conectado a ella */
 	j = lista_lineas_out.begin();
 	while ( j != lista_lineas_out.end() ){
 		if ( get_logic_item((*j).logic_id) != NULL )
@@ -215,6 +257,33 @@ void WorkPlace::delete_line(int _id)
 			}
 		j++;
 	}	
+	
+	/* LINEAS ENTRE COMPUERTAS */
+	/* Borra la linea entre al compuerta eliminada y la que esta conectada a ella en su entrada */
+	std::list<t_line>::iterator k = lista_lineas_logic.begin();
+	while ( k != lista_lineas_logic.end() ){
+		if ( get_logic_item((*k).store_id) != NULL )
+			if ( get_logic_item((*k).store_id)->get_id() == _id ) {
+				get_logic_item((*k).logic_id)->set_out_connected(false);
+				std::cout<< get_logic_item((*k).logic_id)->get_name() <<std::endl;
+				lista_lineas_logic.erase(k);
+				k = lista_lineas_logic.begin();
+			}
+		k++;
+	}	
+	
+	/* Borra la linea entre al compuerta eliminada y la que esta conectada a ella en su salida*/
+	k = lista_lineas_logic.begin();
+	while ( k != lista_lineas_logic.end() ){
+		if ( get_logic_item((*k).logic_id) != NULL )
+			if ( get_logic_item((*k).logic_id)->get_id() == _id ) {
+				if (dynamic_cast<Not *>(get_logic_item((*k).store_id))) 
+					get_logic_item((*k).store_id)->set_in_connected(false);
+				lista_lineas_logic.erase(k);
+				k = lista_lineas_logic.begin();
+			}
+		k++;
+	}	
 }
 
 void WorkPlace::update_logic_position()
@@ -239,3 +308,15 @@ void WorkPlace::draw_line(int x1, int y1, int x2, int y2, Gdk::Color &color)
 	get_window()->draw_line (gc, x1, y2, x2, y2);
 }
 
+
+bool WorkPlace::chek_name(Glib::ustring _name, int _id)
+{
+	std::list<CItem *>::iterator i;
+	i  = listaItems->begin();
+	while ( i != listaItems->end() ) {
+		if ( (*i)->get_name() == _name && (*i)->get_id() != _id )
+				return true;
+		i++;
+	}
+	return false;
+}