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

Ruler for DoubleSlider: Added estimated print time

Browse source
This commit is contained in:
YuSanka 2020-11-16 22:48:13 +01:00 • committed by Oleksandra Yushchenko
parent cb844a4034
commit feffb66085
5 changed files with 19 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/slic3r/GUI/DoubleSlider.cpp
View file

@ -380,6 +380,13 @@ void Control::SetTicksValues(const Info& custom_gcode_per_print_z)
Update();
}
void Control::SetLayersTimes(const std::vector<float>& layers_times)
{
m_layers_times = layers_times;
for (int i = 1; i < m_layers_times.size(); i++)
m_layers_times[i] += m_layers_times[i - 1];
}
void Control::SetDrawMode(bool is_sla_print, bool is_sequential_print)
{
m_draw_mode = is_sla_print ? dmSlaPrint :
@ -603,9 +610,11 @@ wxString Control::get_label(int tick, LabelType label_type/* = ltHeightWithLayer
if (m_draw_mode == dmSequentialGCodeView)
return wxString::Format("%d", static_cast<unsigned int>(m_values[value]));
else {
if (label_type == ltEstimatedTime)
// ysFIXME get estimated time for the current tick
return "time";
if (label_type == ltEstimatedTime) {
if (m_values.size() != m_layers_times.size())
return "time";
return Slic3r::short_time(get_time_dhms(m_layers_times[value]));
}
wxString str = m_values.empty() ?
wxString::Format("%.*f", 2, m_label_koef * value) :
wxString::Format("%.*f", 2, m_values[value]);