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 3e5287695cbfc2d7f243d50b45d2f443b128157c..504747b2cfd58d592ca02606831dd4478faa9111 100644 (file)
--- a/Constructor/src/and.cpp
+++ b/Constructor/src/and.cpp
@@ -57,7 +57,7 @@ bool And::on_button_press_event(GdkEventButton *event)
                std::cout << CItem::gate_id << std::endl;
                if (CItem::logic_connect) {
                        if (CItem::gate_id != -1 ) {
-                               if ( detect_click_position((int)event->x, (int)event->y ) == IN && CItem::gate_id != ID ) {
+                               if ( detect_click_position((int)event->x, (int)event->y ) == IN && CItem::gate_id != ID && !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;
@@ -76,6 +76,11 @@ bool And::on_button_press_event(GdkEventButton *event)
                combo_entry->set_popdown_strings(*list_pointed);
                combo_entry->get_entry()->set_text (name);
                workplace->queue_draw();
+               char f[20];
+               Glib::ustring text;
+               sprintf(f,"  Conector OUT = %d",out_connected);
+               text = name+f;
+               status_bar->push ( text, 0);
        }
        
        if ((event->type == GDK_BUTTON_PRESS) && ( event->button == 2)){
@@ -117,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);
-                return true; //It has been handled.
+               return true; //It has been handled.
        }
        workplace->queue_draw();
        return true;
@@ -161,29 +166,47 @@ void And::save(FILE *archivo)
 
 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() ) {
-               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);
-                       cant_out++;
                }
                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);
-                       cant_in++;
                }
                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;
 }
 
@@ -263,6 +286,11 @@ void And::set_out_connected(bool _o)
        out_connected = _o;
 }
 
+bool And::get_out_logic_connect()
+{
+       return out_connected;
+}
+
 void And::draw_connectors()
 {
        Glib::RefPtr<Gdk::Window> window = get_window();