juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-20 11:53:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

rename variable m_single_value to m_one_layer_value

Browse Source
This commit is contained in:
SoftFever
2025-09-21 23:05:43 +08:00
parent cd9081b16d
commit d1e9a761d2
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -193,7 +193,7 @@ void IMSlider::SetSelectionSpan(const int lower_val, const int higher_val)
// ORCA reset single layer position when min max values changed // 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 // 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); m_one_layer_value = int((m_higher_value - m_lower_value)/2);
set_as_dirty(); set_as_dirty();
} }
@@ -448,17 +448,17 @@ bool IMSlider::switch_one_layer_mode()
m_is_one_layer = !m_is_one_layer; m_is_one_layer = !m_is_one_layer;
if (!m_is_one_layer) { // DEACTIVATE if (!m_is_one_layer) { // DEACTIVATE
m_single_value = GetHigherValue(); // ORCA Backup value on deactivate m_one_layer_value = GetHigherValue(); // ORCA Backup value on deactivate
SetLowerValue(m_min_value); SetLowerValue(m_min_value);
SetHigherValue(m_max_value); // Higher value resets on toggling off one layer mode to show whole model SetHigherValue(m_max_value); // Higher value resets on toggling off one layer mode to show whole model
}else{ // ACTIVATE }else{ // ACTIVATE
// ORCA Ensure value fits range. value set in IMSlider::SetSelectionSpan but added this just in case // 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){ if(!m_one_layer_value || m_one_layer_value > m_max_value || m_one_layer_value < m_min_value){
m_single_value = int((m_max_value - m_min_value)/2); m_one_layer_value = int((m_max_value - m_min_value)/2);
SetHigherValue(m_single_value); SetHigherValue(m_one_layer_value);
} }
else if(GetHigherValue() == m_max_value) // ORCA Prefer backup value if higher value reseted else if(GetHigherValue() == m_max_value) // ORCA Prefer backup value if higher value reseted
SetHigherValue(m_single_value); // ORCA Restore value SetHigherValue(m_one_layer_value); // ORCA Restore value
else // ORCA Prefer higher value if user changed higher value. so it will show section on same view 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 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
} }
@@ -1502,7 +1502,7 @@ void IMSlider::on_mouse_wheel(wxMouseEvent& evt) {
if (is_one_layer()) { if (is_one_layer()) {
const int new_pos = GetHigherValue() + wheel; const int new_pos = GetHigherValue() + wheel;
SetHigherValue(new_pos); SetHigherValue(new_pos);
m_single_value = new_pos; // ORCA backup value for single layer mode m_one_layer_value = new_pos; // ORCA backup value for single layer mode
} }
else { else {
const int new_pos = m_selection == ssLower ? GetLowerValue() + wheel : GetHigherValue() + wheel; const int new_pos = m_selection == ssLower ? GetLowerValue() + wheel : GetHigherValue() + wheel;

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

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