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

src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp

@@ -190,47 +190,6 @@ public:
 
 #endif // __linux__
 
-class Priv
-{
-public:
-    Priv() = delete;
-
-    struct EmbossVolume
-    {
-        TriangleMesh      mesh;
-        std::string       name;
-        TextConfiguration cfg;
-        ModelVolumeType   type;
-        size_t            object_idx;
-
-        EmbossVolume(TriangleMesh      mesh,
-                     std::string       name,
-                     TextConfiguration cfg)
-            : mesh(mesh)
-            , name(name)
-            , cfg(cfg)
-            , type(ModelVolumeType::MODEL_PART)
-            , object_idx(0) // not used
-        {}
-
-        EmbossVolume(TriangleMesh      mesh,
-                     std::string       name,
-                     TextConfiguration cfg,
-                     ModelVolumeType   type,
-                     size_t            object_idx)
-            : mesh(mesh)
-            , name(name)
-            , cfg(cfg)
-            , type(type)
-            , object_idx(object_idx)
-        {}
-    };
-
-    // it is called after draw
-    static void create_emboss_object(EmbossVolume *data);
-    static void create_emboss_volume(EmbossVolume *data);
-};
-
 } // namespace Slic3r
 
 using namespace Slic3r;
@@ -310,11 +269,10 @@ void GLGizmoEmboss::create_volume(ModelVolumeType volume_type)
     if(selection.is_empty()) return;
 
     set_default_configuration();
-    auto data = new Priv::EmbossVolume(m_default_mesh, create_volume_name(),
+    TriangleMesh tm = m_default_mesh; // copy
-                                       create_configuration(), volume_type,
+    create_emboss_volume(std::move(tm), create_volume_name(),
-                                       selection.get_object_idx());
+                         create_configuration(), volume_type,
-    wxGetApp().plater()->CallAfter(
+                         selection.get_object_idx());
-        [data]() { Priv::create_emboss_volume(data); });
 }
 
 bool GLGizmoEmboss::on_init()
@@ -387,13 +345,9 @@ void GLGizmoEmboss::on_set_state()
         // When add Text on empty plate, Create new object with volume
         if (create_new_object) {
             set_default_configuration();
-            // data are owen by lambda
+            TriangleMesh tm = m_default_mesh; // copy
-            auto data = new Priv::EmbossVolume(m_default_mesh,
+            create_emboss_object(std::move(tm), create_volume_name(), create_configuration());
-                                               create_volume_name(),
+
-                                               create_configuration());
-            wxGetApp().plater()->CallAfter([data]() {
-                Priv::create_emboss_object(data);
-            });
             // gizmo will open when successfuly create new object
             GLGizmoBase::m_state = GLGizmoBase::Off;
             return;
@@ -410,81 +364,6 @@ void GLGizmoEmboss::on_set_state()
     }
 }
 
