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

Fixed an adding of color change tick on last layer

Browse source
This commit is contained in:
YuSanka 2019-09-04 08:53:21 +02:00
parent 5ae23a242b
commit 6b95c579af
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -691,7 +691,12 @@ void Preview::fill_slider_values(std::vector<std::pair<int, double>> &values,
std::vector<double> &ticks_from_config = (wxGetApp().preset_bundle->project_config.option<ConfigOptionFloats>("colorprint_heights"))->values; std::vector<double> &ticks_from_config = (wxGetApp().preset_bundle->project_config.option<ConfigOptionFloats>("colorprint_heights"))->values;
unsigned int old_size = ticks_from_config.size(); unsigned int old_size = ticks_from_config.size();
ticks_from_config.erase(std::remove_if(ticks_from_config.begin(), ticks_from_config.end(), ticks_from_config.erase(std::remove_if(ticks_from_config.begin(), ticks_from_config.end(),
[values](double val) { return values.back().second < val; }), [values](double val)
{
return (values.back().second < val &&
// we can't ignore tick on last layer
fabs(values.back().second - val) > EPSILON);
}),
ticks_from_config.end()); ticks_from_config.end());
if (ticks_from_config.size() != old_size) if (ticks_from_config.size() != old_size)
m_schedule_background_process(); m_schedule_background_process();

5
src/slic3r/GUI/wxExtensions.cpp
View file

@ -2196,9 +2196,10 @@ std::vector<double> DoubleSlider::GetTicksValues() const
{ {
std::vector<double> values; std::vector<double> values;
const int val_size = m_values.size();
if (!m_values.empty()) if (!m_values.empty())
for (auto tick : m_ticks) { for (int tick : m_ticks) {
if (tick > m_values.size()) if (tick > val_size)
break; break;
values.push_back(m_values[tick].second); values.push_back(m_values[tick].second);
} }