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

diff --git a/Constructor/src/workplace.cpp b/Constructor/src/workplace.cpp
index 37b0aa4..847aa17 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");
@@ -87,6 +86,7 @@ bool WorkPlace::on_expose_event(GdkEventExpose *event)
 					y_offset = -15;
 			}
 			get_logic_item(temp.logic_id)->get_out_logic_connect_position(a, b);
+			get_logic_item(temp.logic_id)->set_out_connected(true);
 			get_item(temp.store_id)->get_in_logic_connect_position(w,z);
 			draw_line(a+x_offset, b+y_offset, w+item_x_offset, z+item_y_offset, color_in);
 			get_window()->draw_line(gc, a, b, a+x_offset, b+y_offset);
@@ -115,6 +115,8 @@ bool WorkPlace::on_expose_event(GdkEventExpose *event)
 					y_offset = 15;
 			}
 			get_item(temp.store_id)->get_out_logic_connect_position(w,z);
+			if (dynamic_cast<Not *>(get_logic_item(temp.logic_id))) 
+				get_logic_item(temp.logic_id)->set_in_connected(true);
 			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);
@@ -127,7 +129,6 @@ bool WorkPlace::on_expose_event(GdkEventExpose *event)
 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,6 +174,27 @@ 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)
 {
@@ -190,6 +212,7 @@ void WorkPlace::delete_line(int _id)
 	while ( i != lista_lineas_in.end() ){
 		if ( get_logic_item((*i).logic_id) != NULL)
 			if ( get_logic_item((*i).logic_id)->get_id() == _id) {
+				get_logic_item((*i).logic_id)->set_out_connected(false);	
 				lista_lineas_in.erase(i);
 				i = lista_lineas_in.begin();
 			}
@@ -210,6 +233,8 @@ void WorkPlace::delete_line(int _id)
 	while ( j != lista_lineas_out.end() ){
 		if ( get_logic_item((*j).logic_id) != NULL )
 			if ( get_logic_item((*j).logic_id)->get_id() == _id ) {
+				if (dynamic_cast<Not *>(get_logic_item((*i).logic_id))) 
+					get_logic_item((*j).logic_id)->set_in_connected(false);
 				lista_lineas_out.erase(j);
 				j = lista_lineas_out.begin();
 			}
@@ -238,4 +263,3 @@ void WorkPlace::draw_line(int x1, int y1, int x2, int y2, Gdk::Color &color)
 	get_window()->draw_line (gc, x1, y1, x1, y2);
 	get_window()->draw_line (gc, x1, y2, x2, y2);
 }
-