3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Move call after close in code (I hope in change way of modify volume)

Browse source
This commit is contained in:
Filip Sykala 2021-11-26 13:48:22 +01:00
parent 4dda090105
commit b143c543c7
4 changed files with 276 additions and 216 deletions
Download patch file Download diff file Expand all files Collapse all files

87
src/slic3r/GUI/Jobs/EmbossJob.cpp
View file

@ -9,14 +9,11 @@
#include "slic3r/GUI/MainFrame.hpp"
#include "slic3r/GUI/GUI.hpp"
#include "slic3r/GUI/GUI_App.hpp"
#include "slic3r/GUI/Gizmos/GLGizmoEmboss.hpp"
using namespace Slic3r;
using namespace GUI;
namespace Priv {
static void finalize(const EmbossData &input, const indexed_triangle_set &result);
} // namespace Priv
void EmbossJob::process(std::unique_ptr<EmbossData> input)
{
// Changing cursor to busy
@ -46,81 +43,17 @@ void EmbossJob::process(std::unique_ptr<EmbossData> input)
float scale = prop.size_in_mm / input->font->ascent;
auto projectZ = std::make_unique<Emboss::ProjectZ>(prop.emboss / scale);
Emboss::ProjectScale project(std::move(projectZ), scale);
auto its = std::make_unique<indexed_triangle_set>(Emboss::polygons2model(shapes, project));
if (is_stoping()) return;
TriangleMesh result(Emboss::polygons2model(shapes, project));
// for sure that some object is created from shape
if (its->indices.empty()) return;
if (result.its.indices.empty()) return;
// Call setting model in UI thread
// Not work !!! CallAfter use only reference to lambda not lambda itself
// wxGetApp().plater()->CallAfter(
// [its2 = std::move(its), input2 = std::move(input)]() {
// Priv::finalize(*input2, *its2);
// });
struct Data
{
std::unique_ptr<EmbossData> input;
std::unique_ptr<indexed_triangle_set> result;
Data(std::unique_ptr<EmbossData> input,
std::unique_ptr<indexed_triangle_set> result)
: input(std::move(input)), result(std::move(result))
{}
};
Data *data = new Data(std::move(input), std::move(its));
// How to proof that call, will be done on exit?
wxGetApp().plater()->CallAfter([data]() {
// because of finalize exception delete must be in ScopeGuard
ScopeGuard sg([data]() { delete data; });
Priv::finalize(*data->input, *data->result);
});
}
void Priv::finalize(const EmbossData &input, const indexed_triangle_set &result)
{
GUI_App & app = wxGetApp(); // may be move to input
Plater * plater = app.plater();
ObjectList * obj_list = app.obj_list();
GLCanvas3D * canvas = plater->canvas3D();
GLGizmosManager &manager = canvas->get_gizmos_manager();
// Check emboss gizmo is still open
if (manager.get_current_type() != GLGizmosManager::Emboss) return;
// it is sad, but there is no move constructor --> copy
TriangleMesh tm(std::move(result));
// center triangle mesh
Vec3d shift = tm.bounding_box().center();
tm.translate(-shift.cast<float>());
const std::string &name = input.volume_name;
Vec3d shift = result.bounding_box().center();
result.translate(-shift.cast<float>());
plater->take_snapshot(_L("Emboss text") + ": " + name);
ModelVolume *volume = input.volume_ptr;
assert(volume != nullptr);
// update volume
volume->set_mesh(std::move(tm));
volume->set_new_unique_id();
volume->calculate_convex_hull();
volume->get_object()->invalidate_bounding_box();
volume->name = name;
volume->text_configuration = input.text_configuration;
// update volume in right panel( volume / object name)
const Selection &selection = canvas->get_selection();
const GLVolume *v = selection.get_volume(*selection.get_volume_idxs().begin());
int object_idx = v->object_idx();
int volume_idx = v->volume_idx();
obj_list->update_name_in_list(object_idx, volume_idx);
// update printable state on canvas
if (volume->type() == ModelVolumeType::MODEL_PART)
canvas->update_instance_printable_state_for_object((size_t) object_idx);
// Job promiss to refresh is not working
canvas->reload_scene(true);
}
if (is_stoping()) return;
GLGizmoEmboss::update_emboss_volume(std::move(result), input->volume_name,
input->text_configuration,
input->volume);
}