3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-12 01:07:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

FIX: Revert uniform scale modify

Browse source 
Revert "ENH: save uniform scale to an app_config item" Revert "ENH: do uniform scale if uniform_scale is true"

Change-Id: I069baecec143e77d796247f29cd5478b877971fb
(cherry picked from commit c7cf95cf5c365f314a53fead6612fac84a0a5f71)
This commit is contained in:
zhimin.zeng 2022-10-19 18:36:42 +08:00 • committed by Lane.Wei
parent 24778543e2
commit 92c6f85586
4 changed files with 0 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/libslic3r/AppConfig.cpp
View file

@ -303,10 +303,6 @@ void AppConfig::set_defaults()
} }
#endif #endif
if (get("uniform_scale").empty()) {
set("uniform_scale", "1");
}
// Remove legacy window positions/sizes // Remove legacy window positions/sizes
erase("app", "main_frame_maximized"); erase("app", "main_frame_maximized");
erase("app", "main_frame_pos"); erase("app", "main_frame_pos");

10
src/slic3r/GUI/Gizmos/GLGizmoScale.cpp
View file

@ -120,16 +120,6 @@ void GLGizmoScale3D::on_start_dragging()
void GLGizmoScale3D::on_update(const UpdateData& data) void GLGizmoScale3D::on_update(const UpdateData& data)
{ {
bool uniform_scale = false;
AppConfig* config = wxGetApp().app_config;
if (config)
uniform_scale = config->get("uniform_scale") == "1" ? true : false;
if (uniform_scale) {
do_scale_uniform(data);
return;
}
if ((m_hover_id == 0) || (m_hover_id == 1)) if ((m_hover_id == 0) || (m_hover_id == 1))
do_scale_along_axis(X, data); do_scale_along_axis(X, data);
else if ((m_hover_id == 2) || (m_hover_id == 3)) else if ((m_hover_id == 2) || (m_hover_id == 3))

6
src/slic3r/GUI/Gizmos/GizmoObjectManipulation.cpp
View file

@ -456,9 +456,6 @@ void GizmoObjectManipulation::set_uniform_scaling(const bool new_value)
} }
} }
m_uniform_scale = new_value; m_uniform_scale = new_value;
AppConfig* config = wxGetApp().app_config;
if (config)
config->set("uniform_scale", new_value ? "1": "0");
} }
static const char* label_values[2][3] = { static const char* label_values[2][3] = {
@ -890,9 +887,6 @@ void GizmoObjectManipulation::do_render_scale_input_window(ImGuiWrapper* imgui_w
ImGui::Separator(); ImGui::Separator();
AppConfig* config = wxGetApp().app_config;
if (config)
this->m_uniform_scale = config->get("uniform_scale") == "1" ? true : false;
bool uniform_scale = this->m_uniform_scale; bool uniform_scale = this->m_uniform_scale;
const Selection &selection = m_glcanvas.get_selection(); const Selection &selection = m_glcanvas.get_selection();

1
src/slic3r/GUI/Gizmos/GizmoObjectManipulation.hpp
View file

@ -81,7 +81,6 @@ public:
Vec3d m_buffered_size; Vec3d m_buffered_size;
bool m_new_enabled {true}; bool m_new_enabled {true};
bool m_uniform_scale {true}; bool m_uniform_scale {true};
bool m_uniform_config {false};
// Does the object manipulation panel work in World or Local coordinates? // Does the object manipulation panel work in World or Local coordinates?
bool m_world_coordinates = true; bool m_world_coordinates = true;