mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-06-12 23:13:32 +00:00
db0ccb1210
- Updated `custom_tool_changes` function to use filament IDs instead of extruder IDs, ensuring better compatibility with mixed filament configurations. - Enhanced `MixedFilament` structure to include a `stable_id` for persistent identity across mixed filament entries, improving remapping during updates. - Introduced new methods for stable ID allocation and normalization in `MixedFilamentManager`. - Updated serialization and loading functions to maintain stable IDs, ensuring consistent behavior when mixed filament entries are modified. - Added tests to verify the correct handling of tool changes and stable ID remapping in mixed filament scenarios.
78 lines
3.0 KiB
C++
78 lines
3.0 KiB
C++
#include "CustomGCode.hpp"
|
|
#include "Config.hpp"
|
|
#include "GCode.hpp"
|
|
#include "GCodeWriter.hpp"
|
|
|
|
namespace Slic3r {
|
|
|
|
namespace CustomGCode {
|
|
|
|
//BBS: useless config and function
|
|
#if 0
|
|
// If loaded configuration has a "colorprint_heights" option (if it was imported from older Slicer),
|
|
// and if CustomGCode::Info.gcodes is empty (there is no color print data available in a new format
|
|
// then CustomGCode::Info.gcodes should be updated considering this option.
|
|
extern void update_custom_gcode_per_print_z_from_config(Info& info, DynamicPrintConfig* config)
|
|
{
|
|
auto *colorprint_heights = config->option<ConfigOptionFloats>("colorprint_heights");
|
|
if (colorprint_heights == nullptr)
|
|
return;
|
|
if (info.gcodes.empty() && ! colorprint_heights->values.empty()) {
|
|
// Convert the old colorprint_heighs only if there is no equivalent data in a new format.
|
|
const std::vector<std::string>& colors = ColorPrintColors::get();
|
|
const auto& colorprint_values = colorprint_heights->values;
|
|
info.gcodes.clear();
|
|
info.gcodes.reserve(colorprint_values.size());
|
|
int i = 0;
|
|
for (auto val : colorprint_values)
|
|
info.gcodes.emplace_back(Item{ val, ColorChange, 1, colors[(++i)%7] });
|
|
|
|
info.mode = SingleExtruder;
|
|
}
|
|
|
|
// The "colorprint_heights" config value has been deprecated. At this point of time it has been converted
|
|
// to a new format and therefore it shall be erased.
|
|
config->erase("colorprint_heights");
|
|
}
|
|
#endif
|
|
|
|
// If information for custom Gcode per print Z was imported from older Slicer, mode will be undefined.
|
|
// So, we should set CustomGCode::Info.mode should be updated considering code values from items.
|
|
extern void check_mode_for_custom_gcode_per_print_z(Info& info)
|
|
{
|
|
if (info.mode != Undef)
|
|
return;
|
|
|
|
bool is_single_extruder = true;
|
|
for (auto item : info.gcodes)
|
|
{
|
|
if (item.type == ToolChange) {
|
|
info.mode = MultiAsSingle;
|
|
return;
|
|
}
|
|
if (item.type == ColorChange && item.extruder > 1)
|
|
is_single_extruder = false;
|
|
}
|
|
|
|
info.mode = is_single_extruder ? SingleExtruder : MultiExtruder;
|
|
}
|
|
|
|
// Return pairs of <print_z, 1-based filament ID> sorted by increasing print_z
|
|
// from custom_gcode_per_print_z.
|
|
std::vector<std::pair<double, unsigned int>> custom_tool_changes(const Info& custom_gcode_per_print_z, size_t num_filaments)
|
|
{
|
|
std::vector<std::pair<double, unsigned int>> custom_tool_changes;
|
|
for (const Item& custom_gcode : custom_gcode_per_print_z.gcodes)
|
|
if (custom_gcode.type == ToolChange) {
|
|
// If available filament slots changed, fall back to filament 1 for
|
|
// stale IDs beyond the current physical+mixed range.
|
|
assert(custom_gcode.extruder >= 0);
|
|
custom_tool_changes.emplace_back(custom_gcode.print_z, static_cast<unsigned int>(size_t(custom_gcode.extruder) > num_filaments ? 1 : custom_gcode.extruder));
|
|
}
|
|
return custom_tool_changes;
|
|
}
|
|
|
|
} // namespace CustomGCode
|
|
|
|
} // namespace Slic3r
|