casi no se solapan items, y ademas se pueden eliminar

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

diff --git a/Constructor/constructor.cpp b/Constructor/constructor.cpp
index 19a59729b57568536790cc718c04e9af3d365ffe..2f1122177f0a6a3b635d52ea0b49e25fc3b2c252 100644 (file)
--- a/Constructor/constructor.cpp
+++ b/Constructor/constructor.cpp
@@ -3,6 +3,7 @@
 
 Constructor::Constructor(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade):Gtk::Window(cobject)
 {
 
 Constructor::Constructor(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade):Gtk::Window(cobject)
 {

+       id = 0;

        set_title("Constructor");
        
        
        set_title("Constructor");
        
        


@@ -15,12 +16,14 @@ Constructor::Constructor(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glad
        refGlade->get_widget("btn_codo", btn_codo);
        refGlade->get_widget("btn_y", btn_y);
        refGlade->get_widget("btn_tanque",btn_tanque);
        refGlade->get_widget("btn_codo", btn_codo);
        refGlade->get_widget("btn_y", btn_y);
        refGlade->get_widget("btn_tanque",btn_tanque);

+       refGlade->get_widget("main_menu_quit",main_menu_quit);
+       refGlade->get_widget("edit_menu_del",edit_menu_del);

        
        refGlade->get_widget_derived("workplace", workplace);  //fixed
        
        
        
        
        refGlade->get_widget_derived("workplace", workplace);  //fixed
        
        
        

-       //Targets:
+       //Targets

        listTargets.push_back( Gtk::TargetEntry("STRING") );
        listTargets.push_back( Gtk::TargetEntry("text/plain") );
        listTargets.push_back( Gtk::TargetEntry("POINTER") );
        listTargets.push_back( Gtk::TargetEntry("STRING") );
        listTargets.push_back( Gtk::TargetEntry("text/plain") );
        listTargets.push_back( Gtk::TargetEntry("POINTER") );


@@ -35,6 +38,10 @@ Constructor::Constructor(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glad
        btn_y->signal_drag_data_get().connect( SigC::slot(*this, &Constructor::on_btn_y_drag_get));
        btn_codo->signal_drag_data_get().connect( SigC::slot(*this, &Constructor::on_btn_codo_drag_get));
        btn_tanque->signal_drag_data_get().connect( SigC::slot(*this, &Constructor::on_btn_tanque_drag_get));
        btn_y->signal_drag_data_get().connect( SigC::slot(*this, &Constructor::on_btn_y_drag_get));
        btn_codo->signal_drag_data_get().connect( SigC::slot(*this, &Constructor::on_btn_codo_drag_get));
        btn_tanque->signal_drag_data_get().connect( SigC::slot(*this, &Constructor::on_btn_tanque_drag_get));

+       
+       main_menu_quit->signal_activate().connect(SigC::slot(*this, &Constructor::on_main_menu_quit));
+       edit_menu_del->signal_activate().connect(SigC::slot(*this,&Constructor::on_edit_menu_del));
+       

        // Señales para cambiar el icono cuando empieza el drag.
        btn_canio->signal_drag_begin().connect( SigC::slot(*this, &Constructor::on_canio_drag_begin));
        btn_y->signal_drag_begin().connect( SigC::slot(*this, &Constructor::on_y_drag_begin));
        // Señales para cambiar el icono cuando empieza el drag.
        btn_canio->signal_drag_begin().connect( SigC::slot(*this, &Constructor::on_canio_drag_begin));
        btn_y->signal_drag_begin().connect( SigC::slot(*this, &Constructor::on_y_drag_begin));


@@ -44,11 +51,22 @@ Constructor::Constructor(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glad
        
        workplace->drag_dest_set(listTargets);
        workplace->signal_drag_data_received().connect( SigC::slot(*this, &Constructor::on_item_drop_drag_received) );  
        
        workplace->drag_dest_set(listTargets);
        workplace->signal_drag_data_received().connect( SigC::slot(*this, &Constructor::on_item_drop_drag_received) );  

+       workplace->listaItems = &listaItems;    

 }
 
 Constructor::~Constructor()
 {
 }
 
 Constructor::~Constructor()
 {

+       std::list<CItem *>::iterator i = listaItems.begin();
+       std::cout << "ok" << std::endl;
+       while ( i != listaItems.end() ){
+               CItem *temp = *i;
+               listaItems.erase(i);
+               std::cout << "Elimnando ... " << std::endl;
+               delete temp;
+               i = listaItems.begin();
+       }

 }
 }

+

 void Constructor::on_btn_canio_drag_get(const Glib::RefPtr<Gdk::DragContext>& context, GtkSelectionData* selection_data, guint info, guint time)
 {
        gtk_selection_data_set (selection_data, selection_data->target, 8, (const guchar*)"item_canio.png", 14);
 void Constructor::on_btn_canio_drag_get(const Glib::RefPtr<Gdk::DragContext>& context, GtkSelectionData* selection_data, guint info, guint time)
 {
        gtk_selection_data_set (selection_data, selection_data->target, 8, (const guchar*)"item_canio.png", 14);


@@ -69,6 +87,16 @@ void Constructor::on_btn_tanque_drag_get(const Glib::RefPtr<Gdk::DragContext>& c
        gtk_selection_data_set(selection_data, selection_data->target, 8,(const guchar*)"item_tanque.png",15);
 }
 
        gtk_selection_data_set(selection_data, selection_data->target, 8,(const guchar*)"item_tanque.png",15);
 }
 

+void Constructor::on_main_menu_quit()
+{
+       //Gtk::Main::quit();
+       hide();
+}
+
+void Constructor::on_edit_menu_del()
+{
+       // hay que meter algo aca.
+}

 void Constructor::on_canio_drag_begin(const Glib::RefPtr<Gdk::DragContext>& context)
 {
        context->set_icon(ico_canio, 5, 5); 
 void Constructor::on_canio_drag_begin(const Glib::RefPtr<Gdk::DragContext>& context)
 {
        context->set_icon(ico_canio, 5, 5); 


@@ -99,6 +127,24 @@ void Constructor::on_item_drag_data_get(const Glib::RefPtr<Gdk::DragContext>& co
                gtk_selection_data_set (selection_data, selection_data->target, 10, (const guchar*)"item_codo.png", 13);
 }
 
                gtk_selection_data_set (selection_data, selection_data->target, 10, (const guchar*)"item_codo.png", 13);
 }
 

+bool Constructor::can_drop(CItem *item, int x, int y)
+{
+       std::list<CItem*>::iterator  i = listaItems.begin();
+       while( i != listaItems.end() ) {
+               CItem *temp = *i;
+               if ( temp->get_id() != item->get_id()   ) {
+                       if (  (temp->is_occupied_area(x, y))  ||  
+                               ( temp->is_occupied_area(x+item->get_image()->get_width()-1, y+item->get_image()->get_height()-1))  ||
+                               ( temp->is_occupied_area(x, y+item->get_image()->get_height()-1)) ||
+                               ( temp->is_occupied_area(x+item->get_image()->get_width()-1, y) ) ) 
+                               return false;
+                       else i++;
+               }
+               else i++;
+       }
+       return true;
+}
+

 void Constructor::on_item_drop_drag_received(const Glib::RefPtr<Gdk::DragContext>& context, int x, int y, GtkSelectionData* selection_data, guint info, guint time)
 {
                /* Ajusto coordenada x e y para que caigan en un lugar de una cuadricula de 32x32 */
 void Constructor::on_item_drop_drag_received(const Glib::RefPtr<Gdk::DragContext>& context, int x, int y, GtkSelectionData* selection_data, guint info, guint time)
 {
                /* Ajusto coordenada x e y para que caigan en un lugar de una cuadricula de 32x32 */


@@ -109,7 +155,10 @@ void Constructor::on_item_drop_drag_received(const Glib::RefPtr<Gdk::DragContext
        j = (y+1)/32;
        // El drag es de un item
        if (selection_data->format == 10) {
        j = (y+1)/32;
        // El drag es de un item
        if (selection_data->format == 10) {

-               workplace->move(*drag_get_source_widget(context), i*32, j*32);
+               if (can_drop(((CItem*)drag_get_source_widget(context)),i*32, j*32)){
+                       ((CItem*)drag_get_source_widget(context))->set_position(i*32, j*32);
+                       workplace->move(*drag_get_source_widget(context), i*32, j*32);
+               }

        }
 
        // El Drag es desde la barra de tareas
        }
 
        // El Drag es desde la barra de tareas


@@ -117,17 +166,24 @@ void Constructor::on_item_drop_drag_received(const Glib::RefPtr<Gdk::DragContext
   {
        CItem *a;
        if (strcmp((const char *)selection_data->data, "item_codo.png")==0) 
   {
        CItem *a;
        if (strcmp((const char *)selection_data->data, "item_codo.png")==0) 

-               a = Gtk::manage( new Splitter() );
+               a = new Splitter();//Gtk::manage( new Splitter() );

        else    if (strcmp((const char *)selection_data->data, "item_canio.png")==0) 
        else    if (strcmp((const char *)selection_data->data, "item_canio.png")==0) 

-                               a = Gtk::manage( new Conduct() );
+                               a = new Conduct();//Gtk::manage( new Conduct() );

                        else if (strcmp((const char *)selection_data->data, "item_y.png")==0) 
                        else if (strcmp((const char *)selection_data->data, "item_y.png")==0) 

-                                               a = Gtk::manage( new Union() );
+                                               a = new Union();//Gtk::manage( new Union() );

                                        else if (strcmp((const char *)selection_data->data, "item_tanque.png")==0) 
                                        else if (strcmp((const char *)selection_data->data, "item_tanque.png")==0) 

-                                                               a = Gtk::manage( new Cistern() );
+                                                               a = new Cistern();//Gtk::manage( new Cistern() );

                                                        else
                                                        else

-                                                               a = Gtk::manage( new CItem((const char *)selection_data->data) );
-                                               
+                                                               a = new CItem();//Gtk::manage( new CItem((const char *)selection_data->data) );
+       //Seteo el ID del item
+       a->set_id(++id);                
+       std::cout << can_drop(a, i*32, j*32) <<" ---  tamanio lista = "<< listaItems.size()<< "item = "<<a->get_id()<<std::endl;
+       if ( can_drop(a, i*32, j*32) ) {

                workplace->put(*a, i*32, j*32);
                workplace->put(*a, i*32, j*32);

+               //Apunto al workplace
+               a->workplace= workplace;
+               //Seteo la posicion del item
+               a->set_position(i*32,j*32);

                // Seteo la lista de tipos de drags 
                a->drag_source_set(listTargets);
                // Conecto las señales
                // Seteo la lista de tipos de drags 
                a->drag_source_set(listTargets);
                // Conecto las señales


@@ -142,6 +198,10 @@ void Constructor::on_item_drop_drag_received(const Glib::RefPtr<Gdk::DragContext
                a->signal_drag_begin().connect(SigC::bind( SigC::slot(*this, &Constructor::on_item_drag_begin), a));
                a->show();      
                listaItems.push_back(a);
                a->signal_drag_begin().connect(SigC::bind( SigC::slot(*this, &Constructor::on_item_drag_begin), a));
                a->show();      
                listaItems.push_back(a);

+       } else {
+                       id--;
+                       delete a;
+       }

   }
   context->drag_finish(false, false, time);
 }
   }
   context->drag_finish(false, false, time);
 }