-void Priv::create_emboss_object(EmbossVolume *data)
-{
-    ScopeGuard sg([data]() { delete data; });
-
-    GUI_App &        app      = wxGetApp();
-    Plater *         plater   = app.plater();
-    ObjectList *     obj_list = app.obj_list();
-    GLCanvas3D *     canvas   = plater->canvas3D();
-    GLGizmosManager &manager  = canvas->get_gizmos_manager();
-
-    plater->take_snapshot(_L("Add Emboss text object"));
-    // Create new object and change selection
-    bool center = true;
-    obj_list->load_mesh_object(data->mesh, data->name, center, &data->cfg);
-
-    // new object successfuly added so open gizmo    
-    assert(manager.get_current_type() != GLGizmosManager::Emboss);
-    manager.open_gizmo(GLGizmosManager::Emboss);
-
-    // redraw scene
-    canvas->reload_scene(true);
-
-    // Gizmo is not open during time of creation object
-    // When cursor move and no one object is selected than Manager::reset_all() 
-}
-
-void Priv::create_emboss_volume(EmbossVolume* data)
-{
-    ScopeGuard  sg([data]() { delete data; });
-
-    GUI_App &   app      = wxGetApp();
-    Plater *    plater   = app.plater();
-    ObjectList *obj_list = app.obj_list();
-    GLCanvas3D *canvas   = plater->canvas3D();
-
-    size_t          object_idx = data->object_idx;
-    ModelVolumeType type       = data->type;
-
-    // create new volume inside of object
-    Model &model = plater->model();
-    if (model.objects.size() <= object_idx) return;
-    ModelObject *obj = model.objects[object_idx];
-    ModelVolume *volume = obj->add_volume(std::move(data->mesh));
-
-    // set a default extruder value, since user can't add it manually
-    volume->config.set_key_value("extruder", new ConfigOptionInt(0));
-
-    // do not allow model reload from disk
-    volume->source.is_from_builtin_objects = true;
-    volume->set_type(type);
-    volume->name               = data->name;
-    volume->text_configuration = data->cfg;
-
-    // update volume name in object list
-    // updata selection after new volume added
-    // change name of volume in right panel
-    // select only actual volume
-    // when new volume is created change selection to this volume
-    auto add_to_selection = [volume](const ModelVolume *vol) {
-        return vol == volume;
-    };
-    wxDataViewItemArray sel = obj_list->reorder_volumes_and_get_selection((int)object_idx, add_to_selection);
-    if (!sel.IsEmpty()) obj_list->select_item(sel.front());
-
-    // update printable state on canvas
-    if (type == ModelVolumeType::MODEL_PART)
-        canvas->update_instance_printable_state_for_object(object_idx);
-
-    obj_list->selection_changed();
-
-    // redraw scene
-    canvas->reload_scene(true);
-}
-
-
 void GLGizmoEmboss::initialize()
 {
     if (m_is_initialized) return;
@@ -621,12 +500,8 @@ bool GLGizmoEmboss::process()
     // exist loaded font?
     if (m_font == nullptr) return false;
 
-    auto data                = std::make_unique<EmbossData>();
+    auto data = std::make_unique<EmbossData>(
-    data->font = m_font;
+        m_font, create_configuration(), create_volume_name(), m_volume);
-    data->text_configuration = create_configuration();
-    data->volume_name        = create_volume_name();
-    data->volume_ptr         = m_volume;
-    data->object_idx         = m_parent.get_selection().get_object_idx();
     m_job->run(std::move(data));
 
     // notification is removed befor object is changed by job
@@ -1413,6 +1288,228 @@ std::string GLGizmoEmboss::imgui_trunc(const std::string &text, float width)
     return text.substr(0, count_letter) + tail;
 }
 
