Se arregla bug en la union que hacia que el flujo inicial este en 0, y eso condicion...

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

diff --git a/Constructor/src/workplace.cpp b/Constructor/src/workplace.cpp
index 293aaf58020a06993693364a00150ea771db2ba1..64ad9f55026c2160ddbec9dc352cfc3cdda6c682 100644 (file)
--- a/Constructor/src/workplace.cpp
+++ b/Constructor/src/workplace.cpp
@@ -1,6 +1,8 @@
 #include "workplace.h"
 #include "item.h"
 
+int WorkPlace::pointed = -1;
+
 WorkPlace::WorkPlace( BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml> &refGlade):Gtk::Fixed(cobject)
 {
 }
@@ -27,17 +29,30 @@ bool WorkPlace::on_expose_event(GdkEventExpose *event)
        color.set_rgb(255,0,0);
        gc->set_rgb_bg_color(color);
        get_style()->set_black(color);
-       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;
+               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 = lista_lineas_out.begin();
+       while ( i != lista_lineas_out.end() ) {
                t_line temp = *i;
-               get_window()->draw_line (get_style()->get_black_gc(), temp.logic->get_position_x(),temp.logic->get_position_y(), temp.store->get_position_x(),temp.store->get_position_y());
+               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;
 }
 
 void WorkPlace::delete_item(int _id)
 {
+       CItem::logic_connect = false;
        std::list<CItem*>::iterator i = listaItems->begin();
        while ( i != listaItems->end() ){
        CItem *temp = *i;
@@ -54,7 +69,7 @@ void WorkPlace::delete_item(int _id)
        CItem *temp = *i;
                if ( temp->get_id() == _id ){
                        delete_line(_id);
-                       listaItems->erase(i);
+                       lista_logic_Items->erase(i);
                        delete temp;
                        break;
                }
@@ -77,10 +92,53 @@ CItem* WorkPlace::get_logic_item(int _id)
 
 void WorkPlace::delete_line(int _id)
 {
-       std::list<t_line>::iterator i = lista_lineas.begin();
-       while ( i != lista_lineas.end() ){
-               if ( ((*i).logic->get_id() == _id) || ((*i).store->get_id() == _id) )
-                       lista_lineas.erase(i);
+       std::list<t_line>::iterator i = lista_lineas_in.begin();
+       while ( i != lista_lineas_in.end() ){
+               if ( (*i).store->get_id() == _id ) {
+                       lista_lineas_in.erase(i);
+                       i = lista_lineas_in.begin();
+               }
+               i++;
+       }
+
+       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 ) {
+                       lista_lineas_out.erase(i);
+                       i = lista_lineas_out.begin();
+               }
+               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++;
        }
 }