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

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

diff --git a/Constructor/workplace.cpp b/Constructor/workplace.cpp
index 3baa40894635939479e6e18dc4e8efdea255b534..652cf017cc168758336f4e3ae42014494831e473 100644 (file)
--- a/Constructor/workplace.cpp
+++ b/Constructor/workplace.cpp
@@ -1,9 +1,8 @@
 #include "workplace.h"
+#include "item.h"
 
 WorkPlace::WorkPlace( BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml> &refGlade):Gtk::Fixed(cobject)
 {
-       refGlade->get_widget_derived("viewport",viewport);
-       this->signal_button_press_event().connect(SigC::slot(*this,&WorkPlace::on_button_press_event));
 }
 
 WorkPlace::~WorkPlace()
@@ -21,28 +20,18 @@ 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);
                }
-       //TODO recorer la lista_lineas y dibujar todas          
-       get_window()->draw_line (get_style()->get_black_gc(), temp.x,temp.y,temp.w,temp.z);
-       return true;
-}
-
-
-bool WorkPlace::on_button_press_event(GdkEventButton *event)
-{
-       std::cout<< temp.x<<"    "<<temp.y<< std::endl;
-       if ( (event->type == GDK_BUTTON_PRESS) && (event->button == 1) ) {
-               get_pointer(temp.x,temp.y);
-               std::cout<< temp.x<<"    "<<temp.y<< std::endl;
-       }
-       return true;
-}
-
-bool WorkPlace::on_button_release_event(GdkEventButton *event)
-{
-       if ( (event->type == GDK_BUTTON_PRESS) && (event->button == 1) ) {
-               get_pointer(temp.w,temp.z);     
-               lista_lineas.push_back(temp);
-               get_window()->draw_line (get_style()->get_black_gc(), temp.x,temp.y,temp.w,temp.z);
+               
+       
+       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;
+               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());
+               i++;
        }
        return true;
 }
@@ -53,10 +42,45 @@ void WorkPlace::delete_item(int _id)
        while ( i != listaItems->end() ){
        CItem *temp = *i;
                if ( temp->get_id() == _id ){
+                       delete_line(_id);
                        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)
+{
+       std::list<CItem *>::iterator i = lista_logic_Items->begin();
+       while ( i != lista_logic_Items->end() ){
+               CItem *temp = *i;
+               if ( temp->get_id() == _id ) 
+                       return temp;
+               i++;
+       }
+       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++;
+       }
 }