se arregla el bug de la NOT

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

diff --git a/Constructor/src/exclusa.cpp b/Constructor/src/exclusa.cpp
index 69eef26148049849ae7dcbff1ccc774815b6886a..5eb4eadc90c5585bdb179aa5beda09cdfbdd37e5 100644 (file)
--- a/Constructor/src/exclusa.cpp
+++ b/Constructor/src/exclusa.cpp
@@ -1,13 +1,25 @@
 #include "exclusa.h"
 #include "exclusaptywnd.h"
 #include "exclusa.h"
 #include "exclusaptywnd.h"

+#include "not.h"

 
 

-Exclusa::Exclusa()
+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");

-       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());
        
        Glib::RefPtr<Gnome::Glade::Xml> ref = Gnome::Glade::Xml::create(PACKAGE_DATA_DIR"/plaqui-constructor/dialogs/constructor.glade", "exclusa_pty_wnd");
        set_size_request(image->get_width(), image->get_height());
        
        Glib::RefPtr<Gnome::Glade::Xml> ref = Gnome::Glade::Xml::create(PACKAGE_DATA_DIR"/plaqui-constructor/dialogs/constructor.glade", "exclusa_pty_wnd");


@@ -28,17 +40,41 @@ 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)) {
        t_line tmp_line;
        if ((event->type == GDK_BUTTON_PRESS) && ( event->button == 1)) {

-               combo_entry->set_text(name);
-               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);
+               WorkPlace::pointed = ID;
+               list_pointed->push_back(name);
+               combo_entry->set_popdown_strings(*list_pointed);
+               combo_entry->get_entry()->set_text (name);
+               if (CItem::logic_connect && CItem::gate_id != -1) {
+                       if ( detect_click_position((int)event->x, (int)event->y) == IN && !workplace->get_logic_item(CItem::gate_id)->get_out_logic_connect()) {
+                               tmp_line.logic_id =  CItem::gate_id;
+                               workplace->get_logic_item(CItem::gate_id)->set_out_connected(true);
+                               tmp_line.store_id = ID;
+                               workplace->lista_lineas_in.push_back(tmp_line);
+                               workplace->queue_draw();        
+                       } else if (detect_click_position((int)event->x, (int)event->y) == OUT )  { 
+                               if (dynamic_cast<Not *>(workplace->get_logic_item(CItem::gate_id))) {
+                                       if (!dynamic_cast<Not *>(workplace->get_logic_item(CItem::gate_id))->get_in_logic_connect()) {
+                                               workplace->get_logic_item(CItem::gate_id)->set_in_connected(true);
+                                               tmp_line.logic_id =  CItem::gate_id;
+                                               tmp_line.store_id = ID;
+                                               workplace->lista_lineas_out.push_back(tmp_line);
+                                               workplace->queue_draw();
+                                       }
+                               } else {
+                                       tmp_line.logic_id =  CItem::gate_id;
+                                       tmp_line.store_id = ID;
+                                       workplace->lista_lineas_out.push_back(tmp_line);
+                                       workplace->queue_draw();
+                               }                                       
+                       }
+                       CItem::gate_id = -1;

                }
                }

-               CItem::logic_connect = false;   
+               Glib::ustring text;
+               if(estado) text = name+"  Estado: ABIERTO";
+               else text = name+"  Estado: CERRADO";
+               status_bar->push ( text, 0);            

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


@@ -48,10 +84,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()-5;
+                               in_y = y + image->get_height()/2-5;
+                               out_x = x+5;
+                               out_y = in_y+10;

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


@@ -66,6 +110,7 @@ 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();
        }

+       workplace->queue_draw();

        return true;
 }
 
        return true;
 }
 


