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 / exclusa.cpp

diff --git a/Constructor/src/exclusa.cpp b/Constructor/src/exclusa.cpp
index 4d079948219ca7a4e843bc5d1ecfde3201988c5c..365b6e45675355de3b1a6a41659f028849952ad6 100644 (file)
--- a/Constructor/src/exclusa.cpp
+++ b/Constructor/src/exclusa.cpp
@@ -3,6 +3,10 @@
 
 Exclusa::Exclusa(int orientacion)
 {
 
 Exclusa::Exclusa(int orientacion)
 {

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

        imageN = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/exclusa_h.png");
        imageS = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/exclusa_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/exclusa_h.png");
        imageS = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/exclusa_s.png");
        null = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/null.png");


@@ -35,17 +39,23 @@ Exclusa::~Exclusa()
 
 bool Exclusa::on_button_press_event(GdkEventButton *event)
 {
 
 bool Exclusa::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);
        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) {
                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 if (detect_click_position(event->x, event->y) == OUT) {  
+                               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();
+                       }

                }
                }

-               CItem::logic_connect = false;   

        }
        
        if ((event->type == GDK_BUTTON_PRESS) && ( event->button ==2)){
        }
        
        if ((event->type == GDK_BUTTON_PRESS) && ( event->button ==2)){


@@ -55,10 +65,18 @@ bool Exclusa::on_button_press_event(GdkEventButton *event)
                switch (imgActual) {
                        case 1:
                                image = imageS;
                switch (imgActual) {
                        case 1:
                                image = imageS;

+                               in_x = x + image->get_width();
+                               in_y = y + image->get_height()/2;
+                               out_x = x;
+                               out_y = in_y;

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

+                               in_x = x + image->get_width()/2;
+                               in_y = y;
+                               out_x = in_x;
+                               out_y = y +image->get_height();

                }
                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,6 +91,8 @@ bool Exclusa::on_button_press_event(GdkEventButton *event)
                if (estado) exclusa_pty_wnd->rd_btn_open->set_active(true);
                exclusa_pty_wnd->show();
        }
                if (estado) exclusa_pty_wnd->rd_btn_open->set_active(true);
                exclusa_pty_wnd->show();
        }

+       CItem::logic_connect =false;
+       workplace->queue_draw();

        return true;
 }
 
        return true;
 }
 


@@ -193,9 +213,56 @@ ConnectorType Exclusa::get_connector_type(int _a, int _b)
        }
        return UNDEF;
 }
        }
        return UNDEF;
 }

-
+       

 void Exclusa::set_default_connector()
 {
        connect_vec[0].type = UNDEF;
        connect_vec[1].type = UNDEF;
 }
 void Exclusa::set_default_connector()
 {
        connect_vec[0].type = UNDEF;
        connect_vec[1].type = UNDEF;
 }

+
+void Exclusa::get_in_logic_connect_position(int& _a, int& _b)
+{
+       _a = in_x;
+       _b = in_y;
+}
+
+void Exclusa::get_out_logic_connect_position(int& _a, int& _b)
+{
+       _a = out_x;
+       _b = out_y;
+}
+       
+ConnectorType Exclusa::detect_click_position(int _a, int _b)
+{
+       switch (imgActual) {
+               case 0:
+                       if ( (_a <= image->get_width()/2+10)&&(_a>=image->get_width()/2-10)&&(_b<=16)&&(_b >= 0) )
+                               return IN;
+                       if ( (_a <= image->get_width()/2+10)&&(_a>=image->get_width()/2-10)&&(_b<=32)&&(_b > 16) )
+                               return OUT;
+                       break;
+               case 1:
+                       if ( (_a <=32)&&(_a> 16)&&(_b<=image->get_height()/2+10)&&(_b >= image->get_height()/2-10) )
+                               return IN;
+                       if ( (_a <= 16)&&(_a>=0)&&(_b<=image->get_height()/2+10)&&(_b >= image->get_height()/2-10) )
+                               return OUT;
+               }
+               return UNDEF;
+}
+
+void Exclusa::update_logic_position()
+{
+       switch (imgActual) {
+               case 1:
+                       in_x = x + image->get_width();
+                       in_y = y + image->get_height()/2;
+                       out_x = x;
+                       out_y = in_y;
+                       break;
+               case 0: 
+                       in_x = x + image->get_width()/2;
+                       in_y = y;
+                       out_x = in_x;
+                       out_y = y +image->get_height();
+       }
+}