hay pequenias modificaciones en el workplace, se cuelga por eso pero en un rato lo...

diff --git a/Constructor/workplace.cpp b/Constructor/workplace.cpp
index ddc671e1aef34fbc3e1da68e6e4b6b536e809ea5..652cf017cc168758336f4e3ae42014494831e473 100644 (file)
--- a/Constructor/workplace.cpp
+++ b/Constructor/workplace.cpp
@@ -21,6 +21,12 @@ bool WorkPlace::on_expose_event(GdkEventExpose *event)
                        get_window()->draw_point (get_style()->get_black_gc(), x-1,y);
                }
                
                        get_window()->draw_point (get_style()->get_black_gc(), x-1,y);
                }
                

+       
+       Glib::RefPtr<Gdk::GC> gc = get_style()->get_black_gc();
+       Gdk::Color color;
+       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() ) {
                t_line temp = *i;
        std::list<t_line>::iterator i = lista_lineas.begin();
        while ( i != lista_lineas.end() ) {
                t_line temp = *i;


@@ -36,12 +42,25 @@ void WorkPlace::delete_item(int _id)
        while ( i != listaItems->end() ){
        CItem *temp = *i;
                if ( temp->get_id() == _id ){
        while ( i != listaItems->end() ){
        CItem *temp = *i;
                if ( temp->get_id() == _id ){

+                       delete_line(_id);

                        listaItems->erase(i);
                        delete temp;
                        break;
                }
                i++;
        }
                        listaItems->erase(i);
                        delete temp;
                        break;
                }
                i++;
        }

+       i = lista_logic_Items->begin();
+       while ( i != lista_logic_Items->end() ){
+       CItem *temp = *i;
+               if ( temp->get_id() == _id ){
+                       delete_line(_id);
+                       listaItems->erase(i);
+                       delete temp;
+                       break;
+               }
+               i++;
+       }
+       

 }
 
 CItem* WorkPlace::get_logic_item(int _id)
 }
 
 CItem* WorkPlace::get_logic_item(int _id)


@@ -55,3 +74,13 @@ CItem* WorkPlace::get_logic_item(int _id)
        }
        return NULL;
 }
        }
        return NULL;
 }

+
+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);
+               i++;
+       }
+}

diff --git a/Constructor/workplace.h b/Constructor/workplace.h
index 896e908f68d577e213ec53f516f3d85423428071..2bb065318914f57221a27a0d2a582299affbe941 100644 (file)
--- a/Constructor/workplace.h
+++ b/Constructor/workplace.h
@@ -17,7 +17,8 @@ class WorkPlace:public Gtk::Fixed {
                WorkPlace(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml> &refGlade);
                virtual ~WorkPlace();
                virtual bool on_expose_event(GdkEventExpose *event);
                WorkPlace(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml> &refGlade);
                virtual ~WorkPlace();
                virtual bool on_expose_event(GdkEventExpose *event);

-               void delete_item(int _id);      
+               void delete_item(int _id);
+               void delete_line(int _id);      

                CItem *get_logic_item(int _id);
                std::list<CItem *> *listaItems, *lista_logic_Items;
                std::list<t_line> lista_lineas;
                CItem *get_logic_item(int _id);
                std::list<CItem *> *listaItems, *lista_logic_Items;
                std::list<t_line> lista_lineas;