X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/ea7708f0d91b00a54cc5f136a67e9f9bd272329d..a4fcf877753b034b1df7fa73d41388849fbc9000:/Constructor/src/workplace.cpp?ds=sidebyside

diff --git a/Constructor/src/workplace.cpp b/Constructor/src/workplace.cpp
index 94e3934..f889352 100644
--- a/Constructor/src/workplace.cpp
+++ b/Constructor/src/workplace.cpp
@@ -3,43 +3,80 @@
 
 int WorkPlace::pointed = -1;
 
-WorkPlace::WorkPlace( BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml> &refGlade):Gtk::Fixed(cobject)
+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");
+	color_dot = Gdk::Color("black");
+	colormap->alloc_color(color_in);
+	colormap->alloc_color(color_out);
+	colormap->alloc_color(color_dot);
 }
 
 WorkPlace::~WorkPlace()
 {
 }
 
+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");
+	colormap->alloc_color(color_in);
+	colormap->alloc_color(color_out);
+}
+
 bool WorkPlace::on_expose_event(GdkEventExpose *event)
 {
 	int x, y;
+	gc->set_foreground(color_dot);
 	for(x=0; x<get_width(); x+=32) 
 		for (y=0; y<get_height();y+=32){
-			get_window()->draw_point (get_style()->get_black_gc(), x,y);
-			get_window()->draw_point (get_style()->get_black_gc(), x,y+1);
-			get_window()->draw_point (get_style()->get_black_gc(), x,y-1);
-			get_window()->draw_point (get_style()->get_black_gc(), x+1,y);
-			get_window()->draw_point (get_style()->get_black_gc(), x-1,y);
+			get_window()->draw_point (gc, x,y);
+			get_window()->draw_point (gc, x,y+1);
+			get_window()->draw_point (gc, x,y-1);
+			get_window()->draw_point (gc, x+1,y);
+			get_window()->draw_point (gc, x-1,y);
 		}
 		
 	if ( *logica ) {	
 		std::list<CItem *>::iterator j = listaItems->begin();
 		while ( j != listaItems->end() ) {
 			(*j)->update_logic_position();
-			(*j)->draw_connectors();
 			j++;
 		}
 	}
 	
-	int a, b, w, z;		
+	int a, b, w, z, x_offset, y_offset, img;
 	std::list<t_line>::iterator i = lista_lineas_in.begin();
 	while ( i != lista_lineas_in.end() ) {
 		t_line temp = *i;
 		if ( get_item(temp.store_id) != NULL && get_logic_item(temp.logic_id) != NULL ) {
-			get_item(temp.store_id)->get_in_logic_connect_position(w,z);
+			img = get_logic_item(temp.logic_id)->get_img_actual();
+			x_offset = y_offset = 0;
+			switch (img) {
+				case 0:
+					x_offset = 15;
+				break;
+				case 1:
+					y_offset = 15;
+				break;
+				case 2:
+					x_offset = -15;
+				break;
+				case 3:
+					y_offset = -15;
+			}
 			get_logic_item(temp.logic_id)->get_out_logic_connect_position(a, b);
-			draw_line(a, b, w,z);
+			get_item(temp.store_id)->get_in_logic_connect_position(w,z);
+			draw_line(a+x_offset, b+y_offset, w,z, color_in);
+			get_window()->draw_line(gc, a, b, a+x_offset, b+y_offset);
 		}
 		i++;
 	}
@@ -47,9 +84,26 @@ bool WorkPlace::on_expose_event(GdkEventExpose *event)
 	while ( i != lista_lineas_out.end() ) {
 		t_line temp = *i;
 		if ( get_item(temp.store_id) != NULL && get_logic_item(temp.logic_id) != NULL ) {
+			img = get_logic_item(temp.logic_id)->get_img_actual();
+			x_offset = y_offset = 0;
+			switch (img) {
+				case 0:
+					x_offset = 15;
+				break;
+				case 1:
+					y_offset = 15;
+				break;
+				case 2:
+					x_offset = -15;
+				break;
+				case 3:
+					y_offset = -15;
+			}
 			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, z, a, b);
+//			draw_line(w, z, a, b, color_out);
+			draw_line(w, z, a+x_offset, b+y_offset,color_out);
+			get_window()->draw_line(gc, a, b, a+x_offset, b+y_offset);
 		}
 		i++;
 	}
@@ -163,8 +217,11 @@ void WorkPlace::update_logic_position()
 	}
 }
 		
-void WorkPlace::draw_line(int x1, int y1, int x2, int y2)
+void WorkPlace::draw_line(int x1, int y1, int x2, int y2, Gdk::Color &color)
 {
-	get_window()->draw_line (get_style()->get_black_gc(), x1, y1, x1, y2);
-	get_window()->draw_line (get_style()->get_black_gc(), x1, y2, x2, y2);
+	gc->set_foreground(color);
+	gc->set_line_attributes(3, Gdk::LINE_SOLID, Gdk::CAP_NOT_LAST, Gdk::JOIN_MITER);
+	get_window()->draw_line (gc, x1, y1, x1, y2);
+	get_window()->draw_line (gc, x1, y2, x2, y2);
 }
+