Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/supermerill/SuperSlicer.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbubnikv <bubnikv@gmail.com>2019-05-07 17:16:35 +0300
committerbubnikv <bubnikv@gmail.com>2019-05-07 17:16:35 +0300
commit0b9945b632c116430892e8d372ec389d1a60a70c (patch)
treeaf84eff0e5dee462f414837506a08ab6d9584967 /src/slic3r/GUI/GUI_ObjectManipulation.cpp
parent054a3258d360957e0b68f4305cbc374828463726 (diff)
Switch the side panel to World Coordinates in the Simple Mode.
Diffstat (limited to 'src/slic3r/GUI/GUI_ObjectManipulation.cpp')
-rw-r--r--src/slic3r/GUI/GUI_ObjectManipulation.cpp20
1 files changed, 14 insertions, 6 deletions
diff --git a/src/slic3r/GUI/GUI_ObjectManipulation.cpp b/src/slic3r/GUI/GUI_ObjectManipulation.cpp
index ecce5770e..5c534a3e1 100644
--- a/src/slic3r/GUI/GUI_ObjectManipulation.cpp
+++ b/src/slic3r/GUI/GUI_ObjectManipulation.cpp
@@ -212,16 +212,21 @@ ObjectManipulation::ObjectManipulation(wxWindow* parent) :
void ObjectManipulation::Show(const bool show)
{
if (show != IsShown()) {
+ // Show all lines of the panel. Some of these lines will be hidden in the lines below.
m_og->Show(show);
- if (show && wxGetApp().get_mode() != comSimple) {
- m_og->get_grid_sizer()->Show(size_t(0), false);
- m_og->get_grid_sizer()->Show(size_t(1), false);
- }
- }
+ if (show && wxGetApp().get_mode() != comSimple) {
+ // Show the label and the name of the STL in simple mode only.
+ // Label "Name: "
+ m_og->get_grid_sizer()->Show(size_t(0), false);
+ // The actual name of the STL.
+ m_og->get_grid_sizer()->Show(size_t(1), false);
+ }
+ }
if (show) {
- bool show_world_local_combo = wxGetApp().plater()->canvas3D()->get_selection().is_single_full_instance();
+ // Show the "World Coordinates" / "Local Coordintes" Combo in Advanced / Expert mode only.
+ bool show_world_local_combo = wxGetApp().plater()->canvas3D()->get_selection().is_single_full_instance() && wxGetApp().get_mode() != comSimple;
m_word_local_combo->Show(show_world_local_combo);
}
}
@@ -247,6 +252,9 @@ void ObjectManipulation::update_settings_value(const Selection& selection)
m_new_rotate_label_string = L("Rotation");
m_new_scale_label_string = L("Scale factors");
+ if (wxGetApp().get_mode() == comSimple)
+ m_world_coordinates = true;
+
ObjectList* obj_list = wxGetApp().obj_list();
if (selection.is_single_full_instance())
{