+namespace Slic3r {
+
+class Priv
+{
+public:
+    Priv() = delete;
+    struct EmbossObject
+    {
+        TriangleMesh      mesh;
+        std::string       name;
+        TextConfiguration cfg;
+
+        EmbossObject(TriangleMesh &&   mesh,
+                     std::string       name,
+                     TextConfiguration cfg)
+            : mesh(std::move(mesh)), name(name), cfg(cfg)
+        {}
+    };
+    struct EmbossVolume : public EmbossObject
+    {
+        ModelVolumeType type;
+        size_t          object_idx;
+        EmbossVolume(TriangleMesh &&   mesh,
+                     std::string       name,
+                     TextConfiguration cfg,
+                     ModelVolumeType   type,
+                     size_t            object_idx)
+            : EmbossObject(std::move(mesh), name, cfg)
+            , type(type)
+            , object_idx(object_idx)
+        {}
+    };
+    struct UpdateVolume
+    {
+        TriangleMesh      mesh;
+        std::string       name;
+        TextConfiguration cfg;
+        ModelVolume *     volume;
+        UpdateVolume(TriangleMesh &&   mesh,
+                     std::string       name,
+                     TextConfiguration cfg,
+                     ModelVolume *     volume)
+            : mesh(std::move(mesh)), name(name), cfg(cfg), volume(volume)
+        {}
+    };
+
+    static void create_emboss_object(EmbossObject &data);
+    static void create_emboss_volume(EmbossVolume &data);
+    static void update_emboss_volume(UpdateVolume &data);
+};
+
+} // namespace Slic3r
+
+void GLGizmoEmboss::create_emboss_object(TriangleMesh &&   mesh,
+                                         std::string       name,
+                                         TextConfiguration cfg)
+{
+    // Move data to call after is not working
+    // data are owen by lambda
+    auto data = new Priv::EmbossObject(std::move(mesh), name, cfg);
+    wxGetApp().plater()->CallAfter([data]() {
+        ScopeGuard sg([data]() { delete data; });
+        Priv::create_emboss_object(*data);
+    });
+}
+
+void GLGizmoEmboss::create_emboss_volume(TriangleMesh &&   mesh,
+                                         std::string       name,
+                                         TextConfiguration cfg,
+                                         ModelVolumeType   type,
+                                         size_t            object_idx)
+{
+    // Move data to call after is not working
+    // data are owen by lambda
+    auto data = new Priv::EmbossVolume(std::move(mesh), name, cfg, type,
+                                       object_idx);
+    wxGetApp().plater()->CallAfter([data]() {
+        ScopeGuard sg([data]() { delete data; });
+        Priv::create_emboss_volume(*data);
+    });
+}
+
+void GLGizmoEmboss::update_emboss_volume(TriangleMesh &&   mesh,
+                                         std::string       name,
+                                         TextConfiguration cfg,
+                                         ModelVolume *     volume)
+{
+    // Move data to call after is not working
+    // data are owen by lambda
+    auto data = new Priv::UpdateVolume(std::move(mesh), name, cfg, volume);
+    wxGetApp().plater()->CallAfter([data]() {
+        ScopeGuard sg([data]() { delete data; });
+        Priv::update_emboss_volume(*data);
+    });
+}
+
+void Priv::create_emboss_object(EmbossObject &data)
+{
+    GUI_App &        app      = wxGetApp();
+    Plater *         plater   = app.plater();
+    ObjectList *     obj_list = app.obj_list();
+    GLCanvas3D *     canvas   = plater->canvas3D();
+    GLGizmosManager &manager  = canvas->get_gizmos_manager();
+
+    plater->take_snapshot(_L("Add Emboss text object"));
+    // Create new object and change selection
+    bool center = true;
+    obj_list->load_mesh_object(std::move(data.mesh), data.name, center,
+                               &data.cfg);
+
+    // new object successfuly added so open gizmo
+    assert(manager.get_current_type() != GLGizmosManager::Emboss);
+    manager.open_gizmo(GLGizmosManager::Emboss);
+
+    // redraw scene
+    canvas->reload_scene(true);
+
+    // Gizmo is not open during time of creation object
+    // When cursor move and no one object is selected than Manager::reset_all()
+}
+
+void Priv::create_emboss_volume(EmbossVolume &data)
+{
+    GUI_App &   app      = wxGetApp();
+    Plater *    plater   = app.plater();
+    ObjectList *obj_list = app.obj_list();
+    GLCanvas3D *canvas   = plater->canvas3D();
+
+    size_t          object_idx = data.object_idx;
+    ModelVolumeType type       = data.type;
+
+    // create new volume inside of object
+    Model &model = plater->model();
+    if (model.objects.size() <= object_idx) return;
+    ModelObject *obj    = model.objects[object_idx];
+    ModelVolume *volume = obj->add_volume(std::move(data.mesh));
+
+    // set a default extruder value, since user can't add it manually
+    volume->config.set_key_value("extruder", new ConfigOptionInt(0));
+
+    // do not allow model reload from disk
+    volume->source.is_from_builtin_objects = true;
+    volume->set_type(type);
+    volume->name               = data.name;
+    volume->text_configuration = data.cfg;
+
+    // update volume name in object list
+    // updata selection after new volume added
+    // change name of volume in right panel
+    // select only actual volume
+    // when new volume is created change selection to this volume
+    auto add_to_selection = [volume](const ModelVolume *vol) {
+        return vol == volume;
+    };
+    wxDataViewItemArray sel =
+        obj_list->reorder_volumes_and_get_selection((int) object_idx,
+                                                    add_to_selection);
+    if (!sel.IsEmpty()) obj_list->select_item(sel.front());
+
+    // update printable state on canvas
+    if (type == ModelVolumeType::MODEL_PART)
+        canvas->update_instance_printable_state_for_object(object_idx);
+
+    obj_list->selection_changed();
+
+    // redraw scene
+    canvas->reload_scene(true);
+}
+
+void Priv::update_emboss_volume(UpdateVolume &data) {
+    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;
+
+    const std::string &name = data.name;
+
+    plater->take_snapshot(_L("Emboss text") + ": " + name);
+
+    // find volume by object id - NOT WORK
+    // -> edit text change volume id so could apper not found volume
+    //ModelVolume *volume = nullptr;
+    //Model &model = plater->model();
+    //for (auto obj : model.objects)
+    //    for (auto vol : obj->volumes)
+    //        if (vol->id() == volume_id) { 
+    //            volume = vol;
+    //            break;
+    //        }
+    //if (volume == nullptr) return;
+    ModelVolume *volume = data.volume;
+    assert(volume != nullptr);
+
+    // update volume
+    volume->set_mesh(std::move(data.mesh));
+    volume->set_new_unique_id();
+    volume->calculate_convex_hull();
+    volume->get_object()->invalidate_bounding_box();
+    volume->name               = name;
+    volume->text_configuration = data.cfg;
+
+    // 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);
+
+    // redraw scene
+    canvas->reload_scene(true);
+}
+
 /// <summary>
 /// WxFontUtils - Start definition
 /// </summary>

