viewit/OrcaSlicer-KX
5
2
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

ENH: filament map params switch to global param

Browse Source 
1.Add more filament map modes
2.Filament map and mode are set as project config
3.Plate filament map is only valid when plate filament mode is
manual

jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I33b2f853e0b77b9d605be1f2f1172b44df43da15
(cherry picked from commit e45f8c6dc2146e1e31a1c21e8aaada540af112d0)
This commit is contained in:
xun.zhang
2024-12-19 14:53:42 +08:00
committed by Noisyfox
parent a7956a841d
commit f5a8c96924
20 changed files with 218 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/OrcaSlicer.cpp
View File

@@ -5073,8 +5073,8 @@ int CLI::run(int argc, char **argv)
if (m_extra_config.option<ConfigOptionEnum<FilamentMapMode>>("filament_map_mode"))
mode = m_extra_config.option<ConfigOptionEnum<FilamentMapMode>>("filament_map_mode")->value;
else
mode = part_plate->get_filament_map_mode();
if (mode == FilamentMapMode::fmmAuto) {
mode = part_plate->get_real_filament_map_mode(m_print_config);
if (mode < FilamentMapMode::fmmManual) {
part_plate->set_unprintable_filament_ids(unprintable_filament_vec);
std::vector<int> conflict_filament_vector;
for (int index = 0; index < new_extruder_count; index++)
@@ -5112,7 +5112,7 @@ int CLI::run(int argc, char **argv)
if (m_extra_config.option<ConfigOptionInts>("filament_map"))
filament_maps = m_extra_config.option<ConfigOptionInts>("filament_map")->values;
else
filament_maps = part_plate->get_filament_maps();
filament_maps = part_plate->get_real_filament_maps(m_print_config);
for (int index = 0; index < filament_maps.size(); index++)
{
int filament_extruder = filament_maps[index];
@@ -5138,11 +5138,11 @@ int CLI::run(int argc, char **argv)
new_print_config.apply(*part_plate->config());
new_print_config.apply(m_extra_config, true);
if (new_extruder_count > 1) {
FilamentMapMode map_mode = fmmAuto;
FilamentMapMode map_mode = fmmAutoForFlush;
if (new_print_config.option<ConfigOptionEnum<FilamentMapMode>>("filament_map_mode"))
map_mode = new_print_config.option<ConfigOptionEnum<FilamentMapMode>>("filament_map_mode")->value;
if (map_mode == fmmAuto) {
if (map_mode < fmmManual) {
//set default params for auto map
std::vector<std::string> extruder_ams_count(new_extruder_count, "");
std::vector<std::vector<DynamicPrintConfig>> extruder_filament_info(new_extruder_count, std::vector<DynamicPrintConfig>());