se mejora la conexion entre compuertas, se salvan en el XML, hay un par de cosas...

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

diff --git a/Client/src/item_conduct.cpp b/Client/src/item_conduct.cpp
index 033937087ac344359ee3a1817cf263cc16bde4f8..f348945e40d1ad76a7bbafcf743eb66963ec774d 100644 (file)
--- a/Client/src/item_conduct.cpp
+++ b/Client/src/item_conduct.cpp
@@ -4,13 +4,13 @@
 ViewConduct::ViewConduct(Glib::ustring _name, int orientacion):ViewItem(_name)
 {
        switch (orientacion) {
-               case 0:
-                       image.set("canio_n.png");
+               case 0: // Caño vertical
+                       image.set(PACKAGE_DATA_DIR"/plaqui-client/pixmaps/canio_n.png");
                break;
-               case 1:
-                       image.set("canio_s.png");
+               case 1: // Caño horizontal
+                       image.set(PACKAGE_DATA_DIR"/plaqui-client/pixmaps/canio_s.png");
        }
-       std::cout << "Conducto creado" << std::endl;
+       m_or = orientacion;
        image.show();
        set_size_request();
 }
@@ -19,3 +19,27 @@ ViewConduct::~ViewConduct()
 {
 }
 
+bool ViewConduct::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);
+       gc->set_foreground(color);
+       gc->set_background(color);
+       int w,h;
+       w = image.get_width();
+       h = image.get_height();
+       switch (m_or) {
+               case 0: // Vertical
+                       image.get_window()->draw_rectangle(gc, 1, w/2-2, 0, 4, h-1);
+                       gc->set_foreground(blanco);
+                       image.get_window()->draw_rectangle(gc, 0, w/2-3, 0, 6, h-1);
+               break;
+               case 1: // Horizontal
+                       image.get_window()->draw_rectangle(gc, 1, 0, h/2-2, w-1, 4);
+                       gc->set_foreground(blanco);
+                       image.get_window()->draw_rectangle(gc, 0, 0, h/2-3, w-1, 6);
+       }
+}
+