src/slic3r/GUI/Gizmos/GLGizmoEmboss.hpp

@@ -24,7 +24,8 @@ namespace Slic3r::GUI {
 class EmbossJob;
 
 class GLGizmoEmboss : public GLGizmoBase
-{    
+{  
+    friend EmbossJob;
 public:
     GLGizmoEmboss(GLCanvas3D& parent);
 
@@ -150,6 +151,20 @@ private:
     std::optional<FontItem> get_font_item(const std::map<std::string, std::string> &app_cfg_section);
     void set_font_item(AppConfig &cfg, const FontItem &fi, unsigned index);
 
+    // call after functions to work outside of drawing
+    static void create_emboss_object(TriangleMesh &&   mesh,
+                                     std::string       name,
+                                     TextConfiguration cfg);
+    static void create_emboss_volume(TriangleMesh &&   mesh,
+                                     std::string       name,
+                                     TextConfiguration cfg,
+                                     ModelVolumeType   type,
+                                     size_t            object_idx);
+    static void update_emboss_volume(TriangleMesh &&   mesh,
+                                     std::string       name,
+                                     TextConfiguration cfg,
+                                     ModelVolume *     volume);
+
     // only temporary solution
     static const std::string M_ICON_FILENAME;
 

src/slic3r/GUI/Jobs/EmbossJob.cpp

@@ -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));
+    TriangleMesh result(Emboss::polygons2model(shapes, project));
-
-    if (is_stoping()) return;
 
     // 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();
+    Vec3d shift = result.bounding_box().center();
-    tm.translate(-shift.cast<float>());
+    result.translate(-shift.cast<float>());
-    const std::string &name = input.volume_name;
 
-    plater->take_snapshot(_L("Emboss text") + ": " + name);
+    if (is_stoping()) return;
-    ModelVolume *volume = input.volume_ptr;
+    GLGizmoEmboss::update_emboss_volume(std::move(result), input->volume_name,
-    assert(volume != nullptr);
+                                        input->text_configuration,
-
+                                        input->volume);
-    // 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);
-}

src/slic3r/GUI/Jobs/EmbossJob.hpp

@@ -3,6 +3,7 @@
 
 #include "StopableJob.hpp"
 #include "libslic3r/Emboss.hpp"
+//#include "libslic3r/ObjectID.hpp"
 
 namespace Slic3r {
 class ModelVolume;
@@ -18,10 +19,24 @@ struct EmbossData
     TextConfiguration text_configuration;
     // new volume name created from text
     std::string volume_name;
-    // when volume_ptr == nullptr than new volume will be created
+
-    ModelVolume *volume_ptr;
+    // unique identifier of volume to change
-    // when volume_ptr == nullptr && object_idx < 0 than new object will be created
+    // I can't proove of alive pointer
-    int object_idx;
+    ModelVolume *volume;
+
+    // unique identifier of volume to change
+    // Change of volume change id, last change could disapear
+    //ObjectID     volume_id;
+
+    EmbossData(std::shared_ptr<Emboss::Font> font,
+               TextConfiguration             text_configuration,
+               std::string                   volume_name,
+               ModelVolume *                 volume)
+        : font(std::move(font))
+        , text_configuration(text_configuration)
+        , volume_name(volume_name)
+        , volume(volume)
+    {}
 };
 
 class EmbossJob : public StopableJob<EmbossData>