X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/c9f8c0bc99fea35db2944e60ef14441c2c056746..f5a1e732bf3907cabd004932aba3256b31d9d282:/Constructor/constructor.cpp?ds=inline diff --git a/Constructor/constructor.cpp b/Constructor/constructor.cpp index aa27c53..aa162e9 100644 --- a/Constructor/constructor.cpp +++ b/Constructor/constructor.cpp @@ -10,11 +10,23 @@ Constructor::Constructor(BaseObjectType* cobject, const Glib::RefPtrget_widget("btn_canio", btn_canio); 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_bomba", btn_bomba); + refGlade->get_widget("btn_exclusa", btn_exclusa); + refGlade->get_widget("btn_drain", btn_drain); + refGlade->get_widget("btn_and", btn_and); + refGlade->get_widget("btn_or", btn_or); + refGlade->get_widget("btn_not", btn_not); refGlade->get_widget("main_menu_quit",main_menu_quit); refGlade->get_widget("main_menu_save",main_menu_save); refGlade->get_widget("edit_menu_del",edit_menu_del); @@ -38,11 +50,23 @@ Constructor::Constructor(BaseObjectType* cobject, const Glib::RefPtrdrag_source_set(listTargets); btn_codo->drag_source_set(listTargets); btn_tanque->drag_source_set(listTargets); + btn_bomba->drag_source_set(listTargets); + btn_drain->drag_source_set(listTargets); + btn_exclusa->drag_source_set(listTargets); + btn_and->drag_source_set(listTargets); + btn_or->drag_source_set(listTargets); + btn_not->drag_source_set(listTargets); btn_canio->signal_drag_data_get().connect( SigC::slot(*this, &Constructor::on_btn_canio_drag_get)); + btn_bomba->signal_drag_data_get().connect( SigC::slot(*this, &Constructor::on_btn_bomba_drag_get)); + btn_exclusa->signal_drag_data_get().connect( SigC::slot(*this, &Constructor::on_btn_exclusa_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)); + btn_drain->signal_drag_data_get().connect( SigC::slot(*this, &Constructor::on_btn_drain_drag_get)); + btn_and->signal_drag_data_get().connect( SigC::slot(*this, &Constructor::on_btn_and_drag_get)); + btn_or->signal_drag_data_get().connect( SigC::slot(*this, &Constructor::on_btn_or_drag_get)); + btn_not->signal_drag_data_get().connect( SigC::slot(*this, &Constructor::on_btn_not_drag_get)); btn_check->signal_clicked().connect(SigC::slot(*this,&Constructor::on_btn_check_clicked)); btn_dlg_close->signal_clicked().connect(SigC::slot(*this,&Constructor::on_btn_dlg_connect_clicked)); chk_btn_logica->signal_clicked().connect(SigC::slot(*this, &Constructor::on_chk_btn_clicked)); @@ -61,7 +85,12 @@ Constructor::Constructor(BaseObjectType* cobject, const Glib::RefPtrsignal_drag_begin().connect( SigC::slot(*this, &Constructor::on_y_drag_begin)); btn_codo->signal_drag_begin().connect( SigC::slot(*this, &Constructor::on_codo_drag_begin)); btn_tanque->signal_drag_begin().connect( SigC::slot(*this, &Constructor::on_tanque_drag_begin)); - + btn_bomba->signal_drag_begin().connect( SigC::slot(*this, &Constructor::on_bomba_drag_begin)); + btn_exclusa->signal_drag_begin().connect( SigC::slot(*this, &Constructor::on_exclusa_drag_begin)); + btn_drain->signal_drag_begin().connect( SigC::slot(*this, &Constructor::on_drain_drag_begin)); + btn_and->signal_drag_begin().connect( SigC::slot(*this, &Constructor::on_and_drag_begin)); + btn_or->signal_drag_begin().connect( SigC::slot(*this, &Constructor::on_or_drag_begin)); + btn_not->signal_drag_begin().connect( SigC::slot(*this, &Constructor::on_not_drag_begin)); workplace->drag_dest_set(listTargets); workplace->signal_drag_data_received().connect( SigC::slot(*this, &Constructor::on_item_drop_drag_received) ); workplace->listaItems = &listaItems; @@ -71,11 +100,9 @@ Constructor::Constructor(BaseObjectType* cobject, const Glib::RefPtr::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(); } @@ -83,24 +110,55 @@ Constructor::~Constructor() 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); + gtk_selection_data_set (selection_data, selection_data->target, 8, (const guchar*)"canio_n.png", 12); } void Constructor::on_btn_y_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_y.png",10); + gtk_selection_data_set(selection_data, selection_data->target, 8,(const guchar*)"y_n.png",8); } void Constructor::on_btn_codo_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_codo.png",13); + gtk_selection_data_set(selection_data, selection_data->target, 8 ,(const guchar*)"codo_o.png",10); } void Constructor::on_btn_tanque_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_tanque.png",15); + gtk_selection_data_set(selection_data, selection_data->target, 8,(const guchar*)"tanque_e.png",12); +} + +void Constructor::on_btn_bomba_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*)"bomba_e.png",11); +} + +void Constructor::on_btn_exclusa_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*)"exclusa_h.png",13); +} + +void Constructor::on_btn_drain_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*)"drain_n.png",11); +} + +void Constructor::on_btn_and_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*)"and_e.png",9); } +void Constructor::on_btn_or_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*)"or_e.png",8); +} + +void Constructor::on_btn_not_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*)"not_e.png",9); +} + + void Constructor::on_main_menu_quit() { delete this; @@ -114,8 +172,17 @@ void Constructor::on_main_menu_save() } void Constructor::on_edit_menu_del() -{ - // hay que meter algo aca. +{ // OJO que borra al primero que encuentra con el mismo nombre!!! + std::list::iterator i = listaItems.begin(); + Glib::ustring pointed = combo_entry->get_text(); + while ( i != listaItems.end() ){ + CItem *temp = *i; + if ( temp->get_name() == pointed ){ + workplace->delete_item(temp->get_id()); + break; + } + i++; + } } void Constructor::on_chk_btn_clicked() @@ -128,6 +195,7 @@ void Constructor::on_btn_file_ok_clicked() std::list::iterator i = listaItems.begin(); std::string file_name = file_selection->get_filename(); if ( (archivo = fopen( file_name.c_str(), "w+")) != NULL ){ + fprintf(archivo, "\n"); fprintf (archivo,"\n"); while ( i != listaItems.end() ){ CItem *temp = *i; @@ -171,9 +239,44 @@ void Constructor::on_tanque_drag_begin(const Glib::RefPtr& con context->set_icon(ico_tanque, 5, 5); } +void Constructor::on_bomba_drag_begin(const Glib::RefPtr& context) +{ + context->set_icon(ico_bomba, 5, 5); +} + +void Constructor::on_exclusa_drag_begin(const Glib::RefPtr& context) +{ + context->set_icon(ico_exclusa, 5, 5); +} + +void Constructor::on_drain_drag_begin(const Glib::RefPtr& context) +{ + context->set_icon(ico_drain, 5, 5); +} + +void Constructor::on_and_drag_begin(const Glib::RefPtr& context) +{ + context->set_icon(ico_and, 5, 5); +} + +void Constructor::on_or_drag_begin(const Glib::RefPtr& context) +{ + context->set_icon(ico_or, 5, 5); +} + +void Constructor::on_not_drag_begin(const Glib::RefPtr& context) +{ + context->set_icon(ico_not, 5, 5); +} + void Constructor::on_item_drag_begin(const Glib::RefPtr& context, CItem *item) { context->set_icon(item->get_image(), 5, 5); + std::list::iterator i = listaItems.begin(); + while ( i != listaItems.end() ){ + (*i)->set_default_connector(); + i++; + } } void Constructor::on_item_drag_data_get(const Glib::RefPtr& context, GtkSelectionData* selection_data, guint info, guint time) @@ -219,22 +322,31 @@ void Constructor::on_item_drop_drag_received(const Glib::RefPtrlength >= 0) && (selection_data->format == 8)) { CItem *a; - if (strcmp((const char *)selection_data->data, "item_codo.png")==0) + if (strcmp((const char *)selection_data->data, "codo_o.png")==0) a = new Splitter(); - else if (strcmp((const char *)selection_data->data, "item_canio.png")==0) + else if (strcmp((const char *)selection_data->data, "canio_n.png")==0) a = new Conduct(); - else if (strcmp((const char *)selection_data->data, "item_y.png")==0) + else if (strcmp((const char *)selection_data->data, "y_n.png")==0) a = new Union(); - else if (strcmp((const char *)selection_data->data, "item_tanque.png")==0) + else if (strcmp((const char *)selection_data->data, "tanque_e.png")==0) a = new Cistern(); - - //Seteo el ID del item - Glib::ustring name("item"); - // FIXME + else if (strcmp((const char *)selection_data->data, "bomba_e.png")==0) + a =new Pump(); + else if (strcmp((const char *)selection_data->data, "exclusa_h.png")==0) + a = new Exclusa(); + else if (strcmp((const char *)selection_data->data, "drain_n.png")==0) + a = new Drain(); + else if (strcmp((const char *)selection_data->data, "and_e.png")==0) + a = new And(); + else if (strcmp((const char *)selection_data->data, "or_e.png")==0) + a = new Or(); + else if (strcmp((const char *)selection_data->data, "not_e.png")==0) + a = new Not(); + char char_id[10]; - sprintf(char_id," %d",id); + sprintf(char_id,"%d",id); a->set_id(++id); - a->set_name( name+char_id ); + a->set_name( a->get_name()+char_id ); if ( can_drop(a, i*32, j*32) ) { workplace->put(*a, i*32, j*32); //Apunto al workplace @@ -249,7 +361,6 @@ void Constructor::on_item_drop_drag_received(const Glib::RefPtrdrag_source_set(listTargets); // Conecto las señales a->signal_drag_data_get().connect( SigC::slot(*this, &Constructor::on_item_drag_data_get)); - // Utilizo el SigC::bind para que el callback on_drag_begin acepte un // parametro extra, en este caso un CItem *. Esto se hace para // que cuando el usuario quiera mover un item, saber que item es