3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix of #5152 assert ""HasFlag(0x0020)"" failed in GetSelection(): must be single selection listbox

Browse source 
This assert was invoked by list_printer->GetSelection() because of list_printer was created with wxLB_MULTIPLE flag.
This commit is contained in:
YuSanka 2021-02-18 15:33:13 +01:00 • committed by Oleksandra Yushchenko
parent 89f065b57e
commit 21b044b556
2 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/slic3r/GUI/ConfigWizard.cpp
View file

@ -629,13 +629,13 @@ PageMaterials::PageMaterials(ConfigWizard *parent, Materials *materials, wxStrin
append(html_window, 0, wxEXPAND); append(html_window, 0, wxEXPAND);
list_printer->Bind(wxEVT_LISTBOX, [this](wxCommandEvent& evt) { list_printer->Bind(wxEVT_LISTBOX, [this](wxCommandEvent& evt) {
update_lists(evt.GetInt(), list_type->GetSelection(), list_vendor->GetSelection()); update_lists(list_type->GetSelection(), list_vendor->GetSelection(), evt.GetInt());
}); });
list_type->Bind(wxEVT_LISTBOX, [this](wxCommandEvent &) { list_type->Bind(wxEVT_LISTBOX, [this](wxCommandEvent &) {
update_lists(list_printer->GetSelection(), list_type->GetSelection(), list_vendor->GetSelection()); update_lists(list_type->GetSelection(), list_vendor->GetSelection());
}); });
list_vendor->Bind(wxEVT_LISTBOX, [this](wxCommandEvent &) { list_vendor->Bind(wxEVT_LISTBOX, [this](wxCommandEvent &) {
update_lists(list_printer->GetSelection(), list_type->GetSelection(), list_vendor->GetSelection()); update_lists(list_type->GetSelection(), list_vendor->GetSelection());
}); });
list_profile->Bind(wxEVT_CHECKLISTBOX, [this](wxCommandEvent &evt) { select_material(evt.GetInt()); }); list_profile->Bind(wxEVT_CHECKLISTBOX, [this](wxCommandEvent &evt) { select_material(evt.GetInt()); });
@ -681,8 +681,7 @@ void PageMaterials::reload_presets()
sort_list_data(list_printer, true, false); sort_list_data(list_printer, true, false);
if (list_printer->GetCount() > 0) { if (list_printer->GetCount() > 0) {
list_printer->SetSelection(0); list_printer->SetSelection(0);
sel_printer_count_prev = wxNOT_FOUND; sel_printers_prev.Clear();
sel_printer_item_prev = wxNOT_FOUND;
sel_type_prev = wxNOT_FOUND; sel_type_prev = wxNOT_FOUND;
sel_vendor_prev = wxNOT_FOUND; sel_vendor_prev = wxNOT_FOUND;
update_lists(0, 0, 0); update_lists(0, 0, 0);
@ -812,7 +811,7 @@ void PageMaterials::on_material_highlighted(int sel_material)
set_compatible_printers_html_window(names, names.size() == materials->printers.size()); set_compatible_printers_html_window(names, names.size() == materials->printers.size());
} }
void PageMaterials::update_lists(int sel_printer, int sel_type, int sel_vendor) void PageMaterials::update_lists(int sel_type, int sel_vendor, int last_selected_printer/* = -1*/)
{ {
wxWindowUpdateLocker freeze_guard(this); wxWindowUpdateLocker freeze_guard(this);
(void)freeze_guard; (void)freeze_guard;
@ -820,7 +819,7 @@ void PageMaterials::update_lists(int sel_printer, int sel_type, int sel_vendor)
wxArrayInt sel_printers; wxArrayInt sel_printers;
int sel_printers_count = list_printer->GetSelections(sel_printers); int sel_printers_count = list_printer->GetSelections(sel_printers);
if (sel_printers_count != sel_printer_count_prev || (sel_printers_count == 1 && sel_printer_item_prev != sel_printer && sel_printer != -1)) { if (sel_printers != sel_printers_prev) {
// Refresh type list // Refresh type list
list_type->Clear(); list_type->Clear();
list_type->append(_L("(All)"), &EMPTY); list_type->append(_L("(All)"), &EMPTY);
@ -828,7 +827,7 @@ void PageMaterials::update_lists(int sel_printer, int sel_type, int sel_vendor)
// If all is selected with other printers // If all is selected with other printers
// unselect "all" or all printers depending on last value // unselect "all" or all printers depending on last value
if (sel_printers[0] == 0 && sel_printers_count > 1) { if (sel_printers[0] == 0 && sel_printers_count > 1) {
if (sel_printer == 0) { if (last_selected_printer == 0) {
list_printer->SetSelection(wxNOT_FOUND); list_printer->SetSelection(wxNOT_FOUND);
list_printer->SetSelection(0); list_printer->SetSelection(0);
} else { } else {
@ -869,8 +868,7 @@ void PageMaterials::update_lists(int sel_printer, int sel_type, int sel_vendor)
sort_list_data(list_type, true, true); sort_list_data(list_type, true, true);
} }
sel_printer_count_prev = sel_printers_count; sel_printers_prev = sel_printers;
sel_printer_item_prev = sel_printer;
sel_type = 0; sel_type = 0;
sel_type_prev = wxNOT_FOUND; sel_type_prev = wxNOT_FOUND;
list_type->SetSelection(sel_type); list_type->SetSelection(sel_type);
@ -1089,8 +1087,7 @@ void PageMaterials::clear()
list_type->Clear(); list_type->Clear();
list_vendor->Clear(); list_vendor->Clear();
list_profile->Clear(); list_profile->Clear();
sel_printer_count_prev = wxNOT_FOUND; sel_printers_prev.Clear();
sel_printer_item_prev = wxNOT_FOUND;
sel_type_prev = wxNOT_FOUND; sel_type_prev = wxNOT_FOUND;
sel_vendor_prev = wxNOT_FOUND; sel_vendor_prev = wxNOT_FOUND;
presets_loaded = false; presets_loaded = false;

5
src/slic3r/GUI/ConfigWizard_private.hpp
View file

@ -327,7 +327,8 @@ struct PageMaterials: ConfigWizardPage
Materials *materials; Materials *materials;
StringList *list_printer, *list_type, *list_vendor; StringList *list_printer, *list_type, *list_vendor;
PresetList *list_profile; PresetList *list_profile;
int sel_printer_count_prev, sel_printer_item_prev, sel_type_prev, sel_vendor_prev; wxArrayInt sel_printers_prev;
int sel_type_prev, sel_vendor_prev;
bool presets_loaded; bool presets_loaded;
wxFlexGridSizer *grid; wxFlexGridSizer *grid;
@ -342,7 +343,7 @@ struct PageMaterials: ConfigWizardPage
PageMaterials(ConfigWizard *parent, Materials *materials, wxString title, wxString shortname, wxString list1name); PageMaterials(ConfigWizard *parent, Materials *materials, wxString title, wxString shortname, wxString list1name);
void reload_presets(); void reload_presets();
void update_lists(int sel1, int sel2, int sel3); void update_lists(int sel_type, int sel_vendor, int last_selected_printer = -1);
void on_material_highlighted(int sel_material); void on_material_highlighted(int sel_material);
void on_material_hovered(int sel_material); void on_material_hovered(int sel_material);
void select_material(int i); void select_material(int i);