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

Config wizard: sort names in lower case.

Browse Source 
Other vendors page and Filaments page
This commit is contained in:
David Kocik 2023-05-25 16:55:36 +02:00
parent f1e287e0c9
commit ad5d239426
1 changed files with 41 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,6 +10,7 @@
#include <boost/format.hpp> #include <boost/format.hpp>
#include <boost/log/trivial.hpp> #include <boost/log/trivial.hpp>
#include <boost/algorithm/string/predicate.hpp> #include <boost/algorithm/string/predicate.hpp>
#include <boost/algorithm/string/case_conv.hpp>
#include <boost/nowide/convert.hpp> #include <boost/nowide/convert.hpp>
#include <boost/dll/runtime_symbol_info.hpp> #include <boost/dll/runtime_symbol_info.hpp>
@ -1162,7 +1163,7 @@ void PageMaterials::sort_list_data(StringList* list, bool add_All_item, bool mat
// in alphabetical order // in alphabetical order
std::vector<std::reference_wrapper<const std::string>> prusa_profiles; std::vector<std::reference_wrapper<const std::string>> prusa_profiles;
std::vector<std::reference_wrapper<const std::string>> other_profiles; std::vector<std::pair<std::wstring ,std::reference_wrapper<const std::string>>> other_profiles; // first is lower case id for sorting
bool add_TEMPLATES_item = false; bool add_TEMPLATES_item = false;
for (int i = 0 ; i < list->size(); ++i) { for (int i = 0 ; i < list->size(); ++i) {
const std::string& data = list->get_data(i); const std::string& data = list->get_data(i);
@ -1175,7 +1176,7 @@ void PageMaterials::sort_list_data(StringList* list, bool add_All_item, bool mat
if (!material_type_ordering && data.find("Prusa") != std::string::npos) if (!material_type_ordering && data.find("Prusa") != std::string::npos)
prusa_profiles.push_back(data); prusa_profiles.push_back(data);
else else
other_profiles.push_back(data); other_profiles.emplace_back(boost::algorithm::to_lower_copy(boost::nowide::widen(data)),data);
} }
if (material_type_ordering) { if (material_type_ordering) {
@ -1185,10 +1186,10 @@ void PageMaterials::sort_list_data(StringList* list, bool add_All_item, bool mat
for (size_t profs = end_of_sorted; profs < other_profiles.size(); profs++) for (size_t profs = end_of_sorted; profs < other_profiles.size(); profs++)
{ {
// find instead compare because PET vs PETG // find instead compare because PET vs PETG
if (other_profiles[profs].get().find(value) != std::string::npos) { if (other_profiles[profs].second.get().find(value) != std::string::npos) {
//swap //swap
if(profs != end_of_sorted) { if(profs != end_of_sorted) {
std::reference_wrapper<const std::string> aux = other_profiles[end_of_sorted]; std::pair<std::wstring, std::reference_wrapper<const std::string>> aux = other_profiles[end_of_sorted];
other_profiles[end_of_sorted] = other_profiles[profs]; other_profiles[end_of_sorted] = other_profiles[profs];
other_profiles[profs] = aux; other_profiles[profs] = aux;
} }
@ -1201,8 +1202,8 @@ void PageMaterials::sort_list_data(StringList* list, bool add_All_item, bool mat
std::sort(prusa_profiles.begin(), prusa_profiles.end(), [](std::reference_wrapper<const std::string> a, std::reference_wrapper<const std::string> b) { std::sort(prusa_profiles.begin(), prusa_profiles.end(), [](std::reference_wrapper<const std::string> a, std::reference_wrapper<const std::string> b) {
return a.get() < b.get(); return a.get() < b.get();
}); });
std::sort(other_profiles.begin(), other_profiles.end(), [](std::reference_wrapper<const std::string> a, std::reference_wrapper<const std::string> b) { std::sort(other_profiles.begin(), other_profiles.end(), [](const std::pair<std::wstring, std::reference_wrapper<const std::string>>& a, const std::pair<std::wstring, std::reference_wrapper<const std::string>>& b) {
return a.get() < b.get(); return a.first <b.first;
}); });
} }
@ -1214,7 +1215,7 @@ void PageMaterials::sort_list_data(StringList* list, bool add_All_item, bool mat
for (const auto& item : prusa_profiles) for (const auto& item : prusa_profiles)
list->append(item, &const_cast<std::string&>(item.get())); list->append(item, &const_cast<std::string&>(item.get()));
for (const auto& item : other_profiles) for (const auto& item : other_profiles)
list->append(item, &const_cast<std::string&>(item.get())); list->append(item.second, &const_cast<std::string&>(item.second.get()));
} }
@ -1225,20 +1226,19 @@ void PageMaterials::sort_list_data(PresetList* list, const std::vector<ProfilePr
// then the rest // then the rest
// in alphabetical order // in alphabetical order
std::vector<ProfilePrintData> prusa_profiles; std::vector<ProfilePrintData> prusa_profiles;
std::vector<ProfilePrintData> other_profiles; std::vector<std::pair<std::wstring, ProfilePrintData>> other_profiles; // first is lower case id for sorting
//for (int i = 0; i < data.size(); ++i) {
for (const auto& item : data) { for (const auto& item : data) {
const std::string& name = item.name; 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(boost::algorithm::to_lower_copy(boost::nowide::widen(name)), item);
} }
std::sort(prusa_profiles.begin(), prusa_profiles.end(), [](ProfilePrintData a, ProfilePrintData b) { std::sort(prusa_profiles.begin(), prusa_profiles.end(), [](ProfilePrintData a, ProfilePrintData b) {
return a.name.get() < b.name.get(); return a.name.get() < b.name.get();
}); });
std::sort(other_profiles.begin(), other_profiles.end(), [](ProfilePrintData a, ProfilePrintData b) { std::sort(other_profiles.begin(), other_profiles.end(), [](const std::pair<std::wstring, ProfilePrintData>& a, const std::pair<std::wstring, ProfilePrintData>& b) {
return a.name.get() < b.name.get(); return a.first < b.first;
}); });
list->Clear(); list->Clear();
for (size_t i = 0; i < prusa_profiles.size(); ++i) { for (size_t i = 0; i < prusa_profiles.size(); ++i) {
@ -1246,8 +1246,8 @@ void PageMaterials::sort_list_data(PresetList* list, const std::vector<ProfilePr
list->Check(i, prusa_profiles[i].checked); list->Check(i, prusa_profiles[i].checked);
} }
for (size_t i = 0; i < other_profiles.size(); ++i) { for (size_t i = 0; i < other_profiles.size(); ++i) {
list->append(std::string(other_profiles[i].name) + (other_profiles[i].omnipresent || template_shown ? "" : " *"), &const_cast<std::string&>(other_profiles[i].name.get())); list->append(std::string(other_profiles[i].second.name) + (other_profiles[i].second.omnipresent || template_shown ? "" : " *"), &const_cast<std::string&>(other_profiles[i].second.name.get()));
list->Check(i + prusa_profiles.size(), other_profiles[i].checked); list->Check(i + prusa_profiles.size(), other_profiles[i].second.checked);
} }
} }
@ -1670,9 +1670,17 @@ PageVendors::PageVendors(ConfigWizard *parent)
auto boldfont = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT); auto boldfont = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
boldfont.SetWeight(wxFONTWEIGHT_BOLD); boldfont.SetWeight(wxFONTWEIGHT_BOLD);
// Copy vendors from bundle map to vector, so we can sort it without case sensitivity
std::vector<std::pair<std::wstring, const VendorProfile*>> vendors;
for (const auto& pair : wizard_p()->bundles) {
vendors.emplace_back(boost::algorithm::to_lower_copy(boost::nowide::widen(pair.second.vendor_profile->name)),pair.second.vendor_profile);
}
std::sort(vendors.begin(), vendors.end(), [](const std::pair<std::wstring, const VendorProfile*>& a, const std::pair<std::wstring, const VendorProfile*>& b) {
return a.first < b.first;
});
for (const auto &pair : wizard_p()->bundles) { for (const std::pair<std::wstring, const VendorProfile*>& v : vendors) {
const VendorProfile *vendor = pair.second.vendor_profile; const VendorProfile* vendor = v.second;
if (vendor->id == PresetBundle::PRUSA_BUNDLE) { continue; } if (vendor->id == PresetBundle::PRUSA_BUNDLE) { continue; }
if (vendor && vendor->templates_profile) if (vendor && vendor->templates_profile)
continue; continue;
@ -1682,8 +1690,8 @@ PageVendors::PageVendors(ConfigWizard *parent)
wizard_p()->on_3rdparty_install(vendor, cbox->IsChecked()); wizard_p()->on_3rdparty_install(vendor, cbox->IsChecked());
}); });
const auto &vendors = appconfig.vendors(); const auto &acvendors = appconfig.vendors();
const bool enabled = vendors.find(pair.first) != vendors.end(); const bool enabled = acvendors.find(vendor->id) != acvendors.end();
if (enabled) { if (enabled) {
cbox->SetValue(true); cbox->SetValue(true);
@ -2316,8 +2324,21 @@ void ConfigWizard::priv::load_pages()
index->add_page(page_msla); index->add_page(page_msla);
if (!only_sla_mode) { if (!only_sla_mode) {
index->add_page(page_vendors); index->add_page(page_vendors);
for (const auto &pages : pages_3rdparty) {
for ( PagePrinters* page : { pages.second.first, pages.second.second }) // Copy pages names from map to vector, so we can sort it without case sensitivity
std::vector<std::pair<std::wstring, std::string>> sorted_vendors;
for (const auto& pages : pages_3rdparty) {
sorted_vendors.emplace_back(boost::algorithm::to_lower_copy(boost::nowide::widen(pages.first)), pages.first);
}
std::sort(sorted_vendors.begin(), sorted_vendors.end(), [](const std::pair<std::wstring, std::string>& a, const std::pair<std::wstring, std::string>& b) {
return a.first < b.first;
});
for (const std::pair<std::wstring, std::string> v : sorted_vendors) {
const auto& pages = pages_3rdparty.find(v.second);
if (pages == pages_3rdparty.end())
continue; // Should not happen
for ( PagePrinters* page : { pages->second.first, pages->second.second })
if (page && page->install) if (page && page->install)
index->add_page(page); index->add_page(page);
} }