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

FIX: The printer connection in the prepare interface is incorrect. 

2. crash when opening the GCode file and then switching the preset.
jira: STUDIO-9738 & STUDIO-9743

Change-Id: I155784f59907a3e22da6eac277180f70a78fd449
This commit is contained in:
zhimin.zeng 2025-01-13 15:20:55 +08:00 committed by lane.wei
parent 8d84763c81
commit 3a033566ec
3 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/slic3r/GUI/Plater.cpp
View File

@ -7741,12 +7741,12 @@ void Plater::priv::on_select_preset(wxCommandEvent &evt)
else if (select_preset) {
if (preset_type == Preset::TYPE_PRINTER) {
PhysicalPrinterCollection& physical_printers = wxGetApp().preset_bundle->physical_printers;
if(combo->is_selected_physical_printer())
if (marker == PresetComboBox::LABEL_ITEM_PHYSICAL_PRINTER)
preset_name = physical_printers.get_selected_printer_preset_name();
else
physical_printers.unselect_printer();
if (combo->is_selected_printer_model()) {
if (marker == PresetComboBox::LABEL_ITEM_PRINTER_MODELS) {
auto preset = wxGetApp().preset_bundle->get_similar_printer_preset(preset_name, {});
if (preset == nullptr) {
MessageDialog dlg(this->sidebar, _L(""), _L(""));

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

@ -288,7 +288,7 @@ wxString PresetComboBox::get_tooltip(const Preset &preset)
wxString PresetComboBox::get_preset_item_name(unsigned int index)
{
if (m_type == Preset::TYPE_PRINTER) {
int idx = selected_connected_printer();
int idx = selected_connected_printer(index);
if (idx < 0) {
return GetString(index);
}
@ -305,12 +305,14 @@ wxString PresetComboBox::get_preset_item_name(unsigned int index)
return GetString(index);
}
auto iter = machine_list.begin();
auto iter = m_backup_dev_list_sorted.begin();
std::advance(iter, idx);
Preset* machine_preset = get_printer_preset(iter->second);
if (machine_preset) {
dev->set_selected_machine(iter->first);
return from_u8(machine_preset->name);
if (iter != m_backup_dev_list_sorted.end() && machine_list.find(*iter) != machine_list.end()) {
Preset* machine_preset = get_printer_preset(machine_list[*iter]);
if (machine_preset) {
dev->set_selected_machine(*iter);
return from_u8(machine_preset->name);
}
}
}
}
@ -460,6 +462,11 @@ void PresetComboBox::add_connected_printers(std::string selected, bool alias_nam
return false;
});
m_backup_dev_list_sorted.clear();
for (auto &it : user_machine_list) {
m_backup_dev_list_sorted.push_back(it.first);
}
for (auto iter = user_machine_list.begin(); iter != user_machine_list.end(); ++iter) {
Preset* printer_preset = get_printer_preset(iter->second);
if (!printer_preset)
@ -473,10 +480,10 @@ void PresetComboBox::add_connected_printers(std::string selected, bool alias_nam
m_last_printer_idx = GetCount();
}
int PresetComboBox::selected_connected_printer() const
int PresetComboBox::selected_connected_printer(int index) const
{
if (m_first_printer_idx && m_last_selected >= m_first_printer_idx && m_last_selected < m_last_printer_idx) {
return reinterpret_cast<int *>(GetClientData(m_last_selected)) - &m_first_printer_idx;
if (m_first_printer_idx && index >= m_first_printer_idx && index < m_last_printer_idx) {
return reinterpret_cast<int *>(GetClientData(index)) - &m_first_printer_idx;
}
return -1;
}

3
src/slic3r/GUI/PresetComboBoxes.hpp
View File

@ -72,7 +72,7 @@ public:
// BBS: printer
bool update_printer_list();
void add_connected_printers(std::string selected, bool alias_name = false);
int selected_connected_printer() const;
int selected_connected_printer(int index) const;
// BBS: ams
void add_ams_filaments(std::string selected, bool alias_name = false);
@ -137,6 +137,7 @@ protected:
int m_last_printer_idx = 0;
std::vector<std::string> m_backup_dev_list;
std::vector<std::string> m_backup_dev_list_sorted;
PrinterTechnology printer_technology {ptAny};