3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Completed uniform scale in sidebar

Browse Source
This commit is contained in:
Enrico Turri 2019-01-09 09:47:05 +01:00
parent 6d7e2b2dd7
commit 410211a3e4
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/slic3r/GUI/GUI_ObjectManipulation.cpp
View File

@ -401,9 +401,12 @@ void ObjectManipulation::update_if_dirty()
m_cache.rotation = m_new_rotation; m_cache.rotation = m_new_rotation;
if (wxGetApp().plater()->canvas3D()->get_selection().requires_uniform_scale()) { if (wxGetApp().plater()->canvas3D()->get_selection().requires_uniform_scale()) {
// m_uniform_scale = true;
m_lock_bnt->SetLock(true); m_lock_bnt->SetLock(true);
// m_lock_bnt->Disable(); m_lock_bnt->Disable();
}
else {
m_lock_bnt->SetLock(m_uniform_scale);
m_lock_bnt->Enable();
} }
if (m_new_enabled) if (m_new_enabled)
@ -562,7 +565,7 @@ void ObjectManipulation::change_size_value(const Vec3d& size)
Vec3d scale = 100.0 * Vec3d(size(0) / ref_size(0), size(1) / ref_size(1), size(2) / ref_size(2)); Vec3d scale = 100.0 * Vec3d(size(0) / ref_size(0), size(1) / ref_size(1), size(2) / ref_size(2));
Vec3d scaling_factor = scale; Vec3d scaling_factor = scale;
if (selection.requires_uniform_scale()) if (m_uniform_scale || selection.requires_uniform_scale())
{ {
Vec3d abs_scale_diff = (scale - m_cache.scale).cwiseAbs(); Vec3d abs_scale_diff = (scale - m_cache.scale).cwiseAbs();
double max_diff = abs_scale_diff(X); double max_diff = abs_scale_diff(X);

1
src/slic3r/GUI/wxExtensions.cpp
View File

@ -2201,6 +2201,7 @@ PrusaLockButton::PrusaLockButton( wxWindow *parent,
SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW)); SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
#endif // __WXMSW__ #endif // __WXMSW__
SetBitmap(m_bmp_unlock_on); SetBitmap(m_bmp_unlock_on);
SetBitmapDisabled(m_bmp_lock_on);
//button events //button events
Bind(wxEVT_BUTTON, &PrusaLockButton::OnButton, this); Bind(wxEVT_BUTTON, &PrusaLockButton::OnButton, this);