* Los colores ya estan completamente arreglados

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

diff --git a/Client/src/item_union.cpp b/Client/src/item_union.cpp
index 814bb2b7593deb06bf7f75de68a217448279f8e6..eee974e2aa8110c4f4c4ec5c8a114725d09901e1 100644 (file)
--- a/Client/src/item_union.cpp
+++ b/Client/src/item_union.cpp
@@ -6,17 +6,18 @@ ViewUnion::ViewUnion(Glib::ustring _name, int orientacion):ViewItem(_name)
 {
        switch (orientacion) {
                case 0:
 {
        switch (orientacion) {
                case 0:

-                       image.set("y_n.png");
+                       image.set(PACKAGE_DATA_DIR"/plaqui-client/pixmaps/y_n.png");

                break;
                case 1:
                break;
                case 1:

-                       image.set("y_e.png");
+                       image.set(PACKAGE_DATA_DIR"/plaqui-client/pixmaps/y_e.png");

                break;
                case 2:
                break;
                case 2:

-                       image.set("y_s.png");
+                       image.set(PACKAGE_DATA_DIR"/plaqui-client/pixmaps/y_s.png");

                break;
                case 3:
                break;
                case 3:

-                       image.set("y_o.png");
+                       image.set(PACKAGE_DATA_DIR"/plaqui-client/pixmaps/y_o.png");

        }
        }

+       m_or = orientacion;

        image.show();
        set_size_request();
 }
        image.show();
        set_size_request();
 }


@@ -25,3 +26,41 @@ ViewUnion::~ViewUnion()
 {
 }
 
 {
 }
 

+bool ViewUnion::on_image_expose_event(GdkEventExpose *e)
+{
+       Glib::RefPtr<Gdk::Colormap> colormap = Gtk::Widget::get_default_colormap();
+       if (!colormap->alloc_color(color, false, false)) {
+               std::cout << "ERROR ALOCANDO COLOR!" << std::endl;
+       }
+       gc->set_foreground(color);
+       gc->set_background(color);
+       
+       if (name == "union6") {
+               std::cout << color.get_red() << " " << color.get_green() << " " << color.get_blue() << std::endl;
+       }
+       int w,h;
+       w = image.get_width();
+       h = image.get_height();
+       if (actual_flow > 0) {
+               switch (m_or) {
+                       case 0:
+                               image.get_window()->draw_rectangle(gc, 1, w/2-3, 16, 6, h-16);
+                               image.get_window()->draw_rectangle(gc, 1, 0, 13, w, 6);
+                       break;
+                       case 1:
+                               image.get_window()->draw_rectangle(gc, 1, 0, h/2-3, w/2, 6);
+                               image.get_window()->draw_rectangle(gc, 1, 51, 0, 6, h);
+                       break;
+                       case 2:
+                               image.get_window()->draw_rectangle(gc, 1, w/2-3, 0, 6, h/2);
+                               image.get_window()->draw_rectangle(gc, 1, 0, 51, w, 6);
+                       break;
+                       case 3:
+                               image.get_window()->draw_rectangle(gc, 1, w/2, h/2-3, w/2, 6);
+                               image.get_window()->draw_rectangle(gc, 1, 16, 0, 6, h);
+               }
+       }
+       return true;
+}
+
+