-Los cables que van a las compuertas se posicionan en la entrada o salida y no en...

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

diff --git a/Constructor/src/workplace.cpp b/Constructor/src/workplace.cpp
index 46b1bcd470aa2ff0242c46a739be0245801dd7f4..64ad9f55026c2160ddbec9dc352cfc3cdda6c682 100644 (file)
--- a/Constructor/src/workplace.cpp
+++ b/Constructor/src/workplace.cpp
@@ -29,14 +29,24 @@ bool WorkPlace::on_expose_event(GdkEventExpose *event)
        color.set_rgb(255,0,0);
        gc->set_rgb_bg_color(color);
        get_style()->set_black(color);
        color.set_rgb(255,0,0);
        gc->set_rgb_bg_color(color);
        get_style()->set_black(color);

-       int w, z;               
-       std::list<t_line>::iterator i = lista_lineas.begin();
-       while ( i != lista_lineas.end() ) {
+       int a, b, w, z;         
+       std::list<t_line>::iterator i = lista_lineas_in.begin();
+       while ( i != lista_lineas_in.end() ) {

                t_line temp = *i;
                t_line temp = *i;

-               temp.store->get_logic_connect_position(w,z);
-               get_window()->draw_line (get_style()->get_black_gc(), temp.logic->get_position_x(),temp.logic->get_position_y(), w,z);
+               temp.store->get_in_logic_connect_position(w,z);
+               temp.logic->get_out_logic_connect_position(a, b);
+               get_window()->draw_line (get_style()->get_black_gc(), a, b, w,z);

                i++;
        }
                i++;
        }

+       i = lista_lineas_out.begin();
+       while ( i != lista_lineas_out.end() ) {
+               t_line temp = *i;
+               temp.store->get_out_logic_connect_position(w,z);
+               temp.logic->get_in_logic_connect_position(a, b);
+               get_window()->draw_line (get_style()->get_black_gc(), a, b, w, z);
+               i++;
+       }
+       

        return true;
 }
 
        return true;
 }
 


@@ -82,20 +92,53 @@ CItem* WorkPlace::get_logic_item(int _id)
 
 void WorkPlace::delete_line(int _id)
 {
 
 void WorkPlace::delete_line(int _id)
 {

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

                if ( (*i).store->get_id() == _id ) {
                if ( (*i).store->get_id() == _id ) {

-                       lista_lineas.erase(i);
-                       i = lista_lineas.begin();
+                       lista_lineas_in.erase(i);
+                       i = lista_lineas_in.begin();

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

-       i = lista_lineas.begin();
-       while ( i != lista_lineas.end() ){
+
+       i = lista_lineas_in.begin();
+       while ( i != lista_lineas_in.end() ){
+               if ( (*i).logic->get_id() == _id ) {
+                       lista_lineas_in.erase(i);
+                       i = lista_lineas_in.begin();
+               }
+               i++;
+       }
+
+       i = lista_lineas_out.begin();
+       while ( i != lista_lineas_out.end() ){
+               if ( (*i).store->get_id() == _id ) {
+                       lista_lineas_out.erase(i);
+                       i = lista_lineas_out.begin();
+               }
+               i++;
+       }       
+       i = lista_lineas_out.begin();
+       while ( i != lista_lineas_out.end() ){

                if ( (*i).logic->get_id() == _id ) {
                if ( (*i).logic->get_id() == _id ) {

-                       lista_lineas.erase(i);
-                       i = lista_lineas.begin();
+                       lista_lineas_out.erase(i);
+                       i = lista_lineas_out.begin();

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

+
+}
+
+void WorkPlace::update_logic_position()
+{
+       std::list<CItem*>::iterator i = listaItems->begin();
+       while ( i != listaItems->end() ){
+               (*i)->update_logic_position();
+               i++;
+       }
+       i = lista_logic_Items->begin();
+       while ( i != lista_logic_Items->end() ){
+               (*i)->update_logic_position();
+               i++;
+       }

 }
 }