se arregla el bug de la NOT

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

diff --git a/Constructor/src/and.cpp b/Constructor/src/and.cpp
index 15230c0678d8719d66ef68ef7fcf3ddd10be1a64..504747b2cfd58d592ca02606831dd4478faa9111 100644 (file)
--- a/Constructor/src/and.cpp
+++ b/Constructor/src/and.cpp
@@ -122,7 +122,7 @@ bool And::on_button_press_event(GdkEventButton *event)
        }
        if ((event->type == GDK_BUTTON_PRESS) && ( event->button == 3)){
                menu_popup.popup(event->button, event->time);
        }
        if ((event->type == GDK_BUTTON_PRESS) && ( event->button == 3)){
                menu_popup.popup(event->button, event->time);

-                return true; //It has been handled.
+               return true; //It has been handled.

        }
        workplace->queue_draw();
        return true;
        }
        workplace->queue_draw();
        return true;


@@ -166,29 +166,47 @@ void And::save(FILE *archivo)
 
 bool And::check_connection()
 {
 
 bool And::check_connection()
 {

-       int cant_in = 0, cant_out =0;

        t_logic_connector temp;
        std::list<t_line>::iterator i = workplace->lista_lineas_in.begin();
        while ( i != workplace->lista_lineas_in.end() ) {
        t_logic_connector temp;
        std::list<t_line>::iterator i = workplace->lista_lineas_in.begin();
        while ( i != workplace->lista_lineas_in.end() ) {

-               if ( workplace->get_logic_item((*i).logic_id)->get_id() == ID ) {
+               if ( (*i).logic_id== ID ) {

                        temp.type = OUT;
                        temp.name_dest = workplace->get_item((*i).store_id)->get_name();
                        vec_connector.push_back(temp);
                        temp.type = OUT;
                        temp.name_dest = workplace->get_item((*i).store_id)->get_name();
                        vec_connector.push_back(temp);

-                       cant_out++;

                }
                i++;
        }
 
        i = workplace->lista_lineas_out.begin();
        while ( i != workplace->lista_lineas_out.end() ) {
                }
                i++;
        }
 
        i = workplace->lista_lineas_out.begin();
        while ( i != workplace->lista_lineas_out.end() ) {

-               if ( workplace->get_logic_item((*i).logic_id)->get_id() == ID ) {
+               if ( (*i).logic_id== ID ) {

                        temp.type = IN;
                        temp.name_dest = workplace->get_item((*i).store_id)->get_name();
                        vec_connector.push_back(temp);
                        temp.type = IN;
                        temp.name_dest = workplace->get_item((*i).store_id)->get_name();
                        vec_connector.push_back(temp);

-                       cant_in++;

                }
                i++;
        }
                }
                i++;
        }

+
+       i = workplace->lista_lineas_logic.begin();
+       while ( i != workplace->lista_lineas_logic.end() ) {
+               if ( (*i).logic_id == ID ) {
+                       temp.type = OUT;
+                       temp.name_dest = workplace->get_logic_item((*i).store_id)->get_name();
+                       vec_connector.push_back(temp);
+               }
+               i++;
+       }
+
+       i = workplace->lista_lineas_logic.begin();
+       while ( i != workplace->lista_lineas_logic.end() ) {
+               if ( (*i).store_id == ID ) {
+                       temp.type = IN;
+                       temp.name_dest = workplace->get_logic_item((*i).logic_id)->get_name();
+                       vec_connector.push_back(temp);
+               }
+               i++;
+       }
+

        return true; //out_connected;
 }
 
        return true; //out_connected;
 }