3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-31 12:41:20 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Followup of previous commits - removing some unnecessary code

Browse source
This commit is contained in:
Lukas Matena 2019-08-23 12:11:45 +02:00
parent bf232e1ade
commit 1d8e060b75
2 changed files with 3 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp
View file

@ -716,7 +716,7 @@ void GLGizmoSlaSupports::delete_selected_points(bool force)
std::abort(); std::abort();
} }
Plater::TakeSnapshot(wxGetApp().plater(), _(L("Delete support point"))); Plater::TakeSnapshot snapshot(wxGetApp().plater(), _(L("Delete support point")));
for (unsigned int idx=0; idx<m_editing_cache.size(); ++idx) { for (unsigned int idx=0; idx<m_editing_cache.size(); ++idx) {
if (m_editing_cache[idx].selected && (!m_editing_cache[idx].support_point.is_new_island || !m_lock_unique_islands || force)) { if (m_editing_cache[idx].selected && (!m_editing_cache[idx].support_point.is_new_island || !m_lock_unique_islands || force)) {
@ -1283,7 +1283,7 @@ void GLGizmoSlaSupports::editing_mode_apply_changes()
disable_editing_mode(); // this leaves the editing mode undo/redo stack and must be done before the snapshot is taken disable_editing_mode(); // this leaves the editing mode undo/redo stack and must be done before the snapshot is taken
if (unsaved_changes()) { if (unsaved_changes()) {
take_snapshot_internal(_(L("Support points edit"))); Plater::TakeSnapshot snapshot(wxGetApp().plater(), _(L("Support points edit")));
m_normal_cache.clear(); m_normal_cache.clear();
for (const CacheEntry& ce : m_editing_cache) for (const CacheEntry& ce : m_editing_cache)
@ -1347,13 +1347,6 @@ void GLGizmoSlaSupports::get_data_from_backend()
// We don't copy the data into ModelObject, as this would stop the background processing. // We don't copy the data into ModelObject, as this would stop the background processing.
} }
void GLGizmoSlaSupports::take_snapshot_internal(const wxString& desc)
{
m_internal_snapshot = true;
Plater::TakeSnapshot snapshot(wxGetApp().plater(), desc);
m_internal_snapshot = false;
}
void GLGizmoSlaSupports::auto_generate() void GLGizmoSlaSupports::auto_generate()
@ -1364,7 +1357,7 @@ void GLGizmoSlaSupports::auto_generate()
)), _(L("Warning")), wxICON_WARNING | wxYES | wxNO); )), _(L("Warning")), wxICON_WARNING | wxYES | wxNO);
if (m_model_object->sla_points_status != sla::PointsStatus::UserModified || m_normal_cache.empty() || dlg.ShowModal() == wxID_YES) { if (m_model_object->sla_points_status != sla::PointsStatus::UserModified || m_normal_cache.empty() || dlg.ShowModal() == wxID_YES) {
take_snapshot_internal(_(L("Autogenerate support points"))); Plater::TakeSnapshot snapshot(wxGetApp().plater(), _(L("Autogenerate support points")));
wxGetApp().CallAfter([this]() { reslice_SLA_supports(); }); wxGetApp().CallAfter([this]() { reslice_SLA_supports(); });
m_model_object->sla_points_status = sla::PointsStatus::Generating; m_model_object->sla_points_status = sla::PointsStatus::Generating;
} }

2
src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.hpp
View file

@ -102,7 +102,6 @@ private:
void update_mesh(); void update_mesh();
void update_cache_entry_normal(unsigned int i) const; void update_cache_entry_normal(unsigned int i) const;
bool unsaved_changes() const; bool unsaved_changes() const;
void take_snapshot_internal(const wxString& desc);
EState m_no_hover_state = Off; EState m_no_hover_state = Off;
EState m_no_hover_old_state = Off; EState m_no_hover_old_state = Off;
@ -131,7 +130,6 @@ private:
bool m_wait_for_up_event = false; bool m_wait_for_up_event = false;
bool m_selection_empty = true; bool m_selection_empty = true;
EState m_old_state = Off; // to be able to see that the gizmo has just been closed (see on_set_state) EState m_old_state = Off; // to be able to see that the gizmo has just been closed (see on_set_state)
bool m_internal_snapshot = false;
mutable std::unique_ptr<TriangleMeshSlicer> m_tms; mutable std::unique_ptr<TriangleMeshSlicer> m_tms;
mutable std::unique_ptr<TriangleMeshSlicer> m_supports_tms; mutable std::unique_ptr<TriangleMeshSlicer> m_supports_tms;