mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NEW:show flush of every filament on gcodeviewer 

1.show flush of every filament
2.modify first-layer text display
3.show time in seconds when time cost < 1h
4.forbid add-filament when print by-object

Change-Id: Ib8a94b9f620797e367bfc9e8a33abd5d7ab648ec
This commit is contained in:
liz.li 2022-09-15 17:01:03 +08:00 committed by Lane.Wei
parent ec347aba3a
commit 07d234825e
3 changed files with 41 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libslic3r/Utils.hpp
View File

@ -372,7 +372,7 @@ inline std::string short_time(const std::string &time)
else if (hours > 0) else if (hours > 0)
::sprintf(buffer, "%dh%dm", hours, minutes); ::sprintf(buffer, "%dh%dm", hours, minutes);
else if (minutes > 0) else if (minutes > 0)
::sprintf(buffer, "%dm", minutes); ::sprintf(buffer, "%dm%ds", minutes, seconds);
else else
::sprintf(buffer, "%ds", seconds); ::sprintf(buffer, "%ds", seconds);
return buffer; return buffer;

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

@ -4149,7 +4149,7 @@ void GCodeViewer::render_legend(float &legend_height, int canvas_width, int canv
} }
else { else {
imgui.text(label); imgui.text(label);
/* BBS refactor do not show used_filament info // BBS refactor do not show used_filament info
if (used_filament_m > 0.0) { if (used_filament_m > 0.0) {
char buf[64]; char buf[64];
ImGui::SameLine(offsets[0]); ImGui::SameLine(offsets[0]);
@ -4158,7 +4158,7 @@ void GCodeViewer::render_legend(float &legend_height, int canvas_width, int canv
ImGui::SameLine(offsets[1]); ImGui::SameLine(offsets[1]);
::sprintf(buf, "%.2f g", used_filament_g); ::sprintf(buf, "%.2f g", used_filament_g);
imgui.text(buf); imgui.text(buf);
}*/ }
} }
ImGui::PopStyleVar(1); ImGui::PopStyleVar(1);
@ -4345,6 +4345,8 @@ void GCodeViewer::render_legend(float &legend_height, int canvas_width, int canv
std::vector<float> percents; std::vector<float> percents;
std::vector<double> used_filaments_m; std::vector<double> used_filaments_m;
std::vector<double> used_filaments_g; std::vector<double> used_filaments_g;
double total_flushed_filament_m = 0.0;
double total_flushed_filament_g = 0.0;
float max_percent = 0.0f; float max_percent = 0.0f;
@ -4445,19 +4447,31 @@ void GCodeViewer::render_legend(float &legend_height, int canvas_width, int canv
used_filaments_g.push_back(used_filament_g); used_filaments_g.push_back(used_filament_g);
} }
for (size_t extruder_id : m_extruder_ids) {
if (m_print_statistics.flush_per_filament.find(extruder_id) == m_print_statistics.flush_per_filament.end()) continue;
double volume = m_print_statistics.flush_per_filament.at(extruder_id);
auto [flushed_filament_m, flushed_filament_g] = get_used_filament_from_volume(volume, extruder_id);
total_flushed_filament_m += flushed_filament_m;
total_flushed_filament_g += flushed_filament_g;
}
std::string longest_used_filament_string; std::string longest_used_filament_string;
char buffer[64];
for (double item : used_filaments_m) { for (double item : used_filaments_m) {
char buffer[64];
::sprintf(buffer, imperial_units ? "%.2f in" : "%.2f m", item); ::sprintf(buffer, imperial_units ? "%.2f in" : "%.2f m", item);
if (::strlen(buffer) > longest_used_filament_string.length()) longest_used_filament_string = buffer; if (::strlen(buffer) > longest_used_filament_string.length()) longest_used_filament_string = buffer;
} }
::sprintf(buffer, imperial_units ? "%.2f in" : "%.2f m", total_flushed_filament_m);
if (::strlen(buffer) > longest_used_filament_string.length()) longest_used_filament_string = buffer;
std::string longest_used_filament_g_string; std::string longest_used_filament_g_string;
for (double item : used_filaments_g) { for (double item : used_filaments_g) {
char buffer[64]; ::sprintf(buffer, imperial_units ? "%.2f g" : "%.2f g", item);
::sprintf(buffer, imperial_units ? "%.2fg" : "%.2fg", item);
if (::strlen(buffer) > longest_used_filament_g_string.length()) longest_used_filament_g_string = buffer; if (::strlen(buffer) > longest_used_filament_g_string.length()) longest_used_filament_g_string = buffer;
} }
::sprintf(buffer, imperial_units ? "%.2f g" : "%.2f g", total_flushed_filament_g);
if (::strlen(buffer) > longest_used_filament_g_string.length()) longest_used_filament_g_string = buffer;
// BBL XX is placeholder // BBL XX is placeholder
offsets = calculate_offsets(labels, times, {_u8L("Filament N XX"), longest_used_filament_string, longest_used_filament_g_string, _u8L("Display")}, icon_size); offsets = calculate_offsets(labels, times, {_u8L("Filament N XX"), longest_used_filament_string, longest_used_filament_g_string, _u8L("Display")}, icon_size);
append_headers({ _u8L("Color Print"), _u8L("Comsumption"), "", "", _u8L("Display") }, offsets); append_headers({ _u8L("Color Print"), _u8L("Comsumption"), "", "", _u8L("Display") }, offsets);
@ -4635,34 +4649,36 @@ void GCodeViewer::render_legend(float &legend_height, int canvas_width, int canv
//BBS display filament change times //BBS display filament change times
if (m_print_statistics.total_filamentchanges > 0) { if (m_print_statistics.total_filamentchanges > 0) {
std::string flushed_filament_title_str = _u8L("Flushed filament");
std::string flushed_filament_str = _u8L("Filament");
std::string total_flushed_filament_str = _u8L("Total");
std::string filament_change_str = _u8L("Filament change times");
ImGui::Dummy(ImVec2(0.0f, ImGui::GetFontSize() * 0.1));
ImGui::Dummy({ window_padding, window_padding });
ImGui::SameLine();
imgui.title(flushed_filament_title_str);
//BBS: calculate total flushed filaments data //BBS: calculate total flushed filaments data
double total_flushed_filament_m = 0.0; float max_len = 10.0f + ImGui::GetStyle().ItemSpacing.x;
double total_flushed_filament_g = 0.0; max_len += ImGui::CalcTextSize(filament_change_str.c_str()).x;
for (size_t extruder_id : m_extruder_ids) { for (size_t extruder_id : m_extruder_ids) {
if (m_print_statistics.flush_per_filament.find(extruder_id) == m_print_statistics.flush_per_filament.end()) if (m_print_statistics.flush_per_filament.find(extruder_id) == m_print_statistics.flush_per_filament.end()) continue;
continue;
double volume = m_print_statistics.flush_per_filament.at(extruder_id); double volume = m_print_statistics.flush_per_filament.at(extruder_id);
auto [used_filament_m, used_filament_g] = get_used_filament_from_volume(volume, extruder_id); auto [used_filament_m, used_filament_g] = get_used_filament_from_volume(volume, extruder_id);
total_flushed_filament_m += used_filament_m; append_item(EItemType::Rect, m_tools.m_tool_colors[extruder_id], flushed_filament_str + " " + std::to_string(extruder_id + 1), true, "", 0.0f, 0.0f, offsets,
total_flushed_filament_g += used_filament_g; used_filament_m, used_filament_g);
} }
std::string flushed_filament_str = _u8L("Flushed filament");
std::string filament_change_str = _u8L("Filament change times");
float max_len = 10.0f + ImGui::GetStyle().ItemSpacing.x;
max_len += std::max(ImGui::CalcTextSize(filament_change_str.c_str()).x, ImGui::CalcTextSize(flushed_filament_str.c_str()).x);
//BBS: display total flushed filament //BBS: display total flushed filament
{ {
ImGui::Dummy({window_padding, window_padding}); ImGui::Dummy({window_padding, window_padding});
ImGui::SameLine(); ImGui::SameLine();
imgui.text(flushed_filament_str + ":"); imgui.text(total_flushed_filament_str + ":");
ImGui::SameLine(max_len); ImGui::SameLine(offsets[0]);
char buf[64]; char buf[64];
::sprintf(buf, "%.2f m", total_flushed_filament_m); ::sprintf(buf, "%.2f m", total_flushed_filament_m);
imgui.text(buf); imgui.text(buf);
ImGui::SameLine(); ImGui::SameLine(offsets[1]);
::sprintf(buf, " %.2f g", total_flushed_filament_g); ::sprintf(buf, "%.2f g", total_flushed_filament_g);
imgui.text(buf); imgui.text(buf);
} }
//BBS display filament change times //BBS display filament change times
@ -4672,7 +4688,7 @@ void GCodeViewer::render_legend(float &legend_height, int canvas_width, int canv
imgui.text(filament_change_str + ":"); imgui.text(filament_change_str + ":");
ImGui::SameLine(max_len); ImGui::SameLine(max_len);
char temp_buf[64]; char temp_buf[64];
::sprintf(temp_buf, " %d", m_print_statistics.total_filamentchanges); ::sprintf(temp_buf, "%d", m_print_statistics.total_filamentchanges);
imgui.text(temp_buf); imgui.text(temp_buf);
} }
} }

8
src/slic3r/GUI/IMSlider.cpp
View File

@ -1271,7 +1271,7 @@ void IMSlider::render_menu()
//BBS render this menu item only when extruder_num > 1 //BBS render this menu item only when extruder_num > 1
if (extruder_num > 1) { if (extruder_num > 1) {
if (!m_can_change_color) { if (!m_can_change_color || m_draw_mode == dmSequentialFffPrint) {
begin_menu(_u8L("Change Filament").c_str(), false); begin_menu(_u8L("Change Filament").c_str(), false);
} }
else if (begin_menu(_u8L("Change Filament").c_str())) { else if (begin_menu(_u8L("Change Filament").c_str())) {
@ -1360,9 +1360,7 @@ std::string IMSlider::get_label(int tick, LabelType label_type)
} }
char layer_height[64]; char layer_height[64];
m_values[value] == m_zero_layer_height ? ::sprintf(layer_height, "%.2f", m_values.empty() ? m_label_koef * value : m_values[value]);
::sprintf(layer_height, "") :
::sprintf(layer_height, "%.2f", m_values.empty() ? m_label_koef * value : m_values[value]);
if (label_type == ltHeight) return std::string(layer_height); if (label_type == ltHeight) return std::string(layer_height);
if (label_type == ltHeightWithLayer) { if (label_type == ltHeightWithLayer) {
char buffer[64]; char buffer[64];
@ -1370,7 +1368,7 @@ std::string IMSlider::get_label(int tick, LabelType label_type)
if (m_values[GetMinValueD()] == m_zero_layer_height) { if (m_values[GetMinValueD()] == m_zero_layer_height) {
layer_number = m_is_wipe_tower ? get_layer_number(value, label_type): (m_values.empty() ? value : value); layer_number = m_is_wipe_tower ? get_layer_number(value, label_type): (m_values.empty() ? value : value);
m_values[value] == m_zero_layer_height ? m_values[value] == m_zero_layer_height ?
::sprintf(buffer, "%5s", std::to_string(layer_number).c_str()) : ::sprintf(buffer, "%5s\n%5s", _u8L("Start").c_str(), _u8L("G-code").c_str()) :
::sprintf(buffer, "%5s\n%5s", std::to_string(layer_number).c_str(), layer_height); ::sprintf(buffer, "%5s\n%5s", std::to_string(layer_number).c_str(), layer_height);
} }
else { else {