|
![](https://seccdn.libravatar.org/avatar/8f348c5d9e070eb61d0d5cc61d5b72ae3b8184346eb513e8a269f5b8ac5daf4c?s=16&d=retro) |
30bbf1b |
From f67a877d583eba5472003f0ea4df3f7420d70734 Mon Sep 17 00:00:00 2001
|
|
![](https://seccdn.libravatar.org/avatar/8f348c5d9e070eb61d0d5cc61d5b72ae3b8184346eb513e8a269f5b8ac5daf4c?s=16&d=retro) |
30bbf1b |
From: Gregor Riepl <onitake@gmail.com>
|
|
![](https://seccdn.libravatar.org/avatar/8f348c5d9e070eb61d0d5cc61d5b72ae3b8184346eb513e8a269f5b8ac5daf4c?s=16&d=retro) |
30bbf1b |
Date: Mon, 27 Nov 2023 13:01:55 +0100
|
|
![](https://seccdn.libravatar.org/avatar/8f348c5d9e070eb61d0d5cc61d5b72ae3b8184346eb513e8a269f5b8ac5daf4c?s=16&d=retro) |
30bbf1b |
Subject: [PATCH] Make initializers explicit to avoid ambiguous wxArrayString
|
|
![](https://seccdn.libravatar.org/avatar/8f348c5d9e070eb61d0d5cc61d5b72ae3b8184346eb513e8a269f5b8ac5daf4c?s=16&d=retro) |
30bbf1b |
overloads
|
|
![](https://seccdn.libravatar.org/avatar/8f348c5d9e070eb61d0d5cc61d5b72ae3b8184346eb513e8a269f5b8ac5daf4c?s=16&d=retro) |
30bbf1b |
|
|
![](https://seccdn.libravatar.org/avatar/8f348c5d9e070eb61d0d5cc61d5b72ae3b8184346eb513e8a269f5b8ac5daf4c?s=16&d=retro) |
30bbf1b |
---
|
|
![](https://seccdn.libravatar.org/avatar/8f348c5d9e070eb61d0d5cc61d5b72ae3b8184346eb513e8a269f5b8ac5daf4c?s=16&d=retro) |
30bbf1b |
src/slic3r/GUI/PhysicalPrinterDialog.cpp | 2 +-
|
|
![](https://seccdn.libravatar.org/avatar/8f348c5d9e070eb61d0d5cc61d5b72ae3b8184346eb513e8a269f5b8ac5daf4c?s=16&d=retro) |
30bbf1b |
src/slic3r/GUI/Plater.cpp | 2 +-
|
|
![](https://seccdn.libravatar.org/avatar/8f348c5d9e070eb61d0d5cc61d5b72ae3b8184346eb513e8a269f5b8ac5daf4c?s=16&d=retro) |
30bbf1b |
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
![](https://seccdn.libravatar.org/avatar/8f348c5d9e070eb61d0d5cc61d5b72ae3b8184346eb513e8a269f5b8ac5daf4c?s=16&d=retro) |
30bbf1b |
|
|
![](https://seccdn.libravatar.org/avatar/8f348c5d9e070eb61d0d5cc61d5b72ae3b8184346eb513e8a269f5b8ac5daf4c?s=16&d=retro) |
30bbf1b |
diff --git a/src/slic3r/GUI/PhysicalPrinterDialog.cpp b/src/slic3r/GUI/PhysicalPrinterDialog.cpp
|
|
![](https://seccdn.libravatar.org/avatar/8f348c5d9e070eb61d0d5cc61d5b72ae3b8184346eb513e8a269f5b8ac5daf4c?s=16&d=retro) |
30bbf1b |
index 2364c56247..bc2c918a60 100644
|
|
![](https://seccdn.libravatar.org/avatar/8f348c5d9e070eb61d0d5cc61d5b72ae3b8184346eb513e8a269f5b8ac5daf4c?s=16&d=retro) |
30bbf1b |
--- a/src/slic3r/GUI/PhysicalPrinterDialog.cpp
|
|
![](https://seccdn.libravatar.org/avatar/8f348c5d9e070eb61d0d5cc61d5b72ae3b8184346eb513e8a269f5b8ac5daf4c?s=16&d=retro) |
30bbf1b |
+++ b/src/slic3r/GUI/PhysicalPrinterDialog.cpp
|
|
![](https://seccdn.libravatar.org/avatar/8f348c5d9e070eb61d0d5cc61d5b72ae3b8184346eb513e8a269f5b8ac5daf4c?s=16&d=retro) |
30bbf1b |
@@ -467,7 +467,7 @@ void PhysicalPrinterDialog::build_printhost_settings(ConfigOptionsGroup* m_optgr
|
|
![](https://seccdn.libravatar.org/avatar/8f348c5d9e070eb61d0d5cc61d5b72ae3b8184346eb513e8a269f5b8ac5daf4c?s=16&d=retro) |
30bbf1b |
// Always fill in the "printhost_port" combo box from the config and select it.
|
|
![](https://seccdn.libravatar.org/avatar/8f348c5d9e070eb61d0d5cc61d5b72ae3b8184346eb513e8a269f5b8ac5daf4c?s=16&d=retro) |
30bbf1b |
{
|
|
![](https://seccdn.libravatar.org/avatar/8f348c5d9e070eb61d0d5cc61d5b72ae3b8184346eb513e8a269f5b8ac5daf4c?s=16&d=retro) |
30bbf1b |
Choice* choice = dynamic_cast<Choice*>(m_optgroup->get_field("printhost_port"));
|
|
![](https://seccdn.libravatar.org/avatar/8f348c5d9e070eb61d0d5cc61d5b72ae3b8184346eb513e8a269f5b8ac5daf4c?s=16&d=retro) |
30bbf1b |
- choice->set_values({ m_config->opt_string("printhost_port") });
|
|
![](https://seccdn.libravatar.org/avatar/8f348c5d9e070eb61d0d5cc61d5b72ae3b8184346eb513e8a269f5b8ac5daf4c?s=16&d=retro) |
30bbf1b |
+ choice->set_values(std::vector<std::string>({ m_config->opt_string("printhost_port") }));
|
|
![](https://seccdn.libravatar.org/avatar/8f348c5d9e070eb61d0d5cc61d5b72ae3b8184346eb513e8a269f5b8ac5daf4c?s=16&d=retro) |
30bbf1b |
choice->set_selection();
|
|
![](https://seccdn.libravatar.org/avatar/8f348c5d9e070eb61d0d5cc61d5b72ae3b8184346eb513e8a269f5b8ac5daf4c?s=16&d=retro) |
30bbf1b |
}
|
|
![](https://seccdn.libravatar.org/avatar/8f348c5d9e070eb61d0d5cc61d5b72ae3b8184346eb513e8a269f5b8ac5daf4c?s=16&d=retro) |
30bbf1b |
|
|
![](https://seccdn.libravatar.org/avatar/8f348c5d9e070eb61d0d5cc61d5b72ae3b8184346eb513e8a269f5b8ac5daf4c?s=16&d=retro) |
30bbf1b |
diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp
|
|
![](https://seccdn.libravatar.org/avatar/8f348c5d9e070eb61d0d5cc61d5b72ae3b8184346eb513e8a269f5b8ac5daf4c?s=16&d=retro) |
30bbf1b |
index c2b8e8694f..2f540bfe9d 100644
|
|
![](https://seccdn.libravatar.org/avatar/8f348c5d9e070eb61d0d5cc61d5b72ae3b8184346eb513e8a269f5b8ac5daf4c?s=16&d=retro) |
30bbf1b |
--- a/src/slic3r/GUI/Plater.cpp
|
|
![](https://seccdn.libravatar.org/avatar/8f348c5d9e070eb61d0d5cc61d5b72ae3b8184346eb513e8a269f5b8ac5daf4c?s=16&d=retro) |
30bbf1b |
+++ b/src/slic3r/GUI/Plater.cpp
|
|
![](https://seccdn.libravatar.org/avatar/8f348c5d9e070eb61d0d5cc61d5b72ae3b8184346eb513e8a269f5b8ac5daf4c?s=16&d=retro) |
30bbf1b |
@@ -5390,7 +5390,7 @@ void Plater::load_project(const wxString& filename)
|
|
![](https://seccdn.libravatar.org/avatar/8f348c5d9e070eb61d0d5cc61d5b72ae3b8184346eb513e8a269f5b8ac5daf4c?s=16&d=retro) |
30bbf1b |
|
|
![](https://seccdn.libravatar.org/avatar/8f348c5d9e070eb61d0d5cc61d5b72ae3b8184346eb513e8a269f5b8ac5daf4c?s=16&d=retro) |
30bbf1b |
p->reset();
|
|
![](https://seccdn.libravatar.org/avatar/8f348c5d9e070eb61d0d5cc61d5b72ae3b8184346eb513e8a269f5b8ac5daf4c?s=16&d=retro) |
30bbf1b |
|
|
![](https://seccdn.libravatar.org/avatar/8f348c5d9e070eb61d0d5cc61d5b72ae3b8184346eb513e8a269f5b8ac5daf4c?s=16&d=retro) |
30bbf1b |
- if (! load_files({ into_path(filename) }).empty()) {
|
|
![](https://seccdn.libravatar.org/avatar/8f348c5d9e070eb61d0d5cc61d5b72ae3b8184346eb513e8a269f5b8ac5daf4c?s=16&d=retro) |
30bbf1b |
+ if (! load_files(std::vector<boost::filesystem::path>({ into_path(filename) })).empty()) {
|
|
![](https://seccdn.libravatar.org/avatar/8f348c5d9e070eb61d0d5cc61d5b72ae3b8184346eb513e8a269f5b8ac5daf4c?s=16&d=retro) |
30bbf1b |
// At least one file was loaded.
|
|
![](https://seccdn.libravatar.org/avatar/8f348c5d9e070eb61d0d5cc61d5b72ae3b8184346eb513e8a269f5b8ac5daf4c?s=16&d=retro) |
30bbf1b |
p->set_project_filename(filename);
|
|
![](https://seccdn.libravatar.org/avatar/8f348c5d9e070eb61d0d5cc61d5b72ae3b8184346eb513e8a269f5b8ac5daf4c?s=16&d=retro) |
30bbf1b |
// Save the names of active presets and project specific config into ProjectDirtyStateManager.
|