3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-11 08:47:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix of #1976

Browse source
This commit is contained in:
Enrico Turri 2019-03-18 16:00:44 +01:00
parent f249155340
commit 4a8a1fac7b
2 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/slic3r/GUI/GUI_Preview.cpp
View file

@ -559,15 +559,14 @@ static int find_close_layer_idx(const std::vector<double>& zs, double &z, double
return -1; return -1;
} }
void Preview::update_double_slider(const std::vector<double>& layers_z, bool force_sliders_full_range) void Preview::update_double_slider(const std::vector<double>& layers_z)
{ {
// Save the initial slider span. // Save the initial slider span.
double z_low = m_slider->GetLowerValueD(); double z_low = m_slider->GetLowerValueD();
double z_high = m_slider->GetHigherValueD(); double z_high = m_slider->GetHigherValueD();
bool was_empty = m_slider->GetMaxValue() == 0; bool was_empty = m_slider->GetMaxValue() == 0;
bool span_changed = layers_z.empty() || std::abs(layers_z.back() - m_slider->GetMaxValueD()) > 1e-6; bool force_sliders_full_range = was_empty;
force_sliders_full_range |= was_empty | span_changed; bool snap_to_min = force_sliders_full_range || m_slider->is_lower_at_min();
bool snap_to_min = force_sliders_full_range || m_slider->is_lower_at_min();
bool snap_to_max = force_sliders_full_range || m_slider->is_higher_at_max(); bool snap_to_max = force_sliders_full_range || m_slider->is_higher_at_max();
std::vector<std::pair<int, double>> values; std::vector<std::pair<int, double>> values;

2
src/slic3r/GUI/GUI_Preview.hpp
View file

@ -138,7 +138,7 @@ private:
// Create/Update/Reset double slider on 3dPreview // Create/Update/Reset double slider on 3dPreview
void create_double_slider(); void create_double_slider();
void update_double_slider(const std::vector<double>& layers_z, bool force_sliders_full_range = false); void update_double_slider(const std::vector<double>& layers_z);
void fill_slider_values(std::vector<std::pair<int, double>> &values, void fill_slider_values(std::vector<std::pair<int, double>> &values,
const std::vector<double> &layers_z); const std::vector<double> &layers_z);
void reset_double_slider(); void reset_double_slider();