Se mejora el codo (para que el color siga la curva).

diff --git a/Client/src/item_codo.cpp b/Client/src/item_codo.cpp
index 621262747bb5c8ad3bc77d956a0cb04eefc4e324..ce0f2b5ce4dfde7e1b2f27297c1cb42c0f1ab1bf 100644 (file)
--- a/Client/src/item_codo.cpp
+++ b/Client/src/item_codo.cpp
@@ -28,26 +28,40 @@ ViewCodo::~ViewCodo()
 bool ViewCodo::on_image_expose_event(GdkEventExpose *e)
 {
        Glib::RefPtr<Gdk::Colormap> colormap = image.get_colormap();
 bool ViewCodo::on_image_expose_event(GdkEventExpose *e)
 {
        Glib::RefPtr<Gdk::Colormap> colormap = image.get_colormap();

+       Gdk::Color blanco = Gdk::Color("white");
+       colormap->alloc_color(blanco);

        colormap->alloc_color(color);
        colormap->alloc_color(color);

-       gc->set_foreground(color);
-       gc->set_background(color);
+       gc->set_foreground(blanco);
+       gc->set_background(blanco);
+       gc->set_line_attributes(6, Gdk::LINE_SOLID, Gdk::CAP_NOT_LAST, Gdk::JOIN_MITER);

        int w,h;
        w = image.get_width();
        h = image.get_height();
        // TODO : hacer que dibuje arcos en el sentido del codo!
        int w,h;
        w = image.get_width();
        h = image.get_height();
        // TODO : hacer que dibuje arcos en el sentido del codo!

-       image.get_window()->draw_rectangle(gc, 1, w/2-5, h/2-5, 10, 10);
-/*     switch (orientacion) {
+       switch (m_or) {

                case 0:
                case 0:

-                       image.get_window()->draw_rectangle(gc, 1, w/2-4, 0, 4, h);
+                       image.get_window()->draw_arc(gc, 0, -16, 16, w, h, 0, 90*64);
+                       gc->set_line_attributes(4, Gdk::LINE_SOLID, Gdk::CAP_NOT_LAST, Gdk::JOIN_MITER);
+                       gc->set_foreground(color);
+                       image.get_window()->draw_arc(gc, 0, -16, 16, w, h, 0, 90*64);

                break;
                case 1:
                break;
                case 1:

-                       image.get_window()->draw_rectangle(gc, 1, w/2-4, 0, 4, h);
+                       image.get_window()->draw_arc(gc, 0, -16, -16, w, h, 0*64, -90*64);
+                       gc->set_line_attributes(4, Gdk::LINE_SOLID, Gdk::CAP_NOT_LAST, Gdk::JOIN_MITER);
+                       gc->set_foreground(color);
+                       image.get_window()->draw_arc(gc, 0, -16, -16, w, h, 0*64, -90*64);

                break;
                case 2:
                break;
                case 2:

-                       image.get_window()->draw_rectangle(gc, 1, w/2-4, 0, 4, h);
+                       image.get_window()->draw_arc(gc, 0, 16, -16, w, h, -90*64, -90*64);
+                       gc->set_line_attributes(4, Gdk::LINE_SOLID, Gdk::CAP_NOT_LAST, Gdk::JOIN_MITER);
+                       gc->set_foreground(color);
+                       image.get_window()->draw_arc(gc, 0, 16, -16, w, h, -90*64, -90*64);

                break;
                case 3:
                break;
                case 3:

-                       image.get_window()->draw_rectangle(gc, 1, w/2-4, 0, 4, h);
-       }*/
+                       image.get_window()->draw_arc(gc, 0, 16, 16, w, h, 90*64, 90*64);
+                       gc->set_line_attributes(4, Gdk::LINE_SOLID, Gdk::CAP_NOT_LAST, Gdk::JOIN_MITER);
+                       gc->set_foreground(color);
+                       image.get_window()->draw_arc(gc, 0, 16, 16, w, h, 90*64, 90*64);
+       }

 }
 
 }
 

diff --git a/Client/src/item_conduct.cpp b/Client/src/item_conduct.cpp
index e203b2f06204bffe103e27d9f0c9548a365eb7fc..f348945e40d1ad76a7bbafcf743eb66963ec774d 100644 (file)
--- a/Client/src/item_conduct.cpp
+++ b/Client/src/item_conduct.cpp
@@ -32,14 +32,14 @@ bool ViewConduct::on_image_expose_event(GdkEventExpose *e)
        h = image.get_height();
        switch (m_or) {
                case 0: // Vertical
        h = image.get_height();
        switch (m_or) {
                case 0: // Vertical

-                       image.get_window()->draw_rectangle(gc, 1, w/2-2, 0, 4, h);
+                       image.get_window()->draw_rectangle(gc, 1, w/2-2, 0, 4, h-1);

                        gc->set_foreground(blanco);
                        gc->set_foreground(blanco);

-                       image.get_window()->draw_rectangle(gc, 0, w/2-3, 0, 6, h);
+                       image.get_window()->draw_rectangle(gc, 0, w/2-3, 0, 6, h-1);

                break;
                case 1: // Horizontal
                break;
                case 1: // Horizontal

-                       image.get_window()->draw_rectangle(gc, 1, 0, h/2-2, h, 4);
+                       image.get_window()->draw_rectangle(gc, 1, 0, h/2-2, w-1, 4);

                        gc->set_foreground(blanco);
                        gc->set_foreground(blanco);

-                       image.get_window()->draw_rectangle(gc, 0, 0, h/2-3, h, 6);
+                       image.get_window()->draw_rectangle(gc, 0, 0, h/2-3, w-1, 6);

        }
 }
 
        }
 }