@@ -130,65 +175,164 @@ void Exclusa::save(FILE *archivo)
 
 bool Exclusa::check_connection()
 {
 
 bool Exclusa::check_connection()
 {

-       ConnectorType aux;
+       ConnectorType aux, aux1, aux2;

        CItem *_item0, *_item1;
        switch (get_img_actual()) {
        CItem *_item0, *_item1;
        switch (get_img_actual()) {

-                       case 0:
-                               connect_vec[0].type = is_other_connection_area( get_position_x()-5, get_position_y()+16, &_item0); //izquierda
-                               connect_vec[1].type = is_other_connection_area( get_position_x()+get_image()->get_width()+5, get_position_y()+16,& _item1); //derecha
-                       break;          
-                       case 1:
-                               connect_vec[0].type =  is_other_connection_area( get_position_x()+16, get_position_y()-5, &_item0); // arriba
-                               connect_vec[1].type = is_other_connection_area( get_position_x()+16, get_position_y()+get_image()->get_height() +5, &_item1); //abajo
+               case 0:
+                       aux1 = is_other_connection_area( get_position_x()-5, get_position_y()+16, &_item0); //izquierda
+                       aux2 = is_other_connection_area( get_position_x()+get_image()->get_width()+5, get_position_y()+16,& _item1); //derecha
+               break;          
+               case 1:
+                       aux1 =  is_other_connection_area( get_position_x()+16, get_position_y()-5, &_item0); // arriba
+                       aux2 = is_other_connection_area( get_position_x()+16, get_position_y()+get_image()->get_height() +5, &_item1); //abajo

        }
        }

-       if ( connect_vec[0].type != UNDEF && connect_vec[1].type != UNDEF ) {
-               aux = connect_vec[0].type; 
-               connect_vec[0].type = connect_vec[1].type;
-               connect_vec[1].type = aux;
+       if ( aux1 != UNDEF && aux2 != UNDEF ) {
+               if (!is_connected) {
+                       //aux = connect_vec[0].type; 
+                       // Aca van invertidos los tipos de entrada/salida
+                       connect_vec[0].type = aux2; //connect_vec[1].type;
+                       connect_vec[1].type = aux1;
+               }

                connect_vec[0].id_dest = _item0->get_id();
                connect_vec[1].id_dest = _item1->get_id();
                return ( is_connected = (connect_vec[0].type != connect_vec[1].type) );
        }
                connect_vec[0].id_dest = _item0->get_id();
                connect_vec[1].id_dest = _item1->get_id();
                return ( is_connected = (connect_vec[0].type != connect_vec[1].type) );
        }

-       else return is_connected;
+       return is_connected = false;

 }
 
 ConnectorType Exclusa::get_connector_type(int _a, int _b)
 {
 }
 
 ConnectorType Exclusa::get_connector_type(int _a, int _b)
 {

-       CItem * _item;
-       if ( ! is_connected ) {
-               switch (imgActual) {
-                       case 0:
-                               if ((_a <= x+10 )&&(_a > 0) && (_b <= y+image->get_height()-10) &&(_b >= y+10 )) //izquierda
-                                       return is_other_connection_area(get_position_x()+get_image()->get_width()+5, get_position_y()+16, &_item);//pregunto por la derecha
-                               if ((_a <= x+image->get_width()-1)&&(_a >= x+image->get_width()-10) && (_b <= y+image->get_height()-10) &&(_b >= y +10 )) //derecha
-                                       return is_other_connection_area(get_position_x()-5, get_position_y()+16, &_item); //pregunto por la izquierda.
-                               break;
-                       case 1: 
-                               if ( (_a <= x+image->get_width()-10 )&&(_a >= x + 10) && (_b <= y+10) &&(_b > 0 ) )  //arriba
-                                       return is_other_connection_area(get_position_x()+16, get_position_y()+get_image()->get_height() +5, &_item); //pregunto que hay abajo
-                               if ((_a <= x+22 )&&(_a >= x + 10) && (_b <= y+image->get_height()-1) &&(_b >= y+image->get_height()-10 ))//abajo
-                                       return is_other_connection_area( get_position_x()+16, get_position_y()-5, &_item);//pregunto que hay arriba.
+       CItem *_item;
+       switch (imgActual) {
+               case 1:
+                       if ( (_a <= x+image->get_width()-10 )&&(_a >= x + 10) && (_b <= y+10) &&(_b > 0 ) ){  //arriba
+                               if ( is_connected ) return connect_vec[0].type;                 
+                               connect_vec[1].type = is_other_connection_area(get_position_x()+16, get_position_y()+get_image()->get_height() +5, &_item); //pregunto que hay abajo
+                               switch ( connect_vec[1].type ) {
+                                       case IN: 
+                                       connect_vec[1].type = OUT;
+                                       connect_vec[0].type = IN;               
+                                       break;
+                                       case OUT:
+                                       connect_vec[1].type = IN;
+                                       connect_vec[0].type = OUT;              
+                                       break;
+                                       case UNDEF:
+                                       return UNDEF;
+                               }
+                               is_connected = true;
+                               return connect_vec[0].type;
+                       }
+                       
+                       if ((_a <= x+22 )&&(_a >= x + 10) && (_b <= y+image->get_height()-1) &&(_b >= y+image->get_height()-10 )) {//abajo
+                               if ( is_connected ) return connect_vec[1].type;                 
+                               connect_vec[0].type = is_other_connection_area( get_position_x()+16, get_position_y()-5,& _item);//pregunto que hay arriba.
+                               switch ( connect_vec[0].type ) {
+                                       case IN: 
+                                       connect_vec[0].type = OUT;
+                                       connect_vec[1].type = IN;               
+                                       break;
+                                       case OUT:
+                                       connect_vec[0].type = IN;
+                                       connect_vec[1].type = OUT;              
+                                       break;
+                                       case UNDEF:
+                                       return UNDEF;
+                               }
+                               is_connected = true;
+                               return connect_vec[1].type;
+                       }
+               break;
+               case 0: 
+                       if ((_a <= x+10 )&&(_a > 0) && (_b <= y+image->get_height()-10) &&(_b >= y+10 )){ //izquierda
+                               if ( is_connected ) return connect_vec[0].type;                 
+                               connect_vec[1].type = is_other_connection_area(get_position_x()+get_image()->get_width()+5, get_position_y()+16, &_item);//pregunto por la derecha
+                               switch ( connect_vec[1].type ) {
+                                       case IN: 
+                                       connect_vec[1].type = OUT;
+                                       connect_vec[0].type = IN;               
+                                       break;
+                                       case OUT:
+                                       connect_vec[1].type = IN;
+                                       connect_vec[0].type = OUT;              
+                                       break;
+                                       case UNDEF:
+                                       return UNDEF;
+                               }
+                               is_connected = true;
+                               return connect_vec[0].type;
+                       }
+                 if ((_a <= x+image->get_width()-1)&&(_a >= x+image->get_width()-10) && (_b <= y+image->get_height()-10) &&(_b >= y +10 )) {//derecha
+                               if ( is_connected ) return connect_vec[1].type;                 
+                               connect_vec[0].type =   is_other_connection_area(get_position_x()-5, get_position_y()+16, &_item); //pregunto por la izquierda. 
+                               switch ( connect_vec[0].type ) {
+                                       case IN: 
+                                       connect_vec[0].type = OUT;
+                                       connect_vec[1].type = IN;               
+                                       break;
+                                       case OUT:
+                                       connect_vec[0].type = IN;
+                                       connect_vec[1].type = OUT;              
+                                       break;
+                                       case UNDEF:
+                                       return UNDEF;
+                               }
+                               is_connected = true;
+                               return connect_vec[1].type;
+                       }

                }
                }

-       } else {
-               switch (imgActual) {
-                       case 0: 
-                               if ((_a <= x+10 )&&(_a > 0) && (_b <= y+image->get_height()-10) &&(_b >= y+10 )) //izquierda
-                                       return connect_vec[0].type;
-                               if ((_a <= x+image->get_width()-1)&&(_a >= x+image->get_width()-10) && (_b <= y+image->get_height()-10) &&(_b >= y +10 )) //derecha
-                                       return connect_vec[1].type;
-                               break;
-                       case 1:
-                               if ( (_a <= x+image->get_width()-10 )&&(_a >= x + 10) && (_b <= y+10) &&(_b > 0 ) ) //arriba
-                                       return connect_vec[0].type;
-                               if ((_a <= x+22 )&&(_a >= x + 10) && (_b <= y+image->get_height()-1) &&(_b >= y+image->get_height()-10 )) //abajo
-                                       return connect_vec[1].type;
-               }
-       }

        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()-5;
+                       in_y = y + image->get_height()/2-5;
+                       out_x = x+5;
+                       out_y = in_y+10;
+                       break;
+               case 0: 
+                       in_x = x + image->get_width()/2;
+                       in_y = y;
+                       out_x = in_x;
+                       out_y = y +image->get_height();
+       }
+}