Fix multiple minor multiple autoslicing issues

- Add tooltip to slice all button
- Count from 1 when naming beds sent to connect
- Partially improve statistics window
This commit is contained in:
Martin Šach 2024-12-09 10:48:20 +01:00 committed by Lukas Matena
parent 59e4a5aba6
commit 29da9fcfff
2 changed files with 9 additions and 5 deletions

View File

@ -2019,12 +2019,12 @@ void begin_statistics(const char *window_name) {
ImGuiWindowFlags_NoCollapse
| ImGuiWindowFlags_NoMove
| ImGuiWindowFlags_AlwaysAutoResize
| ImGuiWindowFlags_NoScrollbar
| ImGuiWindowFlags_NoScrollWithMouse;
| ImGuiWindowFlags_HorizontalScrollbar;
const ImVec2 center{ImGui::GetMainViewport()->GetCenter()};
const ImVec2 position{center + ImVec2{0, -150.0f}};
ImGui::SetNextWindowPos(position, ImGuiCond_Appearing, ImVec2{0.5f, 0.5f});
const float y_postion{std::max(center.y - 150.0f, 150.0f)};
const ImVec2 position{center.x, y_postion};
ImGui::SetNextWindowPos(position, ImGuiCond_Always, ImVec2{0.5f, 0.5f});
ImGui::Begin(window_name, nullptr, windows_flags);
}
@ -6639,6 +6639,10 @@ bool slice_all_beds_button(bool is_active, const ImVec2 size, const ImVec2 paddi
std::string slice_all_btn_name = boost::nowide::narrow(std::wstring{ ImGui::SliceAllBtnIcon });
bool clicked = ImGui::Button(slice_all_btn_name.c_str(), size + padding);
if (ImGui::IsItemHovered()) {
ImGui::SetTooltip("%s", _u8L("Slice all").c_str());
}
ImGui::PopStyleColor(4);
return clicked;

View File

@ -6602,7 +6602,7 @@ void Plater::connect_gcode_all() {
const fs::path filename{upload_job.upload_data.upload_path};
upload_job.upload_data.upload_path =
filename.stem().string()
+ "_bed" + std::to_string(print_index)
+ "_bed" + std::to_string(print_index + 1)
+ filename.extension().string();
this->p->background_process.prepare_upload(upload_job);
}