From 95b39425c267610e8591b4321e2a128ce75c73dd Mon Sep 17 00:00:00 2001 From: enricoturri1966 Date: Fri, 5 Apr 2024 09:16:42 +0200 Subject: [PATCH 1/4] SPE-2218 - libvgcode - Fixed colors for Actual volumetric flow rate view --- src/libvgcode/src/ViewerImpl.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libvgcode/src/ViewerImpl.cpp b/src/libvgcode/src/ViewerImpl.cpp index 24aa5b3166..bf16c3ee57 100644 --- a/src/libvgcode/src/ViewerImpl.cpp +++ b/src/libvgcode/src/ViewerImpl.cpp @@ -1764,6 +1764,7 @@ void ViewerImpl::update_color_ranges() if (!v.is_custom_gcode() || m_settings.extrusion_roles_visibility.at(EGCodeExtrusionRole::Custom)) { m_width_range.update(round_to_bin(v.width)); 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_temperature_range.update(v.temperature); @@ -1773,7 +1774,6 @@ void ViewerImpl::update_color_ranges() v.is_extrusion()) { m_speed_range.update(v.feedrate); m_actual_speed_range.update(v.actual_feedrate); - m_actual_volumetric_rate_range.update(round_to_bin(v.actual_volumetric_rate())); } } From f848f00ec23f0791a0b600f72759cdca40997674 Mon Sep 17 00:00:00 2001 From: enricoturri1966 Date: Fri, 5 Apr 2024 09:54:35 +0200 Subject: [PATCH 2/4] SPE-2218 - libvgcode - Fixed detection of temperature range --- src/libvgcode/src/ViewerImpl.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libvgcode/src/ViewerImpl.cpp b/src/libvgcode/src/ViewerImpl.cpp index bf16c3ee57..35687913b5 100644 --- a/src/libvgcode/src/ViewerImpl.cpp +++ b/src/libvgcode/src/ViewerImpl.cpp @@ -1767,7 +1767,7 @@ void ViewerImpl::update_color_ranges() m_actual_volumetric_rate_range.update(round_to_bin(v.actual_volumetric_rate())); } m_fan_speed_range.update(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)) || (v.is_wipe() && m_settings.options_visibility.at(EOptionType::Wipes)) || From 473f58c4e69c38aaf17ac60f7684cd746bed14f6 Mon Sep 17 00:00:00 2001 From: enricoturri1966 Date: Wed, 10 Apr 2024 12:11:35 +0200 Subject: [PATCH 3/4] SPE-2218 - libvgcode - Fixed detection of fan speed range --- src/libvgcode/src/ViewerImpl.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libvgcode/src/ViewerImpl.cpp b/src/libvgcode/src/ViewerImpl.cpp index 35687913b5..12465c8884 100644 --- a/src/libvgcode/src/ViewerImpl.cpp +++ b/src/libvgcode/src/ViewerImpl.cpp @@ -1766,7 +1766,7 @@ void ViewerImpl::update_color_ranges() 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(round_to_bin(v.temperature)); } if ((v.is_travel() && m_settings.options_visibility.at(EOptionType::Travels)) || From 87e1341e6f261e1b70216bb38ace2ac8522c4e42 Mon Sep 17 00:00:00 2001 From: enricoturri1966 Date: Wed, 10 Apr 2024 12:47:42 +0200 Subject: [PATCH 4/4] SPE-2218 - libvgcode - Fixed color of wipe moves for speed range view --- src/libvgcode/src/ViewerImpl.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libvgcode/src/ViewerImpl.cpp b/src/libvgcode/src/ViewerImpl.cpp index 12465c8884..f607304147 100644 --- a/src/libvgcode/src/ViewerImpl.cpp +++ b/src/libvgcode/src/ViewerImpl.cpp @@ -1425,7 +1425,7 @@ Color ViewerImpl::get_vertex_color(const PathVertex& v) const if (v.type == EMoveType::Noop) 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)); switch (m_settings.view_type)