From 92c6f855861f6a3be32cf7ff472580442861f31f Mon Sep 17 00:00:00 2001
From: "zhimin.zeng" <zhimin.zeng@bambulab.com>
Date: Wed, 19 Oct 2022 18:36:42 +0800
Subject: [PATCH] FIX: Revert uniform scale modify

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)
---
 src/libslic3r/AppConfig.cpp                       |  4 ----
 src/slic3r/GUI/Gizmos/GLGizmoScale.cpp            | 10 ----------
 src/slic3r/GUI/Gizmos/GizmoObjectManipulation.cpp |  6 ------
 src/slic3r/GUI/Gizmos/GizmoObjectManipulation.hpp |  1 -
 4 files changed, 21 deletions(-)

diff --git a/src/libslic3r/AppConfig.cpp b/src/libslic3r/AppConfig.cpp
index e4ae1ada2..e2d8b7e6e 100644
--- a/src/libslic3r/AppConfig.cpp
+++ b/src/libslic3r/AppConfig.cpp
@@ -303,10 +303,6 @@ void AppConfig::set_defaults()
     }
 #endif
 
-    if (get("uniform_scale").empty()) {
-        set("uniform_scale", "1");
-    }
-
     // Remove legacy window positions/sizes
     erase("app", "main_frame_maximized");
     erase("app", "main_frame_pos");
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoScale.cpp b/src/slic3r/GUI/Gizmos/GLGizmoScale.cpp
index 6b69b0ba6..688583883 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoScale.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoScale.cpp
@@ -120,16 +120,6 @@ void GLGizmoScale3D::on_start_dragging()
 
 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))
         do_scale_along_axis(X, data);
     else if ((m_hover_id == 2) || (m_hover_id == 3))
diff --git a/src/slic3r/GUI/Gizmos/GizmoObjectManipulation.cpp b/src/slic3r/GUI/Gizmos/GizmoObjectManipulation.cpp
index b95e53f34..7b7e4a521 100644
--- a/src/slic3r/GUI/Gizmos/GizmoObjectManipulation.cpp
+++ b/src/slic3r/GUI/Gizmos/GizmoObjectManipulation.cpp
@@ -456,9 +456,6 @@ void GizmoObjectManipulation::set_uniform_scaling(const bool 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] = {
@@ -890,9 +887,6 @@ void GizmoObjectManipulation::do_render_scale_input_window(ImGuiWrapper* imgui_w
 
     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;
 
     const Selection &selection = m_glcanvas.get_selection();
diff --git a/src/slic3r/GUI/Gizmos/GizmoObjectManipulation.hpp b/src/slic3r/GUI/Gizmos/GizmoObjectManipulation.hpp
index ea446b382..39ceee5db 100644
--- a/src/slic3r/GUI/Gizmos/GizmoObjectManipulation.hpp
+++ b/src/slic3r/GUI/Gizmos/GizmoObjectManipulation.hpp
@@ -81,7 +81,6 @@ public:
     Vec3d           m_buffered_size;
     bool            m_new_enabled {true};
     bool            m_uniform_scale {true};
-    bool            m_uniform_config {false};
     // Does the object manipulation panel work in World or Local coordinates?
     bool            m_world_coordinates = true;