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

Merge branch 'dk_wizard_sort'

Browse Source
This commit is contained in:
David Kocik 2023-06-02 12:39:12 +02:00
commit 7713071e1e
2 changed files with 230 additions and 94 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);
} }

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

@ -246,8 +246,15 @@ void PresetComboBox::update(std::string select_preset_name)
const std::deque<Preset>& presets = m_collection->get_presets(); const std::deque<Preset>& presets = m_collection->get_presets();
std::map<wxString, std::pair<wxBitmapBundle*, bool>> nonsys_presets; struct PresetData {
std::map<wxString, wxBitmapBundle*> incomp_presets; wxString name;
wxString lower_name;
wxBitmapBundle* bitmap;
bool enabled; // not used in incomp_presets
};
std::vector<PresetData> system_presets;
std::vector<PresetData> nonsys_presets;
std::vector<PresetData> incomp_presets;
wxString selected = ""; wxString selected = "";
if (!presets.front().is_visible) if (!presets.front().is_visible)
@ -276,28 +283,31 @@ void PresetComboBox::update(std::string select_preset_name)
assert(bmp); assert(bmp);
if (!is_enabled) { if (!is_enabled) {
incomp_presets.emplace(get_preset_name(preset), bmp); incomp_presets.push_back({get_preset_name(preset), get_preset_name(preset).Lower(), bmp, false});
if (preset.is_dirty && m_show_modif_preset_separately) if (preset.is_dirty && m_show_modif_preset_separately)
incomp_presets.emplace(get_preset_name_with_suffix(preset), bmp); incomp_presets.push_back({get_preset_name_with_suffix(preset), get_preset_name_with_suffix(preset).Lower(), bmp, false});
} }
else if (preset.is_default || preset.is_system) else if (preset.is_default || preset.is_system)
{ {
Append(get_preset_name(preset), *bmp); system_presets.push_back({get_preset_name(preset), get_preset_name(preset).Lower(), bmp, is_enabled});
validate_selection(preset.name == select_preset_name); if (preset.name == select_preset_name)
selected = preset.name;
if (preset.is_dirty && m_show_modif_preset_separately) { if (preset.is_dirty && m_show_modif_preset_separately) {
wxString preset_name = get_preset_name_with_suffix(preset); wxString preset_name = get_preset_name_with_suffix(preset);
Append(preset_name, *bmp); system_presets.push_back({preset_name, preset_name.Lower(), bmp, is_enabled});
validate_selection(into_u8(preset_name) == select_preset_name); if (into_u8(preset_name) == select_preset_name)
selected = preset_name;
} }
} }
else else
{ {
nonsys_presets.emplace(get_preset_name(preset), std::pair<wxBitmapBundle*, bool>(bmp, is_enabled)); nonsys_presets.push_back({get_preset_name(preset), get_preset_name(preset).Lower(), bmp, is_enabled});
if (preset.name == select_preset_name || (select_preset_name.empty() && is_enabled)) if (preset.name == select_preset_name || (select_preset_name.empty() && is_enabled))
selected = get_preset_name(preset); selected = get_preset_name(preset);
if (preset.is_dirty && m_show_modif_preset_separately) { if (preset.is_dirty && m_show_modif_preset_separately) {
wxString preset_name = get_preset_name_with_suffix(preset); wxString preset_name = get_preset_name_with_suffix(preset);
nonsys_presets.emplace(preset_name, std::pair<wxBitmapBundle*, bool>(bmp, is_enabled)); nonsys_presets.push_back({preset_name, preset_name.Lower(), bmp, is_enabled});
if (preset_name == select_preset_name || (select_preset_name.empty() && is_enabled)) if (preset_name == select_preset_name || (select_preset_name.empty() && is_enabled))
selected = preset_name; selected = preset_name;
} }
@ -305,22 +315,43 @@ void PresetComboBox::update(std::string select_preset_name)
if (i + 1 == m_collection->num_default_presets()) if (i + 1 == m_collection->num_default_presets())
set_label_marker(Append(separator(L("System presets")), NullBitmapBndl())); set_label_marker(Append(separator(L("System presets")), NullBitmapBndl()));
} }
if (!system_presets.empty())
{
std::sort(system_presets.begin(), system_presets.end(), [](const PresetData& a, const PresetData& b) {
return a.lower_name < b.lower_name;
});
for (std::vector<PresetData>::iterator it = system_presets.begin(); it != system_presets.end(); ++it) {
int item_id = Append(it->name, *it->bitmap);
if (!it->enabled)
set_label_marker(item_id, LABEL_ITEM_DISABLED);
validate_selection(it->name == selected);
}
}
if (!nonsys_presets.empty()) if (!nonsys_presets.empty())
{ {
std::sort(nonsys_presets.begin(), nonsys_presets.end(), [](const PresetData& a, const PresetData& b) {
return a.lower_name < b.lower_name;
});
set_label_marker(Append(separator(L("User presets")), NullBitmapBndl())); set_label_marker(Append(separator(L("User presets")), NullBitmapBndl()));
for (std::map<wxString, std::pair<wxBitmapBundle*, bool>>::iterator it = nonsys_presets.begin(); it != nonsys_presets.end(); ++it) { for (std::vector<PresetData>::iterator it = nonsys_presets.begin(); it != nonsys_presets.end(); ++it) {
int item_id = Append(it->first, *it->second.first); int item_id = Append(it->name, *it->bitmap);
bool is_enabled = it->second.second; if (!it->enabled)
if (!is_enabled)
set_label_marker(item_id, LABEL_ITEM_DISABLED); set_label_marker(item_id, LABEL_ITEM_DISABLED);
validate_selection(it->first == selected); validate_selection(it->name == selected);
} }
} }
if (!incomp_presets.empty()) if (!incomp_presets.empty())
{ {
std::sort(incomp_presets.begin(), incomp_presets.end(), [](const PresetData& a, const PresetData& b) {
return a.lower_name < b.lower_name;
});
set_label_marker(Append(separator(L("Incompatible presets")), NullBitmapBndl())); set_label_marker(Append(separator(L("Incompatible presets")), NullBitmapBndl()));
for (std::map<wxString, wxBitmapBundle*>::iterator it = incomp_presets.begin(); it != incomp_presets.end(); ++it) { for (std::vector<PresetData> ::iterator it = incomp_presets.begin(); it != incomp_presets.end(); ++it) {
set_label_marker(Append(it->first, *it->second), LABEL_ITEM_DISABLED); set_label_marker(Append(it->name, *it->bitmap), LABEL_ITEM_DISABLED);
} }
} }
@ -833,8 +864,14 @@ void PlaterPresetComboBox::update()
null_icon_width = (wide_icons ? 3 : 2) * norm_icon_width + thin_space_icon_width + wide_space_icon_width; null_icon_width = (wide_icons ? 3 : 2) * norm_icon_width + thin_space_icon_width + wide_space_icon_width;
std::map<wxString, wxBitmapBundle*> nonsys_presets; struct PresetData {
std::map<wxString, wxBitmapBundle*> template_presets; wxString name;
wxString lower_name;
wxBitmapBundle* bitmap;
};
std::vector<PresetData> system_presets;
std::vector<PresetData> nonsys_presets;
std::vector<PresetData> template_presets;
const bool allow_templates = !wxGetApp().app_config->get_bool("no_templates"); const bool allow_templates = !wxGetApp().app_config->get_bool("no_templates");
@ -888,22 +925,23 @@ void PlaterPresetComboBox::update()
if (preset.is_default || preset.is_system) { if (preset.is_default || preset.is_system) {
if (preset.vendor && preset.vendor->templates_profile) { if (preset.vendor && preset.vendor->templates_profile) {
if (allow_templates) { if (allow_templates) {
template_presets.emplace(get_preset_name(preset), bmp); template_presets.push_back({get_preset_name(preset), get_preset_name(preset).Lower(), bmp});
if (is_selected) { if (is_selected) {
selected_user_preset = get_preset_name(preset); selected_user_preset = get_preset_name(preset);
tooltip = from_u8(preset.name); tooltip = from_u8(preset.name);
} }
} }
} else { } else {
Append(get_preset_name(preset), *bmp); system_presets.push_back({ get_preset_name(preset), get_preset_name(preset).Lower(), bmp });
validate_selection(is_selected); if (is_selected) {
if (is_selected) selected_user_preset = get_preset_name(preset);
tooltip = from_u8(preset.name); tooltip = from_u8(preset.name);
}
} }
} }
else else
{ {
nonsys_presets.emplace(get_preset_name(preset), bmp); nonsys_presets.push_back({ get_preset_name(preset), get_preset_name(preset).Lower(), bmp });
if (is_selected) { if (is_selected) {
selected_user_preset = get_preset_name(preset); selected_user_preset = get_preset_name(preset);
tooltip = from_u8(preset.name); tooltip = from_u8(preset.name);
@ -913,21 +951,40 @@ void PlaterPresetComboBox::update()
set_label_marker(Append(separator(L("System presets")), NullBitmapBndl())); set_label_marker(Append(separator(L("System presets")), NullBitmapBndl()));
} }
if(!system_presets.empty())
{
std::sort(system_presets.begin(), system_presets.end(), [](const PresetData& a, const PresetData& b) {
return a.lower_name < b.lower_name;
});
for (std::vector<PresetData>::iterator it = system_presets.begin(); it != system_presets.end(); ++it) {
Append(it->name, *it->bitmap);
validate_selection(it->name == selected_user_preset);
}
}
if (!nonsys_presets.empty()) if (!nonsys_presets.empty())
{ {
std::sort(nonsys_presets.begin(), nonsys_presets.end(), [](const PresetData& a, const PresetData& b) {
return a.lower_name < b.lower_name;
});
set_label_marker(Append(separator(L("User presets")), NullBitmapBndl())); set_label_marker(Append(separator(L("User presets")), NullBitmapBndl()));
for (std::map<wxString, wxBitmapBundle*>::iterator it = nonsys_presets.begin(); it != nonsys_presets.end(); ++it) { for (std::vector<PresetData>::iterator it = nonsys_presets.begin(); it != nonsys_presets.end(); ++it) {
Append(it->first, *it->second); Append(it->name, *it->bitmap);
validate_selection(it->first == selected_user_preset); validate_selection(it->name == selected_user_preset);
} }
} }
if (!template_presets.empty()) { if (!template_presets.empty()) {
std::sort(template_presets.begin(), template_presets.end(), [](const PresetData& a, const PresetData& b) {
return a.lower_name < b.lower_name;
});
set_label_marker(Append(separator(L("Template presets")), wxNullBitmap)); set_label_marker(Append(separator(L("Template presets")), wxNullBitmap));
for (std::map<wxString, wxBitmapBundle*>::iterator it = template_presets.begin(); it != template_presets.end(); ++it) { for (std::vector<PresetData>::iterator it = template_presets.begin(); it != template_presets.end(); ++it) {
Append(it->first, *it->second); Append(it->name, *it->bitmap);
validate_selection(it->first == selected_user_preset); validate_selection(it->name == selected_user_preset);
} }
} }
@ -938,19 +995,37 @@ void PlaterPresetComboBox::update()
set_label_marker(Append(separator(L("Physical printers")), NullBitmapBndl())); set_label_marker(Append(separator(L("Physical printers")), NullBitmapBndl()));
const PhysicalPrinterCollection& ph_printers = m_preset_bundle->physical_printers; const PhysicalPrinterCollection& ph_printers = m_preset_bundle->physical_printers;
// Sort Physical printers in preset_data vector and than Append it in correct order
struct PhysicalPrinterPresetData
{
wxString lower_name; // just for sorting
std::string name; // preset_name
std::string fullname; // full name
bool selected; // is selected
};
std::vector<PhysicalPrinterPresetData> preset_data;
for (PhysicalPrinterCollection::ConstIterator it = ph_printers.begin(); it != ph_printers.end(); ++it) { for (PhysicalPrinterCollection::ConstIterator it = ph_printers.begin(); it != ph_printers.end(); ++it) {
for (const std::string& preset_name : it->get_preset_names()) { for (const std::string& preset_name : it->get_preset_names()) {
Preset* preset = m_collection->find_preset(preset_name); preset_data.push_back({ wxString::FromUTF8(it->get_full_name(preset_name)).Lower(), preset_name, it->get_full_name(preset_name), ph_printers.is_selected(it, preset_name) });
if (!preset || !preset->is_visible)
continue;
std::string main_icon_name, bitmap_key = main_icon_name = preset->printer_technology() == ptSLA ? "sla_printer" : m_main_bitmap_name;
auto bmp = get_bmp(main_icon_name, wide_icons, main_icon_name);
assert(bmp);
set_label_marker(Append(from_u8(it->get_full_name(preset_name) + suffix(preset)), *bmp), LABEL_ITEM_PHYSICAL_PRINTER);
validate_selection(ph_printers.is_selected(it, preset_name));
} }
} }
std::sort(preset_data.begin(), preset_data.end(), [](const PhysicalPrinterPresetData& a, const PhysicalPrinterPresetData& b) {
return a.lower_name < b.lower_name;
});
for (const PhysicalPrinterPresetData& data : preset_data)
{
Preset* preset = m_collection->find_preset(data.name);
if (!preset || !preset->is_visible)
continue;
std::string main_icon_name = preset->printer_technology() == ptSLA ? "sla_printer" : m_main_bitmap_name;
auto bmp = get_bmp(main_icon_name, main_icon_name, "", true, true, false);
assert(bmp);
set_label_marker(Append(from_u8(data.fullname + suffix(preset)), *bmp), LABEL_ITEM_PHYSICAL_PRINTER);
validate_selection(data.selected);
}
} }
} }
@ -1070,11 +1145,17 @@ void TabPresetComboBox::update()
const std::deque<Preset>& presets = m_collection->get_presets(); const std::deque<Preset>& presets = m_collection->get_presets();
std::map<wxString, std::pair<wxBitmapBundle*, bool>> nonsys_presets; struct PresetData {
std::map<wxString, std::pair<wxBitmapBundle*, bool>> template_presets; wxString name;
wxString lower_name;
wxBitmapBundle* bitmap;
bool enabled;
};
std::vector<PresetData> system_presets;
std::vector<PresetData> nonsys_presets;
std::vector<PresetData> template_presets;
const bool allow_templates = !wxGetApp().app_config->get_bool("no_templates"); const bool allow_templates = !wxGetApp().app_config->get_bool("no_templates");
wxString selected = ""; wxString selected = "";
if (!presets.front().is_visible) if (!presets.front().is_visible)
set_label_marker(Append(separator(L("System presets")), NullBitmapBndl())); set_label_marker(Append(separator(L("System presets")), NullBitmapBndl()));
@ -1113,23 +1194,20 @@ void TabPresetComboBox::update()
if (preset.is_default || preset.is_system) { if (preset.is_default || preset.is_system) {
if (preset.vendor && preset.vendor->templates_profile) { if (preset.vendor && preset.vendor->templates_profile) {
if (allow_templates) { if (allow_templates) {
template_presets.emplace(get_preset_name(preset), std::pair<wxBitmapBundle*, bool>(bmp, is_enabled)); template_presets.push_back({get_preset_name(preset), get_preset_name(preset).Lower(), bmp, is_enabled});
if (i == idx_selected) if (i == idx_selected)
selected = get_preset_name(preset); selected = get_preset_name(preset);
} }
} else { } else {
int item_id = Append(get_preset_name(preset), *bmp); system_presets.push_back({get_preset_name(preset), get_preset_name(preset).Lower(), bmp, is_enabled});
if (!is_enabled) if (i == idx_selected)
set_label_marker(item_id, LABEL_ITEM_DISABLED); selected = get_preset_name(preset);
validate_selection(i == idx_selected);
} }
} }
else else
{ {
std::pair<wxBitmapBundle*, bool> pair(bmp, is_enabled); std::pair<wxBitmapBundle*, bool> pair(bmp, is_enabled);
nonsys_presets.emplace(get_preset_name(preset), std::pair<wxBitmapBundle*, bool>(bmp, is_enabled)); nonsys_presets.push_back({get_preset_name(preset), get_preset_name(preset).Lower(), bmp, is_enabled});
if (i == idx_selected) if (i == idx_selected)
selected = get_preset_name(preset); selected = get_preset_name(preset);
} }
@ -1137,26 +1215,47 @@ void TabPresetComboBox::update()
set_label_marker(Append(separator(L("System presets")), NullBitmapBndl())); set_label_marker(Append(separator(L("System presets")), NullBitmapBndl()));
} }
if (!nonsys_presets.empty()) if (!system_presets.empty())
{ {
set_label_marker(Append(separator(L("User presets")), NullBitmapBndl())); std::sort(system_presets.begin(), system_presets.end(), [](const PresetData& a, const PresetData& b) {
for (std::map<wxString, std::pair<wxBitmapBundle*, bool>>::iterator it = nonsys_presets.begin(); it != nonsys_presets.end(); ++it) { return a.lower_name < b.lower_name;
int item_id = Append(it->first, *it->second.first); });
bool is_enabled = it->second.second;
if (!is_enabled) for (std::vector<PresetData>::iterator it = system_presets.begin(); it != system_presets.end(); ++it) {
int item_id = Append(it->name, *it->bitmap);
if (!it->enabled)
set_label_marker(item_id, LABEL_ITEM_DISABLED); set_label_marker(item_id, LABEL_ITEM_DISABLED);
validate_selection(it->first == selected); validate_selection(it->name == selected);
} }
} }
if (!template_presets.empty()) { if (!nonsys_presets.empty())
set_label_marker(Append(separator(L("Template presets")), wxNullBitmap)); {
for (std::map<wxString, std::pair<wxBitmapBundle*, bool>>::iterator it = template_presets.begin(); it != template_presets.end(); ++it) { std::sort(nonsys_presets.begin(), nonsys_presets.end(), [](const PresetData& a, const PresetData& b) {
int item_id = Append(it->first, *it->second.first); return a.lower_name < b.lower_name;
bool is_enabled = it->second.second; });
if (!is_enabled)
set_label_marker(Append(separator(L("User presets")), NullBitmapBndl()));
for (std::vector<PresetData>::iterator it = nonsys_presets.begin(); it != nonsys_presets.end(); ++it) {
int item_id = Append(it->name, *it->bitmap);
if (!it->enabled)
set_label_marker(item_id, LABEL_ITEM_DISABLED); set_label_marker(item_id, LABEL_ITEM_DISABLED);
validate_selection(it->first == selected); validate_selection(it->name == selected);
}
}
if (!template_presets.empty())
{
std::sort(template_presets.begin(), template_presets.end(), [](const PresetData& a, const PresetData& b) {
return a.lower_name < b.lower_name;
});
set_label_marker(Append(separator(L("Template presets")), wxNullBitmap));
for (std::vector<PresetData>::iterator it = template_presets.begin(); it != template_presets.end(); ++it) {
int item_id = Append(it->name, *it->bitmap);
if (!it->enabled)
set_label_marker(item_id, LABEL_ITEM_DISABLED);
validate_selection(it->name == selected);
} }
} }
@ -1167,20 +1266,36 @@ void TabPresetComboBox::update()
set_label_marker(Append(separator(L("Physical printers")), NullBitmapBndl())); set_label_marker(Append(separator(L("Physical printers")), NullBitmapBndl()));
const PhysicalPrinterCollection& ph_printers = m_preset_bundle->physical_printers; const PhysicalPrinterCollection& ph_printers = m_preset_bundle->physical_printers;
// Sort Physical printers in preset_data vector and than Append it in correct order
struct PhysicalPrinterPresetData
{
wxString lower_name; // just for sorting
std::string name; // preset_name
std::string fullname; // full name
bool selected; // is selected
};
std::vector<PhysicalPrinterPresetData> preset_data;
for (PhysicalPrinterCollection::ConstIterator it = ph_printers.begin(); it != ph_printers.end(); ++it) { for (PhysicalPrinterCollection::ConstIterator it = ph_printers.begin(); it != ph_printers.end(); ++it) {
for (const std::string& preset_name : it->get_preset_names()) { for (const std::string& preset_name : it->get_preset_names()) {
Preset* preset = m_collection->find_preset(preset_name); preset_data.push_back({wxString::FromUTF8(it->get_full_name(preset_name)).Lower(), preset_name, it->get_full_name(preset_name), ph_printers.is_selected(it, preset_name)});
if (!preset || !preset->is_visible)
continue;
std::string main_icon_name = preset->printer_technology() == ptSLA ? "sla_printer" : m_main_bitmap_name;
auto bmp = get_bmp(main_icon_name, main_icon_name, "", true, true, false);
assert(bmp);
set_label_marker(Append(from_u8(it->get_full_name(preset_name) + suffix(preset)), *bmp), LABEL_ITEM_PHYSICAL_PRINTER);
validate_selection(ph_printers.is_selected(it, preset_name));
} }
} }
std::sort(preset_data.begin(), preset_data.end(), [](const PhysicalPrinterPresetData& a, const PhysicalPrinterPresetData& b) {
return a.lower_name < b.lower_name;
});
for (const PhysicalPrinterPresetData& data : preset_data)
{
Preset* preset = m_collection->find_preset(data.name);
if (!preset || !preset->is_visible)
continue;
std::string main_icon_name = preset->printer_technology() == ptSLA ? "sla_printer" : m_main_bitmap_name;
auto bmp = get_bmp(main_icon_name, main_icon_name, "", true, true, false);
assert(bmp);
set_label_marker(Append(from_u8(data.fullname + suffix(preset)), *bmp), LABEL_ITEM_PHYSICAL_PRINTER);
validate_selection(data.selected);
}
} }
// add "Add/Remove printers" item // add "Add/Remove printers" item