Se arreglan detalles, ya compila pero se cuelga cuando se conecta un cliente.

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

diff --git a/Constructor/workplace.cpp b/Constructor/workplace.cpp
index f3874e35cfddbd645119714beb94d1f3b3d3a0ae..3baa40894635939479e6e18dc4e8efdea255b534 100644 (file)
--- a/Constructor/workplace.cpp
+++ b/Constructor/workplace.cpp
@@ -1,13 +1,16 @@
-
-

 #include "workplace.h"
 #include "workplace.h"

-#include "item.h"
+

 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)
 {

-       
+       refGlade->get_widget_derived("viewport",viewport);
+       this->signal_button_press_event().connect(SigC::slot(*this,&WorkPlace::on_button_press_event));
+}
+
+WorkPlace::~WorkPlace()
+{

 }
 
 }
 

-bool WorkPlace::on_expose_event(GdkEventExpose *e)
+bool WorkPlace::on_expose_event(GdkEventExpose *event)

 {
        int x, y;
        for(x=0; x<get_width(); x+=32) 
 {
        int x, y;
        for(x=0; x<get_width(); x+=32) 


@@ -18,5 +21,42 @@ bool WorkPlace::on_expose_event(GdkEventExpose *e)
                        get_window()->draw_point (get_style()->get_black_gc(), x+1,y);
                        get_window()->draw_point (get_style()->get_black_gc(), x-1,y);
                }
                        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;
 }
        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);
+       }
+       return true;
+}
+
+void WorkPlace::delete_item(int _id)
+{
+       std::list<CItem*>::iterator i = listaItems->begin();
+       while ( i != listaItems->end() ){
+       CItem *temp = *i;
+               if ( temp->get_id() == _id ){
+                       listaItems->erase(i);
+                       delete temp;
+                       break;
+               }
+               i++;
+       }
+}