cambio la sintaxis XML de las compuertas

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

diff --git a/Client/src/item_exclusa.cpp b/Client/src/item_exclusa.cpp
index 39f2a880b2ca8d9f866697feb7d996899e8a8b6f..4a3e7b40b43db32073cef67222bf0ff61086cd90 100644 (file)
--- a/Client/src/item_exclusa.cpp
+++ b/Client/src/item_exclusa.cpp
@@ -6,9 +6,25 @@ ViewExclusa::ViewExclusa(Glib::ustring _name, int orientacion):ViewItem(_name)
        switch (orientacion) {
                case 0:
                        image.set(PACKAGE_DATA_DIR"/plaqui-client/pixmaps/exclusa_h.png");
        switch (orientacion) {
                case 0:
                        image.set(PACKAGE_DATA_DIR"/plaqui-client/pixmaps/exclusa_h.png");

+                       in_x = 32;
+                       in_y = 0;
+                       out_x = 32;
+                       out_y = 32;
+                       offset_x = 0;
+                       offset_y = 0;
+                       item_offset_x = 0;
+                       item_offset_y = -15;

                break;
                case 1:
                        image.set(PACKAGE_DATA_DIR"/plaqui-client/pixmaps/exclusa_s.png");
                break;
                case 1:
                        image.set(PACKAGE_DATA_DIR"/plaqui-client/pixmaps/exclusa_s.png");

+                       in_x = 32;
+                       in_y = 32;
+                       out_x = 0;
+                       out_y = 32;
+                       offset_x = 0;
+                       offset_y = 0;
+                       item_offset_x = 0;
+                       item_offset_y = 15;

        }
        m_or = orientacion;
        image.show();
        }
        m_or = orientacion;
        image.show();


@@ -21,19 +37,21 @@ ViewExclusa::~ViewExclusa()
 
 bool ViewExclusa::on_image_expose_event(GdkEventExpose *e)
 {
 
 bool ViewExclusa::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);
        int w,h;
        w = image.get_width();
        h = image.get_height();
        colormap->alloc_color(color);
        gc->set_foreground(color);
        gc->set_background(color);
        int w,h;
        w = image.get_width();
        h = image.get_height();

+       if (actual_flow == 0) return true;

        switch (m_or) {
                case 1: // Vertical
        switch (m_or) {
                case 1: // Vertical

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

                break;
                case 0: // Horizontal
                break;
                case 0: // Horizontal

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

        }
        }

+       return true;

 }
 
 }