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

New gcode visualization integration - Removed imperial units from tool position data

Browse Source
This commit is contained in:
enricoturri1966 2024-01-11 12:43:57 +01:00 committed by Lukas Matena
parent ee9ad49bbe
commit 75c7f19f20
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -485,7 +485,6 @@ void GCodeViewer::SequentialView::Marker::render_position_window(const libvgcode
ImGui::Separator();
if (ImGui::BeginTable("Properties", 2)) {
const bool imperial_units = wxGetApp().app_config->get_bool("use_inches");
char buff[1024];
append_table_row(_u8L("Type") + ":", [&imgui, &vertex]() {
@ -494,23 +493,21 @@ void GCodeViewer::SequentialView::Marker::render_position_window(const libvgcode
text += " (" + _u8L(to_string(vertex.role)) + ")";
imgui.text(text);
});
append_table_row(_u8L("Width") + ":", [&imgui, &vertex, &buff, imperial_units]() {
append_table_row(_u8L("Width") + ":", [&imgui, &vertex, &buff]() {
std::string text;
if (vertex.is_extrusion()) {
sprintf(buff, "%.3f", vertex.width);
text = std::string(buff) + " ";
text += imperial_units ? _u8L("in") : _u8L("mm");
text = std::string(buff) + " " + _u8L("mm");
}
else
text = _u8L("N/A");
imgui.text(text);
});
append_table_row(_u8L("Height") + ":", [&imgui, &vertex, &buff, imperial_units]() {
append_table_row(_u8L("Height") + ":", [&imgui, &vertex, &buff]() {
std::string text;
if (vertex.is_extrusion()) {
sprintf(buff, "%.3f", vertex.height);
text = std::string(buff) + " ";
text += imperial_units ? _u8L("in") : _u8L("mm");
text = std::string(buff) + " " + _u8L("mm");
}
else
text = _u8L("N/A");
@ -521,12 +518,11 @@ void GCodeViewer::SequentialView::Marker::render_position_window(const libvgcode
const std::string text = std::string(buff);
imgui.text(text);
});
append_table_row(_u8L("Speed") + ":", [&imgui, &vertex, &buff, imperial_units]() {
append_table_row(_u8L("Speed") + ":", [&imgui, &vertex, &buff]() {
std::string text;
if (vertex.is_extrusion()) {
sprintf(buff, "%.1f", vertex.feedrate);
text = std::string(buff) + " ";
text += imperial_units ? _u8L("in/s") : _u8L("mm/s");
text = std::string(buff) + " " + _u8L("mm/s");
}
else
text = _u8L("N/A");