juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-15 17:42:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: back up the selected printer in prepare page

Browse Source 
jira: none
Change-Id: Ibd163f78c4ce911a88459ecca96660ed4aa68ab2
(cherry picked from commit 392e8e18915d0db26ca8a3840d5783cc81cd1c1c)
This commit is contained in:
zhimin.zeng
2025-01-13 17:18:00 +08:00
committed by Noisyfox
parent 0ffe93a093
commit 04643255e7
4 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -180,7 +180,7 @@ void PresetComboBox::invalidate_selection()
void PresetComboBox::validate_selection(bool predicate/*=false*/)
{
if (predicate ||
if (predicate &&
// just in case: mark m_last_selected as a first added element
m_last_selected == INT_MAX)
m_last_selected = GetCount() - 1;
@@ -310,30 +310,37 @@ wxString PresetComboBox::get_preset_item_name(unsigned int index)
if (m_type == Preset::TYPE_PRINTER) {
int idx = selected_connected_printer();
if (idx < 0) {
m_selected_dev_id.clear();
return GetString(index);
}
else {
DeviceManager *dev = Slic3r::GUI::wxGetApp().getDeviceManager();
if (!dev) {
assert(false);
m_selected_dev_id.clear();
return GetString(index);
}
std::map<std::string, MachineObject *> machine_list = dev->get_my_machine_list();
if (machine_list.empty()) {
assert(false);
m_selected_dev_id.clear();
return GetString(index);
}
auto iter = machine_list.begin();
std::advance(iter, idx);
Preset* machine_preset = get_printer_preset(iter->second);
if (machine_preset) {
return from_u8(machine_preset->name);
if (iter != machine_list.end()) {
m_selected_dev_id = *iter;
Preset* machine_preset = get_printer_preset(iter->second);
if (machine_preset) {
return from_u8(machine_preset->name);
}
}
}
}
m_selected_dev_id.clear();
return GetString(index);
}
@@ -447,6 +454,7 @@ void PresetComboBox::add_connected_printers(std::string selected, bool alias_nam
boost::replace_all(printer_model, "Bambu Lab ", "");
auto text = iter->second->dev_name + " (" + printer_model + ")";
int item_id = Append(from_u8(text), wxNullBitmap, &m_first_printer_idx + std::distance(machine_list.begin(), iter));
validate_selection(m_selected_dev_id == iter->first);
}
m_last_printer_idx = GetCount();
}