X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/8c66de71aa46a4a20f47b7df17b49ce0d1e6b6d6..67143e098c00b0ee414bde39a78441d8e11fed8b:/Constructor/constructor.cpp diff --git a/Constructor/constructor.cpp b/Constructor/constructor.cpp index ca97953..2f11221 100644 --- a/Constructor/constructor.cpp +++ b/Constructor/constructor.cpp @@ -3,6 +3,7 @@ Constructor::Constructor(BaseObjectType* cobject, const Glib::RefPtr& refGlade):Gtk::Window(cobject) { + id = 0; set_title("Constructor"); @@ -16,12 +17,13 @@ Constructor::Constructor(BaseObjectType* cobject, const Glib::RefPtrget_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 - //Targets: + //Targets listTargets.push_back( Gtk::TargetEntry("STRING") ); listTargets.push_back( Gtk::TargetEntry("text/plain") ); listTargets.push_back( Gtk::TargetEntry("POINTER") ); @@ -38,6 +40,7 @@ Constructor::Constructor(BaseObjectType* cobject, const Glib::RefPtrsignal_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)); @@ -48,11 +51,22 @@ Constructor::Constructor(BaseObjectType* cobject, const Glib::RefPtrdrag_dest_set(listTargets); workplace->signal_drag_data_received().connect( SigC::slot(*this, &Constructor::on_item_drop_drag_received) ); + workplace->listaItems = &listaItems; } Constructor::~Constructor() { + std::list::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& context, GtkSelectionData* selection_data, guint info, guint time) { gtk_selection_data_set (selection_data, selection_data->target, 8, (const guchar*)"item_canio.png", 14); @@ -73,11 +87,16 @@ void Constructor::on_btn_tanque_drag_get(const Glib::RefPtr& c gtk_selection_data_set(selection_data, selection_data->target, 8,(const guchar*)"item_tanque.png",15); } -void Constructor::on_main_menu_quit(void) +void Constructor::on_main_menu_quit() { - Gtk::Main::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& context) { context->set_icon(ico_canio, 5, 5); @@ -108,6 +127,24 @@ void Constructor::on_item_drag_data_get(const Glib::RefPtr& co 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::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& 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 */ @@ -118,7 +155,10 @@ void Constructor::on_item_drop_drag_received(const Glib::RefPtrformat == 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 @@ -126,17 +166,24 @@ void Constructor::on_item_drop_drag_received(const Glib::RefPtrdata, "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) - a = Gtk::manage( new Conduct() ); + a = new Conduct();//Gtk::manage( new Conduct() ); 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) - a = Gtk::manage( new Cistern() ); + a = new Cistern();//Gtk::manage( new Cistern() ); 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 = "<get_id()<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 @@ -151,6 +198,10 @@ void Constructor::on_item_drop_drag_received(const Glib::RefPtrsignal_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); }