From 4245b61afc5ce4edf746efa96e317b1efc6c47eb Mon Sep 17 00:00:00 2001 From: YuSanka Date: Tue, 23 Jul 2019 16:17:37 +0200 Subject: [PATCH 1/4] Added SETTINGS_SELECTED_ON_SIDEBAR flag to undo/redo --- src/slic3r/GUI/GUI_ObjectList.cpp | 35 ++++++++++++++++++++++++------- src/slic3r/GUI/GUI_ObjectList.hpp | 6 +++++- src/slic3r/GUI/Plater.cpp | 8 +++++++ src/slic3r/Utils/UndoRedo.hpp | 1 + 4 files changed, 42 insertions(+), 8 deletions(-) diff --git a/src/slic3r/GUI/GUI_ObjectList.cpp b/src/slic3r/GUI/GUI_ObjectList.cpp index a2ddba376..cc7c6c888 100644 --- a/src/slic3r/GUI/GUI_ObjectList.cpp +++ b/src/slic3r/GUI/GUI_ObjectList.cpp @@ -2638,7 +2638,8 @@ void ObjectList::update_selections() const Selection& selection = wxGetApp().plater()->canvas3D()->get_selection(); wxDataViewItemArray sels; - m_selection_mode = smInstance; + if (m_selection_mode & smSettings == 0) + m_selection_mode = smInstance; // We doesn't update selection if SettingsItem for the current object/part is selected // if (GetSelectedItemsCount() == 1 && m_objects_model->GetItemType(GetSelection()) == itSettings ) @@ -2664,6 +2665,12 @@ void ObjectList::update_selections() else if (selection.is_single_full_object() || selection.is_multiple_full_object()) { const Selection::ObjectIdxsToInstanceIdxsMap& objects_content = selection.get_content(); + if (m_selection_mode & smSettings) + { + wxDataViewItem obj_item = m_objects_model->GetItemById(objects_content.begin()->first); + sels.Add(m_objects_model->GetSettingsItem(obj_item)); + } + else { for (const auto& object : objects_content) { if (object.second.size() == 1) // object with 1 instance sels.Add(m_objects_model->GetItemById(object.first)); @@ -2688,10 +2695,23 @@ void ObjectList::update_selections() for (const auto& inst : instances) sels.Add(m_objects_model->GetItemByInstanceId(object.first, inst)); } - } + } } } else if (selection.is_any_volume() || selection.is_any_modifier()) { + if (m_selection_mode & smSettings) + { + const auto idx = *selection.get_volume_idxs().begin(); + const auto gl_vol = selection.get_volume(idx); + if (gl_vol->volume_idx() >= 0) { + // Only add GLVolumes with non-negative volume_ids. GLVolumes with negative volume ids + // are not associated with ModelVolumes, but they are temporarily generated by the backend + // (for example, SLA supports or SLA pad). + wxDataViewItem vol_item = m_objects_model->GetItemByVolumeId(gl_vol->object_idx(), gl_vol->volume_idx()); + sels.Add(m_objects_model->GetSettingsItem(vol_item)); + } + } + else { for (auto idx : selection.get_volume_idxs()) { const auto gl_vol = selection.get_volume(idx); if (gl_vol->volume_idx() >= 0) @@ -2700,7 +2720,7 @@ void ObjectList::update_selections() // (for example, SLA supports or SLA pad). sels.Add(m_objects_model->GetItemByVolumeId(gl_vol->object_idx(), gl_vol->volume_idx())); } - m_selection_mode = smVolume; + m_selection_mode = smVolume; } } else if (selection.is_single_full_instance() || selection.is_multiple_full_instance()) { @@ -2744,7 +2764,7 @@ void ObjectList::update_selections() } } - if (sels.size() == 0) + if (sels.size() == 0 || m_selection_mode & smSettings) m_selection_mode = smUndef; select_items(sels); @@ -3522,15 +3542,16 @@ void ObjectList::set_extruder_for_selected_items(const int extruder) const void ObjectList::update_after_undo_redo() { - m_prevent_list_events = true; m_prevent_canvas_selection_update = true; Plater::SuppressSnapshots suppress(wxGetApp().plater()); // Unselect all objects before deleting them, so that no change of selection is emitted during deletion. - this->UnselectAll(); + unselect_objects();//this->UnselectAll(); m_objects_model->DeleteAll(); +// m_prevent_list_events = true; + size_t obj_idx = 0; while (obj_idx < m_objects->size()) { add_object_to_list(obj_idx, false); @@ -3544,7 +3565,7 @@ void ObjectList::update_after_undo_redo() update_selections(); m_prevent_canvas_selection_update = false; - m_prevent_list_events = false; +// m_prevent_list_events = false; } ModelObject* ObjectList::object(const int obj_idx) const diff --git a/src/slic3r/GUI/GUI_ObjectList.hpp b/src/slic3r/GUI/GUI_ObjectList.hpp index 5f5d5d625..c3fb5ba80 100644 --- a/src/slic3r/GUI/GUI_ObjectList.hpp +++ b/src/slic3r/GUI/GUI_ObjectList.hpp @@ -66,14 +66,17 @@ struct ItemForDelete class ObjectList : public wxDataViewCtrl { +public: enum SELECTION_MODE { smUndef = 0, smVolume = 1, smInstance = 2, - smLayer = 4 + smLayer = 4, + smSettings = 8, // used for undo/redo } m_selection_mode {smUndef}; +private: struct dragged_item_data { void init(const int obj_idx, const int subobj_idx, const ItemType type) { @@ -302,6 +305,7 @@ public: void init_objects(); bool multiple_selection() const ; bool is_selected(const ItemType type) const; + void set_selection_mode(SELECTION_MODE mode) { m_selection_mode = mode; } void update_selections(); void update_selections_on_canvas(); void select_item(const wxDataViewItem& item); diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index 9e818adfa..f615e4958 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -3729,6 +3729,8 @@ void Plater::priv::take_snapshot(const std::string& snapshot_name) snapshot_data.printer_technology = this->printer_technology; if (this->view3D->is_layers_editing_enabled()) snapshot_data.flags |= UndoRedo::SnapshotData::VARIABLE_LAYER_EDITING_ACTIVE; + if (this->sidebar->obj_list()->is_selected(itSettings)) + snapshot_data.flags |= UndoRedo::SnapshotData::SETTINGS_SELECTED_ON_SIDEBAR; //FIXME updating the Wipe tower config values at the ModelWipeTower from the Print config. // This is a workaround until we refactor the Wipe Tower position / orientation to live solely inside the Model, not in the Print config. if (this->printer_technology == ptFFF) { @@ -3795,7 +3797,10 @@ void Plater::priv::undo_redo_to(std::vector::const_iterator top_snapshot_data.printer_technology = this->printer_technology; if (this->view3D->is_layers_editing_enabled()) top_snapshot_data.flags |= UndoRedo::SnapshotData::VARIABLE_LAYER_EDITING_ACTIVE; + if (this->sidebar->obj_list()->is_selected(itSettings)) + top_snapshot_data.flags |= UndoRedo::SnapshotData::SETTINGS_SELECTED_ON_SIDEBAR; bool new_variable_layer_editing_active = (new_flags & UndoRedo::SnapshotData::VARIABLE_LAYER_EDITING_ACTIVE) != 0; + bool new_settings_selected_on_sidebar = (new_flags & UndoRedo::SnapshotData::SETTINGS_SELECTED_ON_SIDEBAR) != 0; // Disable layer editing before the Undo / Redo jump. if (!new_variable_layer_editing_active && view3D->is_layers_editing_enabled()) view3D->get_canvas3d()->force_main_toolbar_left_action(view3D->get_canvas3d()->get_main_toolbar_item_id("layersediting")); @@ -3828,6 +3833,9 @@ void Plater::priv::undo_redo_to(std::vector::const_iterator tab_print->update_dirty(); } } + // set settings mode for ObjectList on sidebar + if (new_settings_selected_on_sidebar) + this->sidebar->obj_list()->set_selection_mode(ObjectList::SELECTION_MODE::smSettings); this->update_after_undo_redo(temp_snapshot_was_taken); // Enable layer editing after the Undo / Redo jump. if (! view3D->is_layers_editing_enabled() && this->layers_height_allowed() && new_variable_layer_editing_active) diff --git a/src/slic3r/Utils/UndoRedo.hpp b/src/slic3r/Utils/UndoRedo.hpp index c17802560..a3a130efd 100644 --- a/src/slic3r/Utils/UndoRedo.hpp +++ b/src/slic3r/Utils/UndoRedo.hpp @@ -38,6 +38,7 @@ struct SnapshotData // Bitmask of various binary flags to be stored with the snapshot. enum Flags { VARIABLE_LAYER_EDITING_ACTIVE = 1, + SETTINGS_SELECTED_ON_SIDEBAR = 2, }; }; From 804e1b19397b5a1d05e4aa99171911277b649c8f Mon Sep 17 00:00:00 2001 From: YuSanka Date: Tue, 23 Jul 2019 17:09:19 +0200 Subject: [PATCH 2/4] Fixed ObjectList::last_volume_is_deleted() to avoid clearing volume[0].config after undo/redo --- src/slic3r/GUI/GUI_ObjectList.cpp | 4 ++-- src/slic3r/GUI/wxExtensions.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/slic3r/GUI/GUI_ObjectList.cpp b/src/slic3r/GUI/GUI_ObjectList.cpp index cc7c6c888..047b7e8ed 100644 --- a/src/slic3r/GUI/GUI_ObjectList.cpp +++ b/src/slic3r/GUI/GUI_ObjectList.cpp @@ -1741,7 +1741,7 @@ void ObjectList::del_subobject_item(wxDataViewItem& item) ItemType type; m_objects_model->GetItemInfo(item, type, obj_idx, idx); - if (type & itUndef) + if (type == itUndef) return; if (type & itSettings) @@ -3101,7 +3101,7 @@ void ObjectList::change_part_type() void ObjectList::last_volume_is_deleted(const int obj_idx) { - if (obj_idx < 0 || obj_idx >= m_objects->size() || (*m_objects)[obj_idx]->volumes.empty()) + if (obj_idx < 0 || obj_idx >= m_objects->size() || (*m_objects)[obj_idx]->volumes.size() != 1) return; auto volume = (*m_objects)[obj_idx]->volumes.front(); diff --git a/src/slic3r/GUI/wxExtensions.cpp b/src/slic3r/GUI/wxExtensions.cpp index 6300ada31..3fc404864 100644 --- a/src/slic3r/GUI/wxExtensions.cpp +++ b/src/slic3r/GUI/wxExtensions.cpp @@ -1508,7 +1508,7 @@ ItemType ObjectDataViewModel::GetItemType(const wxDataViewItem &item) const if (!item.IsOk()) return itUndef; ObjectDataViewModelNode *node = (ObjectDataViewModelNode*)item.GetID(); - return node->m_type; + return node->m_type < 0 ? itUndef : node->m_type; } wxDataViewItem ObjectDataViewModel::GetItemByType(const wxDataViewItem &parent_item, ItemType type) const From 0592ae65eeff51038aac647c68b009b1314c765c Mon Sep 17 00:00:00 2001 From: YuSanka Date: Tue, 23 Jul 2019 18:17:57 +0200 Subject: [PATCH 3/4] Completed setting of the item focus in ObjectList after undo/redo --- src/slic3r/GUI/GUI_ObjectList.cpp | 40 ++++++++++++++++++++++++------ src/slic3r/GUI/GUI_ObjectList.hpp | 10 ++++++-- src/slic3r/GUI/Plater.cpp | 41 +++++++++++++++++++++++++------ src/slic3r/Utils/UndoRedo.cpp | 2 +- src/slic3r/Utils/UndoRedo.hpp | 9 ++++++- 5 files changed, 82 insertions(+), 20 deletions(-) diff --git a/src/slic3r/GUI/GUI_ObjectList.cpp b/src/slic3r/GUI/GUI_ObjectList.cpp index 047b7e8ed..14c6db654 100644 --- a/src/slic3r/GUI/GUI_ObjectList.cpp +++ b/src/slic3r/GUI/GUI_ObjectList.cpp @@ -2633,12 +2633,28 @@ bool ObjectList::is_selected(const ItemType type) const return false; } +t_layer_height_range ObjectList::get_selected_layers_range() const +{ + t_layer_height_range layer_range = { 0.0, 0.0 }; + const wxDataViewItem& item = GetSelection(); + if (!item) + return layer_range; + + const ItemType type = m_objects_model->GetItemType(item); + if (type & itSettings && m_objects_model->GetItemType(m_objects_model->GetParent(item)) != itLayer) + return layer_range; + + return type & itLayer ? m_objects_model->GetLayerRangeByItem(item) : + type & itSettings ? m_objects_model->GetLayerRangeByItem(m_objects_model->GetParent(item)) : + layer_range; +} + void ObjectList::update_selections() { const Selection& selection = wxGetApp().plater()->canvas3D()->get_selection(); wxDataViewItemArray sels; - if (m_selection_mode & smSettings == 0) + if ( ( m_selection_mode & (smSettings|smLayer|smLayerRoot) ) == 0) m_selection_mode = smInstance; // We doesn't update selection if SettingsItem for the current object/part is selected @@ -2665,10 +2681,21 @@ void ObjectList::update_selections() else if (selection.is_single_full_object() || selection.is_multiple_full_object()) { const Selection::ObjectIdxsToInstanceIdxsMap& objects_content = selection.get_content(); - if (m_selection_mode & smSettings) + if (m_selection_mode & (smSettings | smLayer | smLayerRoot)) { - wxDataViewItem obj_item = m_objects_model->GetItemById(objects_content.begin()->first); - sels.Add(m_objects_model->GetSettingsItem(obj_item)); + auto obj_idx = objects_content.begin()->first; + wxDataViewItem obj_item = m_objects_model->GetItemById(obj_idx); + if (m_selection_mode & smSettings) + { + if (m_selected_layers_range.first <= EPSILON && m_selected_layers_range.second <= EPSILON) + sels.Add(m_objects_model->GetSettingsItem(obj_item)); + else + sels.Add(m_objects_model->GetSettingsItem(m_objects_model->GetItemByLayerRange(obj_idx, m_selected_layers_range))); + } + else if (m_selection_mode & smLayerRoot) + sels.Add(m_objects_model->GetLayerRootItem(obj_item)); + else if (m_selection_mode & smLayer) + sels.Add(m_objects_model->GetItemByLayerRange(obj_idx, m_selected_layers_range)); } else { for (const auto& object : objects_content) { @@ -3550,8 +3577,6 @@ void ObjectList::update_after_undo_redo() unselect_objects();//this->UnselectAll(); m_objects_model->DeleteAll(); -// m_prevent_list_events = true; - size_t obj_idx = 0; while (obj_idx < m_objects->size()) { add_object_to_list(obj_idx, false); @@ -3559,13 +3584,12 @@ void ObjectList::update_after_undo_redo() } #ifndef __WXOSX__ - selection_changed(); +// selection_changed(); #endif /* __WXOSX__ */ update_selections(); m_prevent_canvas_selection_update = false; -// m_prevent_list_events = false; } ModelObject* ObjectList::object(const int obj_idx) const diff --git a/src/slic3r/GUI/GUI_ObjectList.hpp b/src/slic3r/GUI/GUI_ObjectList.hpp index c3fb5ba80..1c30a4d97 100644 --- a/src/slic3r/GUI/GUI_ObjectList.hpp +++ b/src/slic3r/GUI/GUI_ObjectList.hpp @@ -73,10 +73,14 @@ public: smVolume = 1, smInstance = 2, smLayer = 4, - smSettings = 8, // used for undo/redo - } m_selection_mode {smUndef}; + smSettings = 8, // used for undo/redo + smLayerRoot = 16, // used for undo/redo + }; private: + SELECTION_MODE m_selection_mode {smUndef}; + t_layer_height_range m_selected_layers_range; + struct dragged_item_data { void init(const int obj_idx, const int subobj_idx, const ItemType type) { @@ -305,6 +309,8 @@ public: void init_objects(); bool multiple_selection() const ; bool is_selected(const ItemType type) const; + t_layer_height_range get_selected_layers_range() const; + void set_selected_layers_range(const t_layer_height_range range) { m_selected_layers_range = range; } void set_selection_mode(SELECTION_MODE mode) { m_selection_mode = mode; } void update_selections(); void update_selections_on_canvas(); diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index 7653a5833..3d1e7b97c 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -3729,8 +3729,16 @@ void Plater::priv::take_snapshot(const std::string& snapshot_name) snapshot_data.printer_technology = this->printer_technology; if (this->view3D->is_layers_editing_enabled()) snapshot_data.flags |= UndoRedo::SnapshotData::VARIABLE_LAYER_EDITING_ACTIVE; - if (this->sidebar->obj_list()->is_selected(itSettings)) - snapshot_data.flags |= UndoRedo::SnapshotData::SETTINGS_SELECTED_ON_SIDEBAR; + if (this->sidebar->obj_list()->is_selected(itSettings)) { + snapshot_data.flags |= UndoRedo::SnapshotData::SELECTED_SETTINGS_ON_SIDEBAR; + snapshot_data.layer_range = this->sidebar->obj_list()->get_selected_layers_range(); + } + else if (this->sidebar->obj_list()->is_selected(itLayer)) { + snapshot_data.flags |= UndoRedo::SnapshotData::SELECTED_LAYER_ON_SIDEBAR; + snapshot_data.layer_range = this->sidebar->obj_list()->get_selected_layers_range(); + } + else if (this->sidebar->obj_list()->is_selected(itLayerRoot)) + snapshot_data.flags |= UndoRedo::SnapshotData::SELECTED_LAYERROOT_ON_SIDEBAR; //FIXME updating the Wipe tower config values at the ModelWipeTower from the Print config. // This is a workaround until we refactor the Wipe Tower position / orientation to live solely inside the Model, not in the Print config. if (this->printer_technology == ptFFF) { @@ -3797,10 +3805,22 @@ void Plater::priv::undo_redo_to(std::vector::const_iterator top_snapshot_data.printer_technology = this->printer_technology; if (this->view3D->is_layers_editing_enabled()) top_snapshot_data.flags |= UndoRedo::SnapshotData::VARIABLE_LAYER_EDITING_ACTIVE; - if (this->sidebar->obj_list()->is_selected(itSettings)) - top_snapshot_data.flags |= UndoRedo::SnapshotData::SETTINGS_SELECTED_ON_SIDEBAR; + if (this->sidebar->obj_list()->is_selected(itSettings)) { + top_snapshot_data.flags |= UndoRedo::SnapshotData::SELECTED_SETTINGS_ON_SIDEBAR; + top_snapshot_data.layer_range = this->sidebar->obj_list()->get_selected_layers_range(); + } + else if (this->sidebar->obj_list()->is_selected(itLayer)) { + top_snapshot_data.flags |= UndoRedo::SnapshotData::SELECTED_LAYER_ON_SIDEBAR; + top_snapshot_data.layer_range = this->sidebar->obj_list()->get_selected_layers_range(); + } + else if (this->sidebar->obj_list()->is_selected(itLayerRoot)) + top_snapshot_data.flags |= UndoRedo::SnapshotData::SELECTED_LAYERROOT_ON_SIDEBAR; bool new_variable_layer_editing_active = (new_flags & UndoRedo::SnapshotData::VARIABLE_LAYER_EDITING_ACTIVE) != 0; - bool new_settings_selected_on_sidebar = (new_flags & UndoRedo::SnapshotData::SETTINGS_SELECTED_ON_SIDEBAR) != 0; + bool new_selected_settings_on_sidebar = (new_flags & UndoRedo::SnapshotData::SELECTED_SETTINGS_ON_SIDEBAR) != 0; + bool new_selected_layer_on_sidebar = (new_flags & UndoRedo::SnapshotData::SELECTED_LAYER_ON_SIDEBAR) != 0; + bool new_selected_layerroot_on_sidebar = (new_flags & UndoRedo::SnapshotData::SELECTED_LAYERROOT_ON_SIDEBAR) != 0; + + t_layer_height_range layer_range = it_snapshot->snapshot_data.layer_range; // Disable layer editing before the Undo / Redo jump. if (!new_variable_layer_editing_active && view3D->is_layers_editing_enabled()) view3D->get_canvas3d()->force_main_toolbar_left_action(view3D->get_canvas3d()->get_main_toolbar_item_id("layersediting")); @@ -3833,9 +3853,14 @@ void Plater::priv::undo_redo_to(std::vector::const_iterator tab_print->update_dirty(); } } - // set settings mode for ObjectList on sidebar - if (new_settings_selected_on_sidebar) - this->sidebar->obj_list()->set_selection_mode(ObjectList::SELECTION_MODE::smSettings); + // set selection mode for ObjectList on sidebar + this->sidebar->obj_list()->set_selection_mode(new_selected_settings_on_sidebar ? ObjectList::SELECTION_MODE::smSettings : + new_selected_layer_on_sidebar ? ObjectList::SELECTION_MODE::smLayer : + new_selected_layerroot_on_sidebar ? ObjectList::SELECTION_MODE::smLayerRoot : + ObjectList::SELECTION_MODE::smUndef); + if (new_selected_settings_on_sidebar || new_selected_layer_on_sidebar) + this->sidebar->obj_list()->set_selected_layers_range(/*top_snapshot_data.*/layer_range); + this->update_after_undo_redo(temp_snapshot_was_taken); // Enable layer editing after the Undo / Redo jump. if (! view3D->is_layers_editing_enabled() && this->layers_height_allowed() && new_variable_layer_editing_active) diff --git a/src/slic3r/Utils/UndoRedo.cpp b/src/slic3r/Utils/UndoRedo.cpp index eba839ffb..9b12be00e 100644 --- a/src/slic3r/Utils/UndoRedo.cpp +++ b/src/slic3r/Utils/UndoRedo.cpp @@ -36,7 +36,7 @@ namespace Slic3r { namespace UndoRedo { -SnapshotData::SnapshotData() : printer_technology(ptUnknown), flags(0) +SnapshotData::SnapshotData() : printer_technology(ptUnknown), flags(0), layer_range({0.0, 0.0}) { } diff --git a/src/slic3r/Utils/UndoRedo.hpp b/src/slic3r/Utils/UndoRedo.hpp index a3a130efd..85ad11b82 100644 --- a/src/slic3r/Utils/UndoRedo.hpp +++ b/src/slic3r/Utils/UndoRedo.hpp @@ -9,6 +9,9 @@ #include +typedef double coordf_t; +typedef std::pair t_layer_height_range; + namespace Slic3r { class Model; @@ -38,8 +41,12 @@ struct SnapshotData // Bitmask of various binary flags to be stored with the snapshot. enum Flags { VARIABLE_LAYER_EDITING_ACTIVE = 1, - SETTINGS_SELECTED_ON_SIDEBAR = 2, + SELECTED_SETTINGS_ON_SIDEBAR = 2, + SELECTED_LAYERROOT_ON_SIDEBAR = 4, + SELECTED_LAYER_ON_SIDEBAR = 8, }; + + t_layer_height_range layer_range; }; struct Snapshot From 1a3fc0994b64c2a8939bf91ff54c1160da6e6358 Mon Sep 17 00:00:00 2001 From: YuSanka Date: Wed, 24 Jul 2019 12:32:38 +0200 Subject: [PATCH 4/4] Fix for https://github.com/prusa3d/PrusaSlicer/commit/0592ae65eeff51038aac647c68b009b1314c765c --- src/slic3r/GUI/GUI_ObjectList.cpp | 17 +++++++---------- src/slic3r/GUI/GUI_ObjectList.hpp | 8 ++++---- src/slic3r/GUI/Plater.cpp | 11 +++++------ src/slic3r/Utils/UndoRedo.cpp | 2 +- src/slic3r/Utils/UndoRedo.hpp | 3 +-- 5 files changed, 18 insertions(+), 23 deletions(-) diff --git a/src/slic3r/GUI/GUI_ObjectList.cpp b/src/slic3r/GUI/GUI_ObjectList.cpp index 14c6db654..8d5c3fda9 100644 --- a/src/slic3r/GUI/GUI_ObjectList.cpp +++ b/src/slic3r/GUI/GUI_ObjectList.cpp @@ -2633,20 +2633,17 @@ bool ObjectList::is_selected(const ItemType type) const return false; } -t_layer_height_range ObjectList::get_selected_layers_range() const +int ObjectList::get_selected_layers_range_idx() const { - t_layer_height_range layer_range = { 0.0, 0.0 }; const wxDataViewItem& item = GetSelection(); if (!item) - return layer_range; + return -1; const ItemType type = m_objects_model->GetItemType(item); if (type & itSettings && m_objects_model->GetItemType(m_objects_model->GetParent(item)) != itLayer) - return layer_range; + return -1; - return type & itLayer ? m_objects_model->GetLayerRangeByItem(item) : - type & itSettings ? m_objects_model->GetLayerRangeByItem(m_objects_model->GetParent(item)) : - layer_range; + return m_objects_model->GetLayerIdByItem(type & itLayer ? item : m_objects_model->GetParent(item)); } void ObjectList::update_selections() @@ -2687,15 +2684,15 @@ void ObjectList::update_selections() wxDataViewItem obj_item = m_objects_model->GetItemById(obj_idx); if (m_selection_mode & smSettings) { - if (m_selected_layers_range.first <= EPSILON && m_selected_layers_range.second <= EPSILON) + if (m_selected_layers_range_idx < 0) sels.Add(m_objects_model->GetSettingsItem(obj_item)); else - sels.Add(m_objects_model->GetSettingsItem(m_objects_model->GetItemByLayerRange(obj_idx, m_selected_layers_range))); + sels.Add(m_objects_model->GetSettingsItem(m_objects_model->GetItemByLayerId(obj_idx, m_selected_layers_range_idx))); } else if (m_selection_mode & smLayerRoot) sels.Add(m_objects_model->GetLayerRootItem(obj_item)); else if (m_selection_mode & smLayer) - sels.Add(m_objects_model->GetItemByLayerRange(obj_idx, m_selected_layers_range)); + sels.Add(m_objects_model->GetItemByLayerId(obj_idx, m_selected_layers_range_idx)); } else { for (const auto& object : objects_content) { diff --git a/src/slic3r/GUI/GUI_ObjectList.hpp b/src/slic3r/GUI/GUI_ObjectList.hpp index 1c30a4d97..5c971c40f 100644 --- a/src/slic3r/GUI/GUI_ObjectList.hpp +++ b/src/slic3r/GUI/GUI_ObjectList.hpp @@ -78,8 +78,8 @@ public: }; private: - SELECTION_MODE m_selection_mode {smUndef}; - t_layer_height_range m_selected_layers_range; + SELECTION_MODE m_selection_mode {smUndef}; + int m_selected_layers_range_idx; struct dragged_item_data { @@ -309,8 +309,8 @@ public: void init_objects(); bool multiple_selection() const ; bool is_selected(const ItemType type) const; - t_layer_height_range get_selected_layers_range() const; - void set_selected_layers_range(const t_layer_height_range range) { m_selected_layers_range = range; } + int get_selected_layers_range_idx() const; + void set_selected_layers_range_idx(const int range_idx) { m_selected_layers_range_idx = range_idx; } void set_selection_mode(SELECTION_MODE mode) { m_selection_mode = mode; } void update_selections(); void update_selections_on_canvas(); diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index 3d1e7b97c..067d13b8a 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -3731,11 +3731,11 @@ void Plater::priv::take_snapshot(const std::string& snapshot_name) snapshot_data.flags |= UndoRedo::SnapshotData::VARIABLE_LAYER_EDITING_ACTIVE; if (this->sidebar->obj_list()->is_selected(itSettings)) { snapshot_data.flags |= UndoRedo::SnapshotData::SELECTED_SETTINGS_ON_SIDEBAR; - snapshot_data.layer_range = this->sidebar->obj_list()->get_selected_layers_range(); + snapshot_data.layer_range_idx = this->sidebar->obj_list()->get_selected_layers_range_idx(); } else if (this->sidebar->obj_list()->is_selected(itLayer)) { snapshot_data.flags |= UndoRedo::SnapshotData::SELECTED_LAYER_ON_SIDEBAR; - snapshot_data.layer_range = this->sidebar->obj_list()->get_selected_layers_range(); + snapshot_data.layer_range_idx = this->sidebar->obj_list()->get_selected_layers_range_idx(); } else if (this->sidebar->obj_list()->is_selected(itLayerRoot)) snapshot_data.flags |= UndoRedo::SnapshotData::SELECTED_LAYERROOT_ON_SIDEBAR; @@ -3807,11 +3807,11 @@ void Plater::priv::undo_redo_to(std::vector::const_iterator top_snapshot_data.flags |= UndoRedo::SnapshotData::VARIABLE_LAYER_EDITING_ACTIVE; if (this->sidebar->obj_list()->is_selected(itSettings)) { top_snapshot_data.flags |= UndoRedo::SnapshotData::SELECTED_SETTINGS_ON_SIDEBAR; - top_snapshot_data.layer_range = this->sidebar->obj_list()->get_selected_layers_range(); + top_snapshot_data.layer_range_idx = this->sidebar->obj_list()->get_selected_layers_range_idx(); } else if (this->sidebar->obj_list()->is_selected(itLayer)) { top_snapshot_data.flags |= UndoRedo::SnapshotData::SELECTED_LAYER_ON_SIDEBAR; - top_snapshot_data.layer_range = this->sidebar->obj_list()->get_selected_layers_range(); + top_snapshot_data.layer_range_idx = this->sidebar->obj_list()->get_selected_layers_range_idx(); } else if (this->sidebar->obj_list()->is_selected(itLayerRoot)) top_snapshot_data.flags |= UndoRedo::SnapshotData::SELECTED_LAYERROOT_ON_SIDEBAR; @@ -3820,7 +3820,6 @@ void Plater::priv::undo_redo_to(std::vector::const_iterator bool new_selected_layer_on_sidebar = (new_flags & UndoRedo::SnapshotData::SELECTED_LAYER_ON_SIDEBAR) != 0; bool new_selected_layerroot_on_sidebar = (new_flags & UndoRedo::SnapshotData::SELECTED_LAYERROOT_ON_SIDEBAR) != 0; - t_layer_height_range layer_range = it_snapshot->snapshot_data.layer_range; // Disable layer editing before the Undo / Redo jump. if (!new_variable_layer_editing_active && view3D->is_layers_editing_enabled()) view3D->get_canvas3d()->force_main_toolbar_left_action(view3D->get_canvas3d()->get_main_toolbar_item_id("layersediting")); @@ -3859,7 +3858,7 @@ void Plater::priv::undo_redo_to(std::vector::const_iterator new_selected_layerroot_on_sidebar ? ObjectList::SELECTION_MODE::smLayerRoot : ObjectList::SELECTION_MODE::smUndef); if (new_selected_settings_on_sidebar || new_selected_layer_on_sidebar) - this->sidebar->obj_list()->set_selected_layers_range(/*top_snapshot_data.*/layer_range); + this->sidebar->obj_list()->set_selected_layers_range_idx(it_snapshot->snapshot_data.layer_range_idx); this->update_after_undo_redo(temp_snapshot_was_taken); // Enable layer editing after the Undo / Redo jump. diff --git a/src/slic3r/Utils/UndoRedo.cpp b/src/slic3r/Utils/UndoRedo.cpp index 9b12be00e..daf6752b7 100644 --- a/src/slic3r/Utils/UndoRedo.cpp +++ b/src/slic3r/Utils/UndoRedo.cpp @@ -36,7 +36,7 @@ namespace Slic3r { namespace UndoRedo { -SnapshotData::SnapshotData() : printer_technology(ptUnknown), flags(0), layer_range({0.0, 0.0}) +SnapshotData::SnapshotData() : printer_technology(ptUnknown), flags(0), layer_range_idx(-1) { } diff --git a/src/slic3r/Utils/UndoRedo.hpp b/src/slic3r/Utils/UndoRedo.hpp index 85ad11b82..37cc5a049 100644 --- a/src/slic3r/Utils/UndoRedo.hpp +++ b/src/slic3r/Utils/UndoRedo.hpp @@ -37,6 +37,7 @@ struct SnapshotData PrinterTechnology printer_technology; // Bitmap of Flags (see the Flags enum). unsigned int flags; + int layer_range_idx; // Bitmask of various binary flags to be stored with the snapshot. enum Flags { @@ -45,8 +46,6 @@ struct SnapshotData SELECTED_LAYERROOT_ON_SIDEBAR = 4, SELECTED_LAYER_ON_SIDEBAR = 8, }; - - t_layer_height_range layer_range; }; struct Snapshot