From 958f8339bc9835dbece8cb7927a5a60ea43207a5 Mon Sep 17 00:00:00 2001
From: QIDI TECH <893239786@qq.com>
Date: Fri, 9 May 2025 20:39:27 +0800
Subject: [PATCH] fix some bug
---
resources/images/erase_dark.svg | 4 ++++
resources/web/flush/WipingDialog.html | 2 +-
src/slic3r/GUI/Plater.cpp | 8 ++------
src/slic3r/GUI/SelectMachine.cpp | 14 ++++++++++++--
src/slic3r/GUI/SendMultiMachinePage.cpp | 14 ++++++++++++--
src/slic3r/GUI/SendToPrinter.cpp | 14 ++++++++++++--
6 files changed, 43 insertions(+), 13 deletions(-)
create mode 100644 resources/images/erase_dark.svg
diff --git a/resources/images/erase_dark.svg b/resources/images/erase_dark.svg
new file mode 100644
index 0000000..27ba22a
--- /dev/null
+++ b/resources/images/erase_dark.svg
@@ -0,0 +1,4 @@
+
diff --git a/resources/web/flush/WipingDialog.html b/resources/web/flush/WipingDialog.html
index 145ce71..8761c91 100644
--- a/resources/web/flush/WipingDialog.html
+++ b/resources/web/flush/WipingDialog.html
@@ -268,7 +268,7 @@
}
body.dark-mode .btn-ok {
- background-color: #3a8f44;
+ background-color: #4479fb;
}
body.dark-mode .btn-dark {
diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp
index 5a89bfe..be50158 100644
--- a/src/slic3r/GUI/Plater.cpp
+++ b/src/slic3r/GUI/Plater.cpp
@@ -3368,9 +3368,7 @@ std::map Sidebar::build_filament_box_list(std::vector("filament_multi_colors")->values.push_back(into_u8(wxColour(color[j]).GetAsString(wxC2S_HTML_SYNTAX)));
- }
+ tray_config.opt("filament_multi_colors")->values.push_back(into_u8(wxColour(color[i]).GetAsString(wxC2S_HTML_SYNTAX)));
filament_ams_list.emplace('A' + i, std::move(tray_config));
}
@@ -3388,9 +3386,7 @@ std::map Sidebar::build_filament_box_list(std::vector("filament_multi_colors")->values.push_back(into_u8(wxColour(color[j]).GetAsString(wxC2S_HTML_SYNTAX)));
- }
+ tray_config.opt("filament_multi_colors")->values.push_back(into_u8(wxColour(color.back()).GetAsString(wxC2S_HTML_SYNTAX)));
filament_ams_list.emplace('A' + count + 1, std::move(tray_config));
}
diff --git a/src/slic3r/GUI/SelectMachine.cpp b/src/slic3r/GUI/SelectMachine.cpp
index 1c4f530..5e4ec99 100644
--- a/src/slic3r/GUI/SelectMachine.cpp
+++ b/src/slic3r/GUI/SelectMachine.cpp
@@ -4441,8 +4441,18 @@ void SelectMachineDialog::set_default()
show_error(this, ex.what(), false);
}
}
- else
- filename = m_plater->get_output_filename();
+ else{
+ try{
+ filename = m_plater->get_output_filename();
+ }
+ catch (const Slic3r::PlaceholderParserError& ex) {
+ // Show the error with monospaced font.
+ show_error(this, ex.what(), true);
+ }
+ catch (const std::exception &ex) {
+ show_error(this, ex.what(), false);
+ }
+ }
if (m_print_plate_idx == PLATE_ALL_IDX && filename.empty()) {
filename = _L("Untitled");
diff --git a/src/slic3r/GUI/SendMultiMachinePage.cpp b/src/slic3r/GUI/SendMultiMachinePage.cpp
index a0975b1..b511e60 100644
--- a/src/slic3r/GUI/SendMultiMachinePage.cpp
+++ b/src/slic3r/GUI/SendMultiMachinePage.cpp
@@ -1629,8 +1629,18 @@ void SendMultiMachinePage::set_default()
show_error(this, ex.what(), false);
}
}
- else
- filename = m_plater->get_output_filename();
+ else{
+ try{
+ filename = m_plater->get_output_filename();
+ }
+ catch (const Slic3r::PlaceholderParserError& ex) {
+ // Show the error with monospaced font.
+ show_error(this, ex.what(), true);
+ }
+ catch (const std::exception &ex) {
+ show_error(this, ex.what(), false);
+ }
+ }
if (filename.empty()) {
filename = m_plater->get_export_gcode_filename("", true);
diff --git a/src/slic3r/GUI/SendToPrinter.cpp b/src/slic3r/GUI/SendToPrinter.cpp
index a87c7b7..5515f7e 100644
--- a/src/slic3r/GUI/SendToPrinter.cpp
+++ b/src/slic3r/GUI/SendToPrinter.cpp
@@ -1912,8 +1912,18 @@ void SendToPrinterDialog::set_default()
show_error(this, ex.what(), false);
}
}
- else
- filename = m_plater->get_output_filename();
+ else{
+ try{
+ filename = m_plater->get_output_filename();
+ }
+ catch (const Slic3r::PlaceholderParserError& ex) {
+ // Show the error with monospaced font.
+ show_error(this, ex.what(), true);
+ }
+ catch (const std::exception &ex) {
+ show_error(this, ex.what(), false);
+ }
+ }
if (m_print_plate_idx == PLATE_ALL_IDX && filename.empty()) {
filename = _L("Untitled");