X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/34fb46485db0fb44f8dcc532866d988f8e54caa2..d664a4c16bb56138b53e8d6dba92e199bd3ea6c7:/Constructor/workplace.cpp?ds=inline

diff --git a/Constructor/workplace.cpp b/Constructor/workplace.cpp
index 1e7ceab..652cf01 100644
--- a/Constructor/workplace.cpp
+++ b/Constructor/workplace.cpp
@@ -1,9 +1,8 @@
 #include "workplace.h"
+#include "item.h"
 
 WorkPlace::WorkPlace( BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml> &refGlade):Gtk::Fixed(cobject)
 {
-	refGlade->get_widget_derived("viewport",viewport);
-	viewport->workplace = this;
 }
 
 WorkPlace::~WorkPlace()
@@ -22,12 +21,18 @@ bool WorkPlace::on_expose_event(GdkEventExpose *event)
 			get_window()->draw_point (get_style()->get_black_gc(), x-1,y);
 		}
 		
-/*	std::list<t_line>::iterator i = lista_lineas.begin();
+	
+	Glib::RefPtr<Gdk::GC> gc = get_style()->get_black_gc();
+	Gdk::Color color;
+	color.set_rgb(255,0,0);
+	gc->set_rgb_bg_color(color);
+	get_style()->set_black(color);
+	std::list<t_line>::iterator i = lista_lineas.begin();
 	while ( i != lista_lineas.end() ) {
 		t_line temp = *i;
-		get_window()->draw_line (get_style()->get_black_gc(), temp.x,temp.y,temp.w,temp.z);
+		get_window()->draw_line (get_style()->get_black_gc(), temp.logic->get_position_x(),temp.logic->get_position_y(), temp.store->get_position_x(),temp.store->get_position_y());
 		i++;
-	}*/
+	}
 	return true;
 }
 
@@ -37,10 +42,45 @@ void WorkPlace::delete_item(int _id)
 	while ( i != listaItems->end() ){
 	CItem *temp = *i;
 		if ( temp->get_id() == _id ){
+			delete_line(_id);
+			listaItems->erase(i);
+			delete temp;
+			break;
+		}
+		i++;
+	}
+	i = lista_logic_Items->begin();
+	while ( i != lista_logic_Items->end() ){
+	CItem *temp = *i;
+		if ( temp->get_id() == _id ){
+			delete_line(_id);
 			listaItems->erase(i);
 			delete temp;
 			break;
 		}
 		i++;
 	}
+	
+}
+
+CItem* WorkPlace::get_logic_item(int _id)
+{
+	std::list<CItem *>::iterator i = lista_logic_Items->begin();
+	while ( i != lista_logic_Items->end() ){
+		CItem *temp = *i;
+		if ( temp->get_id() == _id ) 
+			return temp;
+		i++;
+	}
+	return NULL;
+}
+
+void WorkPlace::delete_line(int _id)
+{
+	std::list<t_line>::iterator i = lista_lineas.begin();
+	while ( i != lista_lineas.end() ){
+		if ( (*i).logic->get_id() == _id || (*i).store->get_id == _id)
+			lista_lineas.erase(i);
+		i++;
+	}
 }