-Se arregla lo del id cuando se carga una planta

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

diff --git a/Constructor/src/workplace.cpp b/Constructor/src/workplace.cpp
index 293aaf58020a06993693364a00150ea771db2ba1..46b1bcd470aa2ff0242c46a739be0245801dd7f4 100644 (file)
--- a/Constructor/src/workplace.cpp
+++ b/Constructor/src/workplace.cpp
@@ -1,6 +1,8 @@
 #include "workplace.h"
 #include "item.h"
 
 #include "workplace.h"
 #include "item.h"
 

+int WorkPlace::pointed = -1;
+

 WorkPlace::WorkPlace( BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml> &refGlade):Gtk::Fixed(cobject)
 {
 }
 WorkPlace::WorkPlace( BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml> &refGlade):Gtk::Fixed(cobject)
 {
 }


@@ -27,10 +29,12 @@ 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() ) {
                t_line temp = *i;
        std::list<t_line>::iterator i = lista_lineas.begin();
        while ( i != lista_lineas.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_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);

                i++;
        }
        return true;
                i++;
        }
        return true;


@@ -38,6 +42,7 @@ bool WorkPlace::on_expose_event(GdkEventExpose *event)
 
 void WorkPlace::delete_item(int _id)
 {
 
 void WorkPlace::delete_item(int _id)
 {

+       CItem::logic_connect = false;

        std::list<CItem*>::iterator i = listaItems->begin();
        while ( i != listaItems->end() ){
        CItem *temp = *i;
        std::list<CItem*>::iterator i = listaItems->begin();
        while ( i != listaItems->end() ){
        CItem *temp = *i;


@@ -54,7 +59,7 @@ void WorkPlace::delete_item(int _id)
        CItem *temp = *i;
                if ( temp->get_id() == _id ){
                        delete_line(_id);
        CItem *temp = *i;
                if ( temp->get_id() == _id ){
                        delete_line(_id);

-                       listaItems->erase(i);
+                       lista_logic_Items->erase(i);

                        delete temp;
                        break;
                }
                        delete temp;
                        break;
                }


@@ -79,8 +84,18 @@ 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.begin();
        while ( i != lista_lineas.end() ){

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

                        lista_lineas.erase(i);
                        lista_lineas.erase(i);

+                       i = lista_lineas.begin();
+               }

                i++;
        }
                i++;
        }

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

 }
 }