GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-01 08:41:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'et_spe2218'

Browse Source
This commit is contained in:
Lukas Matena 2024-04-24 10:25:18 +02:00
commit 45899c8c19
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/libvgcode/src/ViewerImpl.cpp
View File

@ -1425,7 +1425,7 @@ Color ViewerImpl::get_vertex_color(const PathVertex& v) const
if (v.type == EMoveType::Noop) if (v.type == EMoveType::Noop)
return DUMMY_COLOR; return DUMMY_COLOR;
if ((v.is_wipe() && m_settings.view_type != EViewType::ActualSpeed) || v.is_option()) if ((v.is_wipe() && (m_settings.view_type != EViewType::Speed && m_settings.view_type != EViewType::ActualSpeed)) || v.is_option())
return get_option_color(move_type_to_option(v.type)); return get_option_color(move_type_to_option(v.type));
switch (m_settings.view_type) switch (m_settings.view_type)
@ -1764,16 +1764,16 @@ void ViewerImpl::update_color_ranges()
if (!v.is_custom_gcode() || m_settings.extrusion_roles_visibility.at(EGCodeExtrusionRole::Custom)) { if (!v.is_custom_gcode() || m_settings.extrusion_roles_visibility.at(EGCodeExtrusionRole::Custom)) {
m_width_range.update(round_to_bin(v.width)); m_width_range.update(round_to_bin(v.width));
m_volumetric_rate_range.update(round_to_bin(v.volumetric_rate())); m_volumetric_rate_range.update(round_to_bin(v.volumetric_rate()));
m_actual_volumetric_rate_range.update(round_to_bin(v.actual_volumetric_rate()));
} }
m_fan_speed_range.update(v.fan_speed); m_fan_speed_range.update(round_to_bin(v.fan_speed));
m_temperature_range.update(v.temperature); m_temperature_range.update(round_to_bin(v.temperature));
} }
if ((v.is_travel() && m_settings.options_visibility.at(EOptionType::Travels)) || if ((v.is_travel() && m_settings.options_visibility.at(EOptionType::Travels)) ||
(v.is_wipe() && m_settings.options_visibility.at(EOptionType::Wipes)) || (v.is_wipe() && m_settings.options_visibility.at(EOptionType::Wipes)) ||
v.is_extrusion()) { v.is_extrusion()) {
m_speed_range.update(v.feedrate); m_speed_range.update(v.feedrate);
m_actual_speed_range.update(v.actual_feedrate); m_actual_speed_range.update(v.actual_feedrate);
m_actual_volumetric_rate_range.update(round_to_bin(v.actual_volumetric_rate()));
} }
} }