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

SPE-1872: Added debug graphic to show move actual speed profile

Browse Source
This commit is contained in:
enricoturri1966 2024-02-07 15:55:54 +01:00 committed by Lukas Matena
parent 21ec3a4a5b
commit c054e70dc6
4 changed files with 56 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/libslic3r/Technologies.hpp
View File

@ -65,6 +65,7 @@
// requires VGCODE_ENABLE_ET_SPE1872 set to 1 in libvgcode (Types.hpp) // requires VGCODE_ENABLE_ET_SPE1872 set to 1 in libvgcode (Types.hpp)
#define ENABLE_ET_SPE1872 (1 && ENABLE_NEW_GCODE_VIEWER) #define ENABLE_ET_SPE1872 (1 && ENABLE_NEW_GCODE_VIEWER)
#define ENABLE_ET_SPE1872_FIRMWARE_BUDDY (1 && ENABLE_ET_SPE1872) #define ENABLE_ET_SPE1872_FIRMWARE_BUDDY (1 && ENABLE_ET_SPE1872)
#define ENABLE_ET_SPE1872_DEBUG (1 && ENABLE_ET_SPE1872)
// Enable G-Code viewer statistics imgui dialog // Enable G-Code viewer statistics imgui dialog
#define ENABLE_GCODE_VIEWER_STATISTICS (0 && !ENABLE_NEW_GCODE_VIEWER) #define ENABLE_GCODE_VIEWER_STATISTICS (0 && !ENABLE_NEW_GCODE_VIEWER)

1
src/libvgcode/include/Types.hpp
View File

@ -7,6 +7,7 @@
#define VGCODE_ENABLE_COG_AND_TOOL_MARKERS 0 #define VGCODE_ENABLE_COG_AND_TOOL_MARKERS 0
#define VGCODE_ENABLE_ET_SPE1872 1 #define VGCODE_ENABLE_ET_SPE1872 1
#define VGCODE_ENABLE_ET_SPE1872_DEBUG (1 && VGCODE_ENABLE_ET_SPE1872)
#include <array> #include <array>
#include <vector> #include <vector>

12
src/libvgcode/include/Viewer.hpp
View File

@ -166,9 +166,15 @@ public:
// EViewType::Height // EViewType::Height
// EViewType::Width // EViewType::Width
// EViewType::Speed // EViewType::Speed
#if VGCODE_ENABLE_ET_SPE1872
// EViewType::ActualSpeed
#endif // VGCODE_ENABLE_ET_SPE1872
// EViewType::FanSpeed // EViewType::FanSpeed
// EViewType::Temperature // EViewType::Temperature
// EViewType::VolumetricFlowRate // EViewType::VolumetricFlowRate
#if VGCODE_ENABLE_ET_SPE1872
// EViewType::ActualVolumetricFlowRate
#endif // VGCODE_ENABLE_ET_SPE1872
// EViewType::LayerTimeLinear // EViewType::LayerTimeLinear
// EViewType::LayerTimeLogarithmic // EViewType::LayerTimeLogarithmic
// //
@ -180,9 +186,15 @@ public:
// EViewType::Height // EViewType::Height
// EViewType::Width // EViewType::Width
// EViewType::Speed // EViewType::Speed
#if VGCODE_ENABLE_ET_SPE1872
// EViewType::ActualSpeed
#endif // VGCODE_ENABLE_ET_SPE1872
// EViewType::FanSpeed // EViewType::FanSpeed
// EViewType::Temperature // EViewType::Temperature
// EViewType::VolumetricFlowRate // EViewType::VolumetricFlowRate
#if VGCODE_ENABLE_ET_SPE1872
// EViewType::ActualVolumetricFlowRate
#endif // VGCODE_ENABLE_ET_SPE1872
// EViewType::LayerTimeLinear // EViewType::LayerTimeLinear
// EViewType::LayerTimeLogarithmic // EViewType::LayerTimeLogarithmic
// //

42
src/slic3r/GUI/GCodeViewer.cpp
View File

@ -531,6 +531,18 @@ void GCodeViewer::SequentialView::Marker::render_position_window(const libvgcode
text = _u8L("N/A"); text = _u8L("N/A");
imgui.text(text); imgui.text(text);
}); });
#if ENABLE_ET_SPE1872
append_table_row(_u8L("Actual speed") + " (" + _u8L("mm/s") + ")", [&imgui, &vertex, &buff]() {
std::string text;
if (vertex.is_extrusion()) {
sprintf(buff, "%.1f", vertex.actual_feedrate);
text = std::string(buff);
}
else
text = _u8L("N/A");
imgui.text(text);
});
#endif // ENABLE_ET_SPE1872
append_table_row(_u8L("Fan speed") + " (" + _u8L("%") + ")", [&imgui, &vertex, &buff]() { append_table_row(_u8L("Fan speed") + " (" + _u8L("%") + ")", [&imgui, &vertex, &buff]() {
std::string text; std::string text;
if (vertex.is_extrusion()) { if (vertex.is_extrusion()) {
@ -554,6 +566,36 @@ void GCodeViewer::SequentialView::Marker::render_position_window(const libvgcode
ImGui::EndTable(); ImGui::EndTable();
} }
#if ENABLE_ET_SPE1872_DEBUG
if (vertex.is_extrusion() || vertex.is_travel() || vertex.is_wipe()) {
const std::array<float, 2>& interval = viewer->get_color_range(libvgcode::EViewType::ActualSpeed).get_range();
const size_t vertices_count = viewer->get_vertices_count();
const libvgcode::PathVertex& curr_vertex = viewer->get_current_vertex();
const size_t curr_id = viewer->get_current_vertex_id();
size_t start_id = curr_id;
while (start_id > 0) {
--start_id;
if (curr_vertex.gcode_id != viewer->get_vertex_at(start_id).gcode_id)
break;
}
size_t end_id = curr_id;
while (end_id < vertices_count - 1) {
++end_id;
if (curr_vertex.gcode_id != viewer->get_vertex_at(end_id).gcode_id)
break;
}
std::vector<float> actual_speed_profile;
for (size_t i = start_id; i < end_id; ++i) {
actual_speed_profile.push_back(viewer->get_vertex_at(i).actual_feedrate);
}
ImGui::Spacing();
imgui.text(_u8L("Actual speed profile"));
ImGui::Separator();
ImGui::PlotLines("##ActualSpeedProfile", actual_speed_profile.data(), static_cast<int>(actual_speed_profile.size()), 0, nullptr, 0.0f, interval[1], { 0.0f, 150.0f });
}
#endif // ENABLE_ET_SPE1872_DEBUG
} }
// force extra frame to automatically update window size // force extra frame to automatically update window size