juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-09-27 10:51:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

added support for multi perimeter patterns, issue 34

Browse Source
This commit is contained in:
Rad
2026-03-12 03:49:38 +01:00
parent 95f6cb2574
commit 9f9aebf957
8 changed files with 482 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/slic3r/GUI/Plater.cpp
+3 -3
View File
@@ -3467,7 +3467,8 @@ void MixedFilamentConfigPanel::build_ui()
wxSize(FromDIP(200), -1), wxTE_PROCESS_ENTER);
m_pattern_ctrl->SetToolTip(_L("Manual repeating pattern. Use 1/2 or A/B for component A/B, "
"and 3..9 for direct physical filament IDs. "
"Example: 1/1/1/1/2/2/2/2 or 1/2/3/4."));
"Use commas to define deeper perimeter patterns, for example 12,21. "
"Example: 1/1/1/1/2/2/2/2, 12,21, or 1/2/3/4."));
pattern_row->Add(m_pattern_ctrl, 1, wxALIGN_CENTER_VERTICAL);
root->Add(pattern_row, 0, wxEXPAND | wxLEFT | wxRIGHT | wxTOP, gap);
@@ -3581,8 +3582,7 @@ void MixedFilamentConfigPanel::build_ui()
if (into_u8(m_pattern_ctrl->GetValue()) != normalized)
m_pattern_ctrl->ChangeValue(from_u8(normalized));
m_mf.manual_pattern = normalized;
const int count_b = int(std::count(normalized.begin(), normalized.end(), '2'));
m_mf.mix_b_percent = std::clamp((100 * count_b + int(normalized.size()) / 2) / std::max(1, int(normalized.size())), 0, 100);
m_mf.mix_b_percent = MixedFilamentManager::mix_percent_from_manual_pattern(normalized);
m_mf.pointillism_all_filaments = false;
m_mf.gradient_component_ids.clear();
m_mf.gradient_component_weights.clear();