GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-05-29 17:44:36 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

configuration wizard: added Checked information to sorting algortihm on filaments page. Fix of #4922

Browse Source
This commit is contained in:
David Kocik 2020-10-20 10:35:48 +02:00
parent 68a7e5ce41
commit 068a254ef0
2 changed files with 33 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/slic3r/GUI/ConfigWizard.cpp
View File

@ -909,7 +909,7 @@ void PageMaterials::update_lists(int sel_printer, int sel_type, int sel_vendor)
const std::string& type = list_type->get_data(sel_type); const std::string& type = list_type->get_data(sel_type);
const std::string& vendor = list_vendor->get_data(sel_vendor); const std::string& vendor = list_vendor->get_data(sel_vendor);
// finst printer preset // finst printer preset
std::vector<std::pair<std::reference_wrapper<const std::string>, bool>> to_list; std::vector<ProfilePrintData> to_list;
for (size_t i = 0; i < sel_printers_count; i++) { for (size_t i = 0; i < sel_printers_count; i++) {
const std::string& printer_name = list_printer->get_data(sel_printers[i]); const std::string& printer_name = list_printer->get_data(sel_printers[i]);
const Preset* printer = nullptr; const Preset* printer = nullptr;
@ -924,16 +924,19 @@ void PageMaterials::update_lists(int sel_printer, int sel_type, int sel_vendor)
bool was_checked = false; bool was_checked = false;
//size_t printer_counter = materials->get_printer_counter(p); //size_t printer_counter = materials->get_printer_counter(p);
int cur_i = list_profile->find(p->alias); int cur_i = list_profile->find(p->alias);
bool emplace_to_to_list = false;
if (cur_i == wxNOT_FOUND) { if (cur_i == wxNOT_FOUND) {
cur_i = list_profile->append(p->alias + (materials->get_omnipresent(p) ? "" : " *"), &p->alias); cur_i = list_profile->append(p->alias + (materials->get_omnipresent(p) ? "" : " *"), &p->alias);
to_list.emplace_back(p->alias, materials->get_omnipresent(p)); emplace_to_to_list = true;
} else } else
was_checked = list_profile->IsChecked(cur_i); was_checked = list_profile->IsChecked(cur_i);
const std::string& section = materials->appconfig_section(); const std::string& section = materials->appconfig_section();
const bool checked = wizard_p()->appconfig_new.has(section, p->name); const bool checked = wizard_p()->appconfig_new.has(section, p->name);
list_profile->Check(cur_i, checked | was_checked); list_profile->Check(cur_i, checked || was_checked);
if (emplace_to_to_list)
to_list.emplace_back(p->alias, materials->get_omnipresent(p), checked || was_checked);
/* Update preset selection in config. /* Update preset selection in config.
* If one preset from aliases bundle is selected, * If one preset from aliases bundle is selected,
@ -1011,33 +1014,39 @@ void PageMaterials::sort_list_data(StringList* list, bool add_All_item, bool mat
list->append(item, &const_cast<std::string&>(item.get())); list->append(item, &const_cast<std::string&>(item.get()));
} }
void PageMaterials::sort_list_data(PresetList* list, const std::vector<std::pair<std::reference_wrapper<const std::string>, bool>>& data) void PageMaterials::sort_list_data(PresetList* list, const std::vector<ProfilePrintData>& data)
{ {
// sort data // sort data
// then prusa profiles // then prusa profiles
// then the rest // then the rest
// in alphabetical order // in alphabetical order
std::vector<std::pair<std::reference_wrapper<const std::string>, bool>> prusa_profiles; std::vector<ProfilePrintData> prusa_profiles;
std::vector<std::pair<std::reference_wrapper<const std::string>, bool>> other_profiles; std::vector<ProfilePrintData> other_profiles;
//for (int i = 0; i < data.size(); ++i) { //for (int i = 0; i < data.size(); ++i) {
for (const auto& item : data) { for (const auto& item : data) {
const std::string& name = item.first; const std::string& name = item.name;
if (name.find("Prusa") != std::string::npos) if (name.find("Prusa") != std::string::npos)
prusa_profiles.emplace_back(item); prusa_profiles.emplace_back(item);
else else
other_profiles.emplace_back(item); other_profiles.emplace_back(item);
} }
std::sort(prusa_profiles.begin(), prusa_profiles.end(), [](std::pair<std::reference_wrapper<const std::string>, bool> a, std::pair<std::reference_wrapper<const std::string>, bool> b) { std::sort(prusa_profiles.begin(), prusa_profiles.end(), [](ProfilePrintData a, ProfilePrintData b) {
return a.first.get() < b.first.get(); return a.name.get() < b.name.get();
}); });
std::sort(other_profiles.begin(), other_profiles.end(), [](std::pair<std::reference_wrapper<const std::string>, bool> a, std::pair<std::reference_wrapper<const std::string>, bool> b) { std::sort(other_profiles.begin(), other_profiles.end(), [](ProfilePrintData a, ProfilePrintData b) {
return a.first.get() < b.first.get(); return a.name.get() < b.name.get();
}); });
list->Clear(); list->Clear();
for (const auto& item : prusa_profiles) //for (const auto& item : prusa_profiles)
list->append(std::string(item.first) + (item.second ? "" : " *"), &const_cast<std::string&>(item.first.get())); for (int i = 0; i < prusa_profiles.size(); ++i) {
for (const auto& item : other_profiles) list->append(std::string(prusa_profiles[i].name) + (prusa_profiles[i].omnipresent ? "" : " *"), &const_cast<std::string&>(prusa_profiles[i].name.get()));
list->append(std::string(item.first) + (item.second ? "" : " *"), &const_cast<std::string&>(item.first.get())); list->Check(i, prusa_profiles[i].checked);
}
//for (const auto& item : other_profiles)
for (int i = 0; i < other_profiles.size(); ++i) {
list->append(std::string(other_profiles[i].name) + (other_profiles[i].omnipresent ? "" : " *"), &const_cast<std::string&>(other_profiles[i].name.get()));
list->Check(i + prusa_profiles.size(), other_profiles[i].checked);
}
} }
void PageMaterials::select_material(int i) void PageMaterials::select_material(int i)

10
src/slic3r/GUI/ConfigWizard_private.hpp
View File

@ -314,6 +314,14 @@ template<class T, class D> struct DataList : public T
typedef DataList<wxListBox, std::string> StringList; typedef DataList<wxListBox, std::string> StringList;
typedef DataList<wxCheckListBox, std::string> PresetList; typedef DataList<wxCheckListBox, std::string> PresetList;
struct ProfilePrintData
{
std::reference_wrapper<const std::string> name;
bool omnipresent;
bool checked;
ProfilePrintData(const std::string& n, bool o, bool c) : name(n), omnipresent(o), checked(c) {}
};
struct PageMaterials: ConfigWizardPage struct PageMaterials: ConfigWizardPage
{ {
Materials *materials; Materials *materials;
@ -344,7 +352,7 @@ struct PageMaterials: ConfigWizardPage
void clear_compatible_printers_label(); void clear_compatible_printers_label();
void sort_list_data(StringList* list, bool add_All_item, bool material_type_ordering); void sort_list_data(StringList* list, bool add_All_item, bool material_type_ordering);
void sort_list_data(PresetList* list, const std::vector<std::pair<std::reference_wrapper<const std::string>, bool>>& data); void sort_list_data(PresetList* list, const std::vector<ProfilePrintData>& data);
void on_paint(); void on_paint();
void on_mouse_move_on_profiles(wxMouseEvent& evt); void on_mouse_move_on_profiles(wxMouseEvent& evt);