se arregla el bug de la NOT

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

diff --git a/Constructor/src/workplace.cpp b/Constructor/src/workplace.cpp
index 206bca3e81c6e0df32c871289c97ed39ece4a087..2dccaa30858c217fb3ea5ea51c705113642220a4 100644 (file)
--- a/Constructor/src/workplace.cpp
+++ b/Constructor/src/workplace.cpp
@@ -210,6 +210,7 @@ void WorkPlace::delete_line(int _id)
        while ( i != lista_lineas_in.end() ){
                if (get_item( (*i).store_id ) != NULL)
                        if ( get_item( (*i).store_id )->get_id() == _id ) {
        while ( i != lista_lineas_in.end() ){
                if (get_item( (*i).store_id ) != NULL)
                        if ( get_item( (*i).store_id )->get_id() == _id ) {

+                               get_logic_item((*i).logic_id)->set_out_connected(false);        

                                lista_lineas_in.erase(i);
                                i = lista_lineas_in.begin();
                        }
                                lista_lineas_in.erase(i);
                                i = lista_lineas_in.begin();
                        }


@@ -220,7 +221,6 @@ void WorkPlace::delete_line(int _id)
        while ( i != lista_lineas_in.end() ){
                if ( get_logic_item((*i).logic_id) != NULL)
                        if ( get_logic_item((*i).logic_id)->get_id() == _id) {
        while ( i != lista_lineas_in.end() ){
                if ( get_logic_item((*i).logic_id) != NULL)
                        if ( get_logic_item((*i).logic_id)->get_id() == _id) {

-                               get_logic_item((*i).logic_id)->set_out_connected(false);        

                                lista_lineas_in.erase(i);
                                i = lista_lineas_in.begin();
                        }
                                lista_lineas_in.erase(i);
                                i = lista_lineas_in.begin();
                        }


@@ -231,6 +231,8 @@ void WorkPlace::delete_line(int _id)
        while ( j != lista_lineas_out.end() ){
                if ( get_item((*j).store_id) != NULL )
                        if ( get_item((*j).store_id)->get_id() == _id ) {
        while ( j != lista_lineas_out.end() ){
                if ( get_item((*j).store_id) != NULL )
                        if ( get_item((*j).store_id)->get_id() == _id ) {

+                               if (dynamic_cast<Not *>(get_logic_item((*j).logic_id))) 
+                                       get_logic_item((*j).logic_id)->set_in_connected(false);

                                lista_lineas_out.erase(j);
                                j = lista_lineas_out.begin();
                        }
                                lista_lineas_out.erase(j);
                                j = lista_lineas_out.begin();
                        }


@@ -241,13 +243,35 @@ void WorkPlace::delete_line(int _id)
        while ( j != lista_lineas_out.end() ){
                if ( get_logic_item((*j).logic_id) != NULL )
                        if ( get_logic_item((*j).logic_id)->get_id() == _id ) {
        while ( j != lista_lineas_out.end() ){
                if ( get_logic_item((*j).logic_id) != NULL )
                        if ( get_logic_item((*j).logic_id)->get_id() == _id ) {

-                               if (dynamic_cast<Not *>(get_logic_item((*i).logic_id))) 
-                                       get_logic_item((*j).logic_id)->set_in_connected(false);

                                lista_lineas_out.erase(j);
                                j = lista_lineas_out.begin();
                        }
                j++;
        }       
                                lista_lineas_out.erase(j);
                                j = lista_lineas_out.begin();
                        }
                j++;
        }       

+       
+       std::list<t_line>::iterator k = lista_lineas_logic.begin();
+       while ( k != lista_lineas_logic.end() ){
+               if ( get_logic_item((*k).store_id) != NULL )
+                       if ( get_logic_item((*k).store_id)->get_id() == _id ) {
+                               get_logic_item((*k).logic_id)->set_out_connected(false);
+                               std::cout<< get_logic_item((*k).logic_id)->get_name() <<std::endl;
+                               lista_lineas_logic.erase(k);
+                               k = lista_lineas_logic.begin();
+                       }
+               k++;
+       }       
+
+       k = lista_lineas_logic.begin();
+       while ( k != lista_lineas_logic.end() ){
+               if ( get_logic_item((*k).logic_id) != NULL )
+                       if ( get_logic_item((*k).logic_id)->get_id() == _id ) {
+                               if (dynamic_cast<Not *>(get_logic_item((*k).store_id))) 
+                                       get_logic_item((*k).store_id)->set_in_connected(false);
+                               lista_lineas_logic.erase(k);
+                               k = lista_lineas_logic.begin();
+                       }
+               k++;
+       }       

 }
 
 void WorkPlace::update_logic_position()
 }
 
 void WorkPlace::update_logic_position()