se corrige el bug de la primera tirada de cables

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

diff --git a/Constructor/src/pump.cpp b/Constructor/src/pump.cpp
index 5dd52c863d7f1bf3aadae946200630dd96c234b7..7526f6b86aa6703932c666806c73606041ec9a3d 100644 (file)
--- a/Constructor/src/pump.cpp
+++ b/Constructor/src/pump.cpp
@@ -3,6 +3,10 @@
 
 Pump::Pump(int orientacion)
 {
 
 Pump::Pump(int orientacion)
 {

+       in_x = x + 48;
+       in_y = y;
+       out_x = in_x;
+       out_y = y + 32;

        imageE = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/bomba_e.png");
        imageO = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/bomba_o.png");
        null = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/bomba_null.png");
        imageE = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/bomba_e.png");
        imageO = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/bomba_o.png");
        null = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/bomba_null.png");


@@ -34,16 +38,22 @@ Pump::~Pump()
 
 bool Pump::on_button_press_event(GdkEventButton *event)
 {
 
 bool Pump::on_button_press_event(GdkEventButton *event)
 {

-       GdkEventExpose e;

        t_line tmp_line;
        if ((event->type == GDK_BUTTON_PRESS) && ( event->button == 1)) {
                combo_entry->set_text(name);
                WorkPlace::pointed = ID;
                if (CItem::logic_connect) {
        t_line tmp_line;
        if ((event->type == GDK_BUTTON_PRESS) && ( event->button == 1)) {
                combo_entry->set_text(name);
                WorkPlace::pointed = ID;
                if (CItem::logic_connect) {

-                       tmp_line.logic =  workplace->get_logic_item(CItem::quien);
-                       tmp_line.store = this;
-                       workplace->lista_lineas.push_back(tmp_line);
-                       workplace->on_expose_event(&e);
+                       if ( detect_click_position(event->x, event->y) == IN) {
+                               tmp_line.logic =  workplace->get_logic_item(CItem::gate_id);
+                               tmp_line.store = this;
+                               workplace->lista_lineas_in.push_back(tmp_line);
+                               workplace->queue_draw();
+                       } else {
+                               tmp_line.logic =  workplace->get_logic_item(CItem::gate_id);
+                               tmp_line.store = this;
+                               workplace->lista_lineas_out.push_back(tmp_line);
+                               workplace->queue_draw();
+                       }

                }
        }
        
                }
        }
        


@@ -54,10 +64,18 @@ bool Pump::on_button_press_event(GdkEventButton *event)
                switch (imgActual) {
                        case 1:
                                image = imageO;
                switch (imgActual) {
                        case 1:
                                image = imageO;

+                               in_x = x + 16;
+                               in_y = y;                       
+                               out_x = in_x;
+                               out_y = y + 32;

                                break;
                        default: 
                                imgActual = 0;
                                image = imageE;                 
                                break;
                        default: 
                                imgActual = 0;
                                image = imageE;                 

+                               in_x = x + image->get_width()-16;
+                               in_y = y;
+                               out_x = in_x;
+                               out_y = y + 32;

                }
                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);
                }
                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);


@@ -73,7 +91,7 @@ bool Pump::on_button_press_event(GdkEventButton *event)
                pump_pty_wnd->txt_pump_name->set_text( name );
                pump_pty_wnd->show();
        }               
                pump_pty_wnd->txt_pump_name->set_text( name );
                pump_pty_wnd->show();
        }               

-       workplace->on_expose_event(&e);
+       workplace->queue_draw();

        return true;
 }
 
        return true;
 }
 


@@ -182,15 +200,49 @@ void Pump::set_default_connector()
        connect_vec[0].type = OUT;
 }
 
        connect_vec[0].type = OUT;
 }
 

-void Pump::get_logic_connect_position(int& _a, int& _b)
+void Pump::get_in_logic_connect_position(int& _a, int& _b)

 {
 {

-       switch(imgActual) {
-               case 0: 
-                       _a = x + image->get_width() - 10;
-                       _b = y;
+       _a = in_x;
+       _b = in_y;
+}
+
+void Pump::get_out_logic_connect_position(int& _a, int& _b)
+{
+       _a = out_x;
+       _b = out_y;
+}
+       
+ConnectorType Pump::detect_click_position(int _a, int _b)
+{
+       switch (imgActual) {
+               case 0:
+                       if ( (_a <=image->get_width())&&(_a>=image->get_width()-32)&&(_b<=16)&&(_b >= 0) )
+                               return IN;
+                       if ( (_a <= image->get_width())&&(_a>=image->get_width()-32)&&(_b<=32)&&(_b > 16) )
+                               return OUT;

                        break;
                        break;

-               case 1: 
-                       _a = x + 10;
-                       _b = y;
+               case 1:
+                       if ( (_a <= 32)&&(_a>=0)&&(_b<=16)&&(_b >= 0) )
+                               return IN;
+                       if ( (_a <= 32)&&(_a>=0)&&(_b<=32)&&(_b > 16) )
+                               return OUT;
+               }
+               return UNDEF;
+}
+
+void Pump::update_logic_position()
+{
+       switch (imgActual) {
+               case 1:
+                       in_x = x + 16;
+                       in_y = y;                       
+                       out_x = in_x;
+                       out_y = y + 32;
+                       break;
+               case 0: 
+                       in_x = x + image->get_width()-16;
+                       in_y = y;
+                       out_x = in_x;
+                       out_y = y + 32;

        }
 }
        }
 }