mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-10-06 07:11:10 +00:00
HanifKoh
8a6377f087
* Add Missing Includes Across src/libslic3r Every libslic3r source and header now directly includes the headers declaring what it uses, rather than relying on the precompiled header or transitive includes. Generated with clang-tidy misc-include-cleaner, with libslic3r headers spelled libslic3r/... so they resolve outside the library's private include paths. MultiMaterialSegmentation.hpp, Support/SupportParameters.hpp and Format/STEP.hpp are made self-contained by hand. * Make the libslic3r Headers Compile on Their Own Each now includes, or forward-declares, what it uses instead of relying on what its includers happened to include first. Left out: I18N.hpp, which errors on purpose when included from GUI code, and VoxelizeCSGMesh.hpp and SLA/bicubic.h, which nothing includes and which no longer compile at all. * Add the Includes Missing From the Hand-Fixed libslic3r Headers clang-tidy would not edit these headers while they failed to compile on their own, so the first pass skipped them. With the headers now self-contained, a second pass adds the rest. * Keep Windows Setup Ahead of the Added libslic3r Includes Print.cpp and Thread.cpp open with a _WIN32 block that has to come first; without the precompiled header, Print.cpp otherwise reaches windows.h through OCCT with NONLS defined and boost/regex fails. OpenVDBUtils.cpp and SLA/SupportTreeBuilder.cpp had includes inside #ifndef NOMINMAX, which libslic3r defines on Windows, so those were skipped there. .clang-tidy also ignores the MSVC STL and UCRT internals, Boost.Multiprecision's fwd.hpp and CPython's Windows include directory. * Re-Add libslic3r Includes After the Clipper2 2.0.1 Migration Rebasing onto main took main's version of the files the Clipper2 migration rewrote, so their added includes are restored here, along with includes for main's new code. Clipper2's individual headers are now ignored by clang-tidy: they only build the Z variant through clipper2_z.hpp, which defines USINGZ first, so including clipper.core.h and the like directly broke ClipperZUtils.cpp.
81 lines
3.1 KiB
C++
81 lines
3.1 KiB
C++
#include "CustomGCode.hpp"
|
|
#include "Config.hpp"
|
|
#include "GCode.hpp"
|
|
#include "GCodeWriter.hpp"
|
|
#include <vector>
|
|
#include <utility>
|
|
#include <cstddef>
|
|
#include <cassert>
|
|
|
|
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 extruder ID> sorted by increasing print_z from custom_gcode_per_print_z.
|
|
// print_z corresponds to the first layer printed with the new extruder.
|
|
std::vector<std::pair<double, unsigned int>> custom_tool_changes(const Info& custom_gcode_per_print_z, size_t num_extruders)
|
|
{
|
|
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 extruder count in PrinterSettings was changed, use default (0) extruder for extruders, more than num_extruders
|
|
assert(custom_gcode.extruder >= 0);
|
|
custom_tool_changes.emplace_back(custom_gcode.print_z, static_cast<unsigned int>(size_t(custom_gcode.extruder) > num_extruders ? 1 : custom_gcode.extruder));
|
|
}
|
|
return custom_tool_changes;
|
|
}
|
|
|
|
} // namespace CustomGCode
|
|
|
|
} // namespace Slic3r
|