juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-14 00:52:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

[QOL] Remember slider position for single layer mode in preview (#10758)

Browse Source 
init
This commit is contained in:
yw4z
2025-09-21 17:49:25 +03:00
committed by GitHub
parent b483dff617
commit cd9081b16d
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/slic3r/GUI/IMSlider.cpp
View File

@@ -191,6 +191,10 @@ void IMSlider::SetSelectionSpan(const int lower_val, const int higher_val)
m_higher_value = std::max(std::min(higher_val, m_max_value), m_lower_value);
if (m_lower_value < m_higher_value) m_is_one_layer = false;
// ORCA reset single layer position when min max values changed
// This will trigger when print height changed. but stays same on reslicing if layer count is same
m_single_value = int((m_higher_value - m_lower_value)/2);
set_as_dirty();
}
@@ -443,9 +447,20 @@ bool IMSlider::switch_one_layer_mode()
return false;
m_is_one_layer = !m_is_one_layer;
if (!m_is_one_layer) {
if (!m_is_one_layer) { // DEACTIVATE
m_single_value = GetHigherValue(); // ORCA Backup value on deactivate
SetLowerValue(m_min_value);
SetHigherValue(m_max_value);
SetHigherValue(m_max_value); // Higher value resets on toggling off one layer mode to show whole model
}else{ // ACTIVATE
// ORCA Ensure value fits range. value set in IMSlider::SetSelectionSpan but added this just in case
if(!m_single_value || m_single_value > m_max_value || m_single_value < m_min_value){
m_single_value = int((m_max_value - m_min_value)/2);
SetHigherValue(m_single_value);
}
else if(GetHigherValue() == m_max_value) // ORCA Prefer backup value if higher value reseted
SetHigherValue(m_single_value); // ORCA Restore value
else // ORCA Prefer higher value if user changed higher value. so it will show section on same view
SetHigherValue(GetHigherValue()); // ORCA use same position with higher value if user changed its position. visible section stays same when switching one layer mode with this
}
m_selection == ssLower ? correct_lower_value() : correct_higher_value();
if (m_selection == ssUndef) m_selection = ssHigher;
@@ -1487,6 +1502,7 @@ void IMSlider::on_mouse_wheel(wxMouseEvent& evt) {
if (is_one_layer()) {
const int new_pos = GetHigherValue() + wheel;
SetHigherValue(new_pos);
m_single_value = new_pos; // ORCA backup value for single layer mode
}
else {
const int new_pos = m_selection == ssLower ? GetLowerValue() + wheel : GetHigherValue() + wheel;

1
src/slic3r/GUI/IMSlider.hpp
View File

@@ -179,6 +179,7 @@ private:
int m_max_value;
int m_lower_value;
int m_higher_value;
int m_single_value; // ORCA
bool m_dirty = false;
bool m_render_as_disabled{ false };