Se arregla bug en la union que hacia que el flujo inicial este en 0, y eso condicion...

[z.facultad/75.42/plaqui.git] / Constructor / src / conduct.cpp

diff --git a/Constructor/src/conduct.cpp b/Constructor/src/conduct.cpp
index c3557dc087e4fe656ef4b7e43a6b304c5c823aa4..80147e44924fe2eb3dfa844d0bcc7c2dd5038ee4 100644 (file)
--- a/Constructor/src/conduct.cpp
+++ b/Constructor/src/conduct.cpp
@@ -1,12 +1,19 @@
 #include "conduct.h"
 
 #include "conduct.h"
 

-Conduct::Conduct()
+Conduct::Conduct(int orientacion)

 {
        imageN = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/canio_n.png");
        imageS = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/canio_s.png");
        null = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/null.png");
 {
        imageN = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/canio_n.png");
        imageS = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/canio_s.png");
        null = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/null.png");

-       imgActual = 0;
-       image = imageN;
+       imgActual = orientacion;
+       switch (imgActual) {
+               case 1:
+                       image = imageS;
+                       break;
+               default: 
+                       imgActual = 0;
+                       image = imageN;                 
+       }

        set_size_request(image->get_width(), image->get_height());
        property_wnd->set_title("Propiedades del Tubo");
        name="tubo";
        set_size_request(image->get_width(), image->get_height());
        property_wnd->set_title("Propiedades del Tubo");
        name="tubo";


@@ -23,9 +30,10 @@ Conduct::~Conduct()
 
 bool Conduct::on_button_press_event(GdkEventButton *event)
 {
 
 bool Conduct::on_button_press_event(GdkEventButton *event)
 {

-       int w, h;
-       if ((event->type == GDK_BUTTON_PRESS) && ( event->button == 1))
+       if ((event->type == GDK_BUTTON_PRESS) && ( event->button == 1)) {

                combo_entry->set_text(name);
                combo_entry->set_text(name);

+               WorkPlace::pointed = ID;
+       }

        
        if ((event->type == GDK_BUTTON_PRESS) && ( event->button ==2)){
                image = null; 
        
        if ((event->type == GDK_BUTTON_PRESS) && ( event->button ==2)){
                image = null; 


@@ -39,8 +47,7 @@ bool Conduct::on_button_press_event(GdkEventButton *event)
                                imgActual = 0;
                                image = imageN;                 
                }
                                imgActual = 0;
                                image = imageN;                 
                }

-               get_size_request(w, h);
-               set_size_request(h, w);         
+               set_size_request(image->get_width(), image->get_height());              

                image->render_to_drawable(get_window(),get_style()->get_black_gc(),0,0,0,0,image->get_width(),image->get_height(),Gdk::RGB_DITHER_NONE,0,0);
        }
        if ((event->type == GDK_BUTTON_PRESS) && ( event->button == 3)){
                image->render_to_drawable(get_window(),get_style()->get_black_gc(),0,0,0,0,image->get_width(),image->get_height(),Gdk::RGB_DITHER_NONE,0,0);
        }
        if ((event->type == GDK_BUTTON_PRESS) && ( event->button == 3)){