juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-19 19:33:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: filament list group problem

Browse Source 
Change-Id: I0ab9590e88336a8f95285df5f346f45eebe8d32a
Jira: STUDIO-12522, STUDIO-12209
(cherry picked from commit efeb19a292a38e2f8a4d117b5bfceddd644e4ce0)
This commit is contained in:
chunmao.guo
2025-07-04 18:38:11 +08:00
committed by Noisyfox
parent 0f83d15962
commit 12725f763c
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -379,7 +379,7 @@ void PresetComboBox::update(std::string select_preset_name)
wxString selected = ""; wxString selected = "";
if (!presets.front().is_visible) if (!presets.front().is_visible)
set_label_marker(Append(L("System presets"), wxNullBitmap, DD_ITEM_STYLE_SPLIT_ITEM)); set_label_marker(Append(_L("System presets"), wxNullBitmap, DD_ITEM_STYLE_SPLIT_ITEM));
for (size_t i = presets.front().is_visible ? 0 : m_collection->num_default_presets(); i < presets.size(); ++i) for (size_t i = presets.front().is_visible ? 0 : m_collection->num_default_presets(); i < presets.size(); ++i)
{ {
@@ -409,11 +409,11 @@ void PresetComboBox::update(std::string select_preset_name)
selected = get_preset_name(preset); selected = get_preset_name(preset);
} }
if (i + 1 == m_collection->num_default_presets()) if (i + 1 == m_collection->num_default_presets())
set_label_marker(Append(L("System presets"), wxNullBitmap, DD_ITEM_STYLE_SPLIT_ITEM)); set_label_marker(Append(_L("System presets"), wxNullBitmap, DD_ITEM_STYLE_SPLIT_ITEM));
} }
if (!nonsys_presets.empty()) if (!nonsys_presets.empty())
{ {
set_label_marker(Append(L("User presets"), wxNullBitmap, DD_ITEM_STYLE_SPLIT_ITEM)); set_label_marker(Append(_L("User presets"), wxNullBitmap, DD_ITEM_STYLE_SPLIT_ITEM));
for (std::map<wxString, std::pair<wxBitmap*, bool>>::iterator it = nonsys_presets.begin(); it != nonsys_presets.end(); ++it) { for (std::map<wxString, std::pair<wxBitmap*, bool>>::iterator it = nonsys_presets.begin(); it != nonsys_presets.end(); ++it) {
int item_id = Append(it->first, *it->second.first); int item_id = Append(it->first, *it->second.first);
bool is_enabled = it->second.second; bool is_enabled = it->second.second;
@@ -424,7 +424,7 @@ void PresetComboBox::update(std::string select_preset_name)
} }
if (!incomp_presets.empty()) if (!incomp_presets.empty())
{ {
set_label_marker(Append(L("Incompatible presets"), wxNullBitmap, DD_ITEM_STYLE_SPLIT_ITEM)); set_label_marker(Append(_L("Incompatible presets"), wxNullBitmap, DD_ITEM_STYLE_SPLIT_ITEM));
for (std::map<wxString, wxBitmap*>::iterator it = incomp_presets.begin(); it != incomp_presets.end(); ++it) { for (std::map<wxString, wxBitmap*>::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->first, *it->second), LABEL_ITEM_DISABLED);
} }
@@ -460,7 +460,7 @@ void PresetComboBox::add_connected_printers(std::string selected, bool alias_nam
if (machine_list.empty()) if (machine_list.empty())
return; return;
set_label_marker(Append(L("My Printer"), wxNullBitmap, DD_ITEM_STYLE_SPLIT_ITEM)); set_label_marker(Append(_L("My Printer"), wxNullBitmap, DD_ITEM_STYLE_SPLIT_ITEM));
m_first_printer_idx = GetCount(); m_first_printer_idx = GetCount();
for (auto iter = machine_list.begin(); iter != machine_list.end(); ++iter) { for (auto iter = machine_list.begin(); iter != machine_list.end(); ++iter) {
Preset* printer_preset = get_printer_preset(iter->second); Preset* printer_preset = get_printer_preset(iter->second);
@@ -490,7 +490,7 @@ bool PresetComboBox::add_ams_filaments(std::string selected, bool alias_name)
bool is_bbl_vendor_preset = m_preset_bundle->is_bbl_vendor(); bool is_bbl_vendor_preset = m_preset_bundle->is_bbl_vendor();
if (is_bbl_vendor_preset && !m_preset_bundle->filament_ams_list.empty()) { if (is_bbl_vendor_preset && !m_preset_bundle->filament_ams_list.empty()) {
bool dual_extruder = (m_preset_bundle->filament_ams_list.begin()->first & 0x10000) == 0; bool dual_extruder = (m_preset_bundle->filament_ams_list.begin()->first & 0x10000) == 0;
set_label_marker(Append(dual_extruder ? L("Left filaments") : L("AMS filaments"), wxNullBitmap, DD_ITEM_STYLE_SPLIT_ITEM)); set_label_marker(Append(dual_extruder ? _L("Left filaments") : _L("AMS filaments"), wxNullBitmap, DD_ITEM_STYLE_SPLIT_ITEM));
m_first_ams_filament = GetCount(); m_first_ams_filament = GetCount();
auto &filaments = m_collection->get_presets(); auto &filaments = m_collection->get_presets();
@@ -505,7 +505,7 @@ bool PresetComboBox::add_ams_filaments(std::string selected, bool alias_name)
for (auto &entry : m_preset_bundle->filament_ams_list) { for (auto &entry : m_preset_bundle->filament_ams_list) {
if (dual_extruder && (entry.first & 0x10000)) { if (dual_extruder && (entry.first & 0x10000)) {
dual_extruder = false; dual_extruder = false;
set_label_marker(Append(L("Right filaments"), wxNullBitmap, DD_ITEM_STYLE_SPLIT_ITEM)); set_label_marker(Append(_L("Right filaments"), wxNullBitmap, DD_ITEM_STYLE_SPLIT_ITEM));
} }
auto & tray = entry.second; auto & tray = entry.second;
std::string filament_id = tray.opt_string("filament_id", 0u); std::string filament_id = tray.opt_string("filament_id", 0u);
@@ -1258,7 +1258,7 @@ void PlaterPresetComboBox::update()
auto add_presets = [this, &preset_descriptions, &filament_orders, &preset_filament_vendors, &first_vendors, &preset_filament_types, &first_types, &selected_in_ams] auto add_presets = [this, &preset_descriptions, &filament_orders, &preset_filament_vendors, &first_vendors, &preset_filament_types, &first_types, &selected_in_ams]
(std::map<wxString, wxBitmap *> const &presets, wxString const &selected, std::string const &group, wxString const &groupName) { (std::map<wxString, wxBitmap *> const &presets, wxString const &selected, std::string const &group, wxString const &groupName) {
if (!presets.empty()) { if (!presets.empty()) {
set_label_marker(Append(group, wxNullBitmap, DD_ITEM_STYLE_SPLIT_ITEM)); set_label_marker(Append(_L(group), wxNullBitmap, DD_ITEM_STYLE_SPLIT_ITEM));
if (m_type == Preset::TYPE_FILAMENT) { if (m_type == Preset::TYPE_FILAMENT) {
std::vector<std::map<wxString, wxBitmap *>::value_type const*> list(presets.size(), nullptr); std::vector<std::map<wxString, wxBitmap *>::value_type const*> list(presets.size(), nullptr);
std::transform(presets.begin(), presets.end(), list.begin(), [](auto & pair) { return &pair; }); std::transform(presets.begin(), presets.end(), list.begin(), [](auto & pair) { return &pair; });
@@ -1314,11 +1314,11 @@ void PlaterPresetComboBox::update()
}; };
//BBS: add project embedded preset logic //BBS: add project embedded preset logic
add_presets(project_embedded_presets, selected_user_preset, L("Project-inside presets"), _L("Project")); add_presets(project_embedded_presets, selected_user_preset, L("Project-inside presets"), _L("Project") + " ");
add_presets(nonsys_presets, selected_user_preset, L("User presets"), _L("Custom")); add_presets(nonsys_presets, selected_user_preset, L("User presets"), _L("Custom") + " ");
// BBS: move system to the end // BBS: move system to the end
add_presets(system_presets, selected_system_preset, L("System presets"), _L("System")); add_presets(system_presets, selected_system_preset, L("System presets"), _L("System"));
add_presets(uncompatible_presets, {}, L("Unsupported presets"), _L("Unsupported")); add_presets(uncompatible_presets, {}, L("Unsupported presets"), _L("Unsupported") + " ");
//BBS: remove unused pysical printer logic //BBS: remove unused pysical printer logic
/*if (m_type == Preset::TYPE_PRINTER) /*if (m_type == Preset::TYPE_PRINTER)
@@ -1617,7 +1617,7 @@ void TabPresetComboBox::update()
//BBS: add project embedded preset logic //BBS: add project embedded preset logic
if (!project_embedded_presets.empty()) if (!project_embedded_presets.empty())
{ {
set_label_marker(Append(L("Project-inside presets"), wxNullBitmap, DD_ITEM_STYLE_SPLIT_ITEM)); set_label_marker(Append(_L("Project-inside presets"), wxNullBitmap, DD_ITEM_STYLE_SPLIT_ITEM));
for (std::map<wxString, std::pair<wxBitmap*, bool>>::iterator it = project_embedded_presets.begin(); it != project_embedded_presets.end(); ++it) { for (std::map<wxString, std::pair<wxBitmap*, bool>>::iterator it = project_embedded_presets.begin(); it != project_embedded_presets.end(); ++it) {
int item_id = Append(it->first, *it->second.first); int item_id = Append(it->first, *it->second.first);
SetItemTooltip(item_id, preset_descriptions[it->first]); SetItemTooltip(item_id, preset_descriptions[it->first]);
@@ -1629,7 +1629,7 @@ void TabPresetComboBox::update()
} }
if (!nonsys_presets.empty()) if (!nonsys_presets.empty())
{ {
set_label_marker(Append(L("User presets"), wxNullBitmap, DD_ITEM_STYLE_SPLIT_ITEM)); set_label_marker(Append(_L("User presets"), wxNullBitmap, DD_ITEM_STYLE_SPLIT_ITEM));
for (std::map<wxString, std::pair<wxBitmap*, bool>>::iterator it = nonsys_presets.begin(); it != nonsys_presets.end(); ++it) { for (std::map<wxString, std::pair<wxBitmap*, bool>>::iterator it = nonsys_presets.begin(); it != nonsys_presets.end(); ++it) {
int item_id = Append(it->first, *it->second.first); int item_id = Append(it->first, *it->second.first);
SetItemTooltip(item_id, preset_descriptions[it->first]); SetItemTooltip(item_id, preset_descriptions[it->first]);
@@ -1642,7 +1642,7 @@ void TabPresetComboBox::update()
//BBS: move system to the end //BBS: move system to the end
if (!system_presets.empty()) if (!system_presets.empty())
{ {
set_label_marker(Append(L("System presets"), wxNullBitmap, DD_ITEM_STYLE_SPLIT_ITEM)); set_label_marker(Append(_L("System presets"), wxNullBitmap, DD_ITEM_STYLE_SPLIT_ITEM));
for (std::map<wxString, std::pair<wxBitmap*, bool>>::iterator it = system_presets.begin(); it != system_presets.end(); ++it) { for (std::map<wxString, std::pair<wxBitmap*, bool>>::iterator it = system_presets.begin(); it != system_presets.end(); ++it) {
int item_id = Append(it->first, *it->second.first); int item_id = Append(it->first, *it->second.first);
SetItemTooltip(item_id, preset_descriptions[it->first]); SetItemTooltip(item_id, preset_descriptions[it->first]);
@@ -1875,7 +1875,7 @@ void GUI::CalibrateFilamentComboBox::update()
if (!m_nonsys_presets.empty()) if (!m_nonsys_presets.empty())
{ {
set_label_marker(Append(L("User presets"), wxNullBitmap, DD_ITEM_STYLE_SPLIT_ITEM)); set_label_marker(Append(_L("User presets"), wxNullBitmap, DD_ITEM_STYLE_SPLIT_ITEM));
for (auto it = m_nonsys_presets.begin(); it != m_nonsys_presets.end(); ++it) { for (auto it = m_nonsys_presets.begin(); it != m_nonsys_presets.end(); ++it) {
Append(it->first, *(it->second.second)); Append(it->first, *(it->second.second));
validate_selection(it->first == selected_preset); validate_selection(it->first == selected_preset);
@@ -1883,7 +1883,7 @@ void GUI::CalibrateFilamentComboBox::update()
} }
if (!m_system_presets.empty()) if (!m_system_presets.empty())
{ {
set_label_marker(Append(L("System presets"), wxNullBitmap, DD_ITEM_STYLE_SPLIT_ITEM)); set_label_marker(Append(_L("System presets"), wxNullBitmap, DD_ITEM_STYLE_SPLIT_ITEM));
for (auto it = m_system_presets.begin(); it != m_system_presets.end(); ++it) { for (auto it = m_system_presets.begin(); it != m_system_presets.end(); ++it) {
Append(it->first, *(it->second.second)); Append(it->first, *(it->second.second));
validate_selection(it->first == selected_preset); validate_selection(it->first == selected_preset);

4
src/slic3r/GUI/Widgets/DropDown.cpp
View File

@@ -389,7 +389,7 @@ void DropDown::render(wxDC &dc)
} }
auto text = group.IsEmpty() auto text = group.IsEmpty()
? (item.group.IsEmpty() ? item.text : item.group) ? (item.group.IsEmpty() ? item.text : item.group)
: (item.text.StartsWith(group) ? item.text.substr(group.size()).Trim(false) : item.text); : (item.text.StartsWith(group) && !group.EndsWith(' ') ? item.text.substr(group.size()).Trim(false) : item.text);
if (!text_off && !text.IsEmpty()) { if (!text_off && !text.IsEmpty()) {
wxSize tSize = dc.GetMultiLineTextExtent(text); wxSize tSize = dc.GetMultiLineTextExtent(text);
if (pt.x + tSize.x > rcContent.GetRight()) { if (pt.x + tSize.x > rcContent.GetRight()) {
@@ -501,7 +501,7 @@ void DropDown::messureSize()
if (!text_off) { if (!text_off) {
auto text = group.IsEmpty() auto text = group.IsEmpty()
? (item.group.IsEmpty() ? item.text : item.group) ? (item.group.IsEmpty() ? item.text : item.group)
: (item.text.StartsWith(group) ? item.text.substr(group.size()).Trim(false) : item.text); : (item.text.StartsWith(group) && !group.EndsWith(' ') ? item.text.substr(group.size()).Trim(false) : item.text);
size1 = dc.GetMultiLineTextExtent(text); size1 = dc.GetMultiLineTextExtent(text);
if (group.IsEmpty() && !item.group.IsEmpty()) if (group.IsEmpty() && !item.group.IsEmpty())
size1.x += 5 + arrow_bitmap.GetBmpWidth(); size1.x += 5 + arrow_bitmap.GetBmpWidth();