cambio la sintaxis XML de las compuertas

[z.facultad/75.42/plaqui.git] / Client / src / item_codo.cpp

diff --git a/Client/src/item_codo.cpp b/Client/src/item_codo.cpp
index 621262747bb5c8ad3bc77d956a0cb04eefc4e324..3dc290e84c664b7b886c001ce060fc41e3db199d 100644 (file)
--- a/Client/src/item_codo.cpp
+++ b/Client/src/item_codo.cpp
@@ -27,27 +27,37 @@ ViewCodo::~ViewCodo()
 
 bool ViewCodo::on_image_expose_event(GdkEventExpose *e)
 {
 
 bool ViewCodo::on_image_expose_event(GdkEventExpose *e)
 {

-       Glib::RefPtr<Gdk::Colormap> colormap = image.get_colormap();
+       Glib::RefPtr<Gdk::Colormap> colormap = Gtk::Widget::get_default_colormap();

        colormap->alloc_color(color);
        gc->set_foreground(color);
        gc->set_background(color);
        colormap->alloc_color(color);
        gc->set_foreground(color);
        gc->set_background(color);

+       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) {
+       if (actual_flow == 0) return true;
+       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);
+                       image.get_window()->draw_line(gc, 0, 16, 16, 16);
+                       image.get_window()->draw_line(gc, 64-16, 64-16, 64-16, 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);
+                       image.get_window()->draw_line(gc, 64-16, 0, 64-16, 16);
+                       image.get_window()->draw_line(gc, 0, 64-16, 16, 64-16);

                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);
+                       image.get_window()->draw_line(gc, 16, 0, 16, 16);
+                       image.get_window()->draw_line(gc, 64-16, 64-16, 64, 64-16);

                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);
+                       image.get_window()->draw_line(gc, 16, 64-16, 16, 64);
+                       image.get_window()->draw_line(gc, 64-16, 16, 64, 16);
+       }
+       return true;

 }
 
 }