Cut WIP: Suppress un-universal scaling for cut objects
Added editing of the tolerance
This commit is contained in:
parent
003acee218
commit
0fd29dfec7
7 changed files with 155 additions and 72 deletions
src/slic3r/GUI
|
@ -580,7 +580,11 @@ void ObjectManipulation::Enable(const bool enadle)
|
|||
{
|
||||
for (auto editor : m_editors)
|
||||
editor->Enable(enadle);
|
||||
for (wxWindow* win : std::initializer_list<wxWindow*>{ m_reset_scale_button, m_reset_rotation_button, m_drop_to_bed_button, m_check_inch, m_lock_bnt })
|
||||
for (wxWindow* win : std::initializer_list<wxWindow*>{ m_reset_scale_button, m_reset_rotation_button, m_drop_to_bed_button, m_check_inch, m_lock_bnt
|
||||
#if ENABLE_WORLD_COORDINATE
|
||||
,m_reset_skew_button
|
||||
#endif // ENABLE_WORLD_COORDINATE
|
||||
})
|
||||
win->Enable(enadle);
|
||||
}
|
||||
|
||||
|
@ -588,10 +592,19 @@ void ObjectManipulation::DisableScale()
|
|||
{
|
||||
for (auto editor : m_editors)
|
||||
editor->Enable(editor->has_opt_key("scale") || editor->has_opt_key("size") ? false : true);
|
||||
for (wxWindow* win : std::initializer_list<wxWindow*>{ m_reset_scale_button, m_lock_bnt })
|
||||
for (wxWindow* win : std::initializer_list<wxWindow*>{ m_reset_scale_button, m_lock_bnt
|
||||
#if ENABLE_WORLD_COORDINATE
|
||||
,m_reset_skew_button
|
||||
#endif // ENABLE_WORLD_COORDINATE
|
||||
})
|
||||
win->Enable(false);
|
||||
}
|
||||
|
||||
void ObjectManipulation::DisableUnuniformScale()
|
||||
{
|
||||
m_lock_bnt->disable();
|
||||
}
|
||||
|
||||
void ObjectManipulation::update_ui_from_settings()
|
||||
{
|
||||
if (m_imperial_units != (wxGetApp().app_config->get("use_inches") == "1")) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue