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 2b04130487e1e58665709e74b767cb5b044b93b0..2dccaa30858c217fb3ea5ea51c705113642220a4 100644 (file)
--- a/Constructor/src/workplace.cpp
+++ b/Constructor/src/workplace.cpp
@@ -86,7 +86,6 @@ bool WorkPlace::on_expose_event(GdkEventExpose *event)
                                        y_offset = -15;
                        }
                        get_logic_item(temp.logic_id)->get_out_logic_connect_position(a, b);
-                       get_logic_item(temp.logic_id)->set_out_connected(true);
                        get_item(temp.store_id)->get_in_logic_connect_position(w,z);
                        draw_line(a+x_offset, b+y_offset, w+item_x_offset, z+item_y_offset, color_in);
                        get_window()->draw_line(gc, a, b, a+x_offset, b+y_offset);
@@ -115,14 +114,23 @@ bool WorkPlace::on_expose_event(GdkEventExpose *event)
                                        y_offset = 15;
                        }
                        get_item(temp.store_id)->get_out_logic_connect_position(w,z);
-                       if (dynamic_cast<Not *>(get_logic_item(temp.logic_id))) 
-                               get_logic_item(temp.logic_id)->set_in_connected(true);
                        get_logic_item(temp.logic_id)->get_in_logic_connect_position(a, b);
                        draw_line(w+item_y_offset, z+item_y_offset, a+x_offset, b+y_offset,color_out);
                        get_window()->draw_line(gc, a, b, a+x_offset, b+y_offset);
                }
                i++;
        }
+       
+       i = lista_lineas_logic.begin();
+       while ( i != lista_lineas_logic.end() ) {
+               t_line temp = *i;
+               if ( get_logic_item(temp.store_id) != NULL && get_logic_item(temp.logic_id) != NULL ) {
+                       get_logic_item(temp.logic_id)->get_out_logic_connect_position(w,z);
+                       get_logic_item(temp.store_id)->get_in_logic_connect_position(a, b);
+                       get_window()->draw_line(gc, a, b, w,z);
+               }
+               i++;
+       }
        return true;
 }
 
@@ -174,6 +182,27 @@ CItem *WorkPlace::get_item(int _id)
        return NULL;
 }
 
+int WorkPlace::get_logic_id(const std::string &_s)
+{
+       std::list<CItem *>::iterator i = lista_logic_Items->begin();
+       while ( i != lista_logic_Items->end() ){
+               if ( (*i)->get_name() == _s ) 
+                       return (*i)->get_id();
+               i++;
+       }
+       return -1;
+}
+
+int WorkPlace::get_item_id(const std::string &_s)
+{
+       std::list<CItem *>::iterator i = listaItems->begin();
+       while ( i != listaItems->end() ){
+               if ( (*i)->get_name() == _s ) 
+                       return (*i)->get_id();
+               i++;
+       }
+       return -1;
+}
        
 void WorkPlace::delete_line(int _id)
 {
@@ -181,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 ) {
+                               get_logic_item((*i).logic_id)->set_out_connected(false);        
                                lista_lineas_in.erase(i);
                                i = lista_lineas_in.begin();
                        }
@@ -191,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) {
-                               get_logic_item((*i).logic_id)->set_out_connected(false);        
                                lista_lineas_in.erase(i);
                                i = lista_lineas_in.begin();
                        }
@@ -202,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 ) {
+                               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();
                        }
@@ -212,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 ) {
-                               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++;
        }       
+       
+       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()