Merge branch 'main' into fix/clang-cl-windows-support

2026-09-16 21:42:43 +00:00 · 2026-08-19 03:14:10 +08:00
parent e840187edc 4fd7fdb3fa
commit 050ebbb1f4
2079 changed files with 2520552 additions and 1277267 deletions
@@ -1,12 +1,32 @@
+// This single-TU executable links libslic3r, whose SVG/emboss objects (pulled in by the slice mode
+// below) reference the header-only nanosvg implementation. Provide it here BEFORE any libslic3r header:
+// several of them transitively include nanosvg.h without the implementation macro, and its include
+// guard would then suppress the implementation if the macro were defined afterwards. Same pattern as
+// the test mains.
+#define NANOSVG_IMPLEMENTATION
+#include "nanosvg/nanosvg.h"
+#define NANOSVGRAST_IMPLEMENTATION
+#include "nanosvg/nanosvgrast.h"
+
 #include "libslic3r/GCode.hpp"
 #include "libslic3r/Preset.hpp"
 #include "libslic3r/Config.hpp"
 #include "libslic3r/PresetBundle.hpp"
 #include "libslic3r/Print.hpp"
+#include "libslic3r/Model.hpp"
+#include "libslic3r/TriangleMesh.hpp"
 #include "libslic3r/Utils.hpp"
 #include <boost/filesystem/operations.hpp>
 #include <boost/log/trivial.hpp>
+#include <boost/log/core.hpp>
+#include <boost/log/expressions.hpp>
+#include <boost/log/sinks/sync_frontend.hpp>
+#include <boost/log/sinks/text_ostream_backend.hpp>
+#include <boost/core/null_deleter.hpp>
+#include <boost/make_shared.hpp>
 #include <boost/program_options.hpp>
+#include <algorithm>
+#include <fstream>
 #include <iostream>
 #include <string>

@@ -83,6 +103,270 @@ void generate_custom_presets(PresetBundle* preset_bundle, AppConfig& app_config)

    std::cout << "Custom presets generated successfully" << std::endl;
 }
+
+namespace {
+
+Vec2d printable_area_center(const DynamicPrintConfig &cfg)
+{
+    const auto *opt = cfg.option<ConfigOptionPoints>("printable_area");
+    if (opt == nullptr || opt->values.empty())
+        return Vec2d(100., 100.);
+    Vec2d lo = opt->values.front(), hi = opt->values.front();
+    for (const Vec2d &p : opt->values) { lo = lo.cwiseMin(p); hi = hi.cwiseMax(p); }
+    return 0.5 * (lo + hi);
+}
+
+// Slice one centered cube that switches from filament 1 to filament 2 partway up, so exactly one
+// filament change fires, then export. The change drives the printer's own change_filament_gcode: on a
+// single-nozzle machine it rides the AMS prime tower (append_tcr), on a multi-nozzle machine it routes
+// through the nozzle swap (set_extruder / append_tcr2) - the engine picks the path from the printer's
+// topology, so one model covers both. An undefined placeholder in any shipped custom g-code throws
+// Slic3r::PlaceholderParserError from export.
+std::string slice_two_color_cube_and_export(const DynamicPrintConfig &cfg, bool is_bbl)
+{
+    const Vec2d center = printable_area_center(cfg);
+    TriangleMesh m = make_cube(10, 10, 10);
+    m.translate(float(center.x() - 5.), float(center.y() - 5.), 0.f);
+
+    Model  model;
+    Print  print;
+    ModelObject *obj = model.add_object();
+    obj->name = "cube"; // populates [input_filename_base] the way a loaded model does
+    obj->add_volume(m);
+    obj->add_instance();
+    // Filament 2 is used only above z=4, so the upper layers carry a single filament change.
+    DynamicPrintConfig range_config;
+    range_config.set_key_value("extruder",     new ConfigOptionInt(2));
+    // Every range must carry a layer_height; use the process's own so a fine nozzle (e.g. 0.15 mm
+    // printing ~0.1 mm layers) isn't forced to a height its extrusion width can't support - that
+    // trips Flow::with_spacing.
+    range_config.set_key_value("layer_height", new ConfigOptionFloat(cfg.opt_float("layer_height")));
+    obj->layer_config_ranges[{4.0, 10.0}].assign_config(std::move(range_config));
+
+    print.is_BBL_printer() = is_bbl;
+    obj->ensure_on_bed();
+    print.auto_assign_extruders(obj);
+    print.apply(model, cfg);
+    print.validate();
+
+    // Process + export to a temp file, then read it back (the app's own export path is where the
+    // custom *_gcode placeholders expand).
+    print.set_status_silent();
+    print.process();
+    const fs::path tmp = fs::temp_directory_path() / fs::unique_path("orca-validate-%%%%-%%%%.gcode");
+    print.export_gcode(tmp.string(), nullptr, nullptr);
+    std::ifstream in(tmp.string());
+    std::string   out((std::istreambuf_iterator<char>(in)), std::istreambuf_iterator<char>());
+    in.close();
+    boost::system::error_code ec;
+    fs::remove(tmp, ec);
+    return out;
+}
+
+// Select the printer's OWN default process + filament (as the app does on a printer change) so we
+// slice with settings the printer actually ships, not the generic "Default Setting" that stays
+// selected because it is compatible with every printer.
+void select_printer_default_presets(PresetBundle &bundle)
+{
+    const Preset &printer_preset = bundle.printers.get_selected_preset();
+    const std::string def_print = printer_preset.config.opt_string("default_print_profile");
+    if (!def_print.empty())
+        bundle.prints.select_preset_by_name(def_print, /*force=*/true);
+    if (const auto *def_fil = printer_preset.config.option<ConfigOptionStrings>("default_filament_profile");
+        def_fil != nullptr && !def_fil->values.empty())
+        bundle.filaments.select_preset_by_name(def_fil->values.front(), /*force=*/true);
+}
+
+// The vendor/printer currently being sliced, stamped onto every engine log record by the sink below so
+// the interleaved [error] lines can be attributed to a profile. Updated once per loop iteration; safe as
+// a plain global because the sweep is single-threaded and synchronous (see slice_all_printers).
+static std::string g_slice_context;
+
+// Route Boost.Log through a sink that prefixes every record with g_slice_context. Without this the
+// engine's [error] lines (emitted deep inside process()/export_gcode()) carry no printer context, so a
+// failing profile cannot be told apart from the ~1000 others in the sweep. Drops the default trivial
+// sink's timestamp/thread columns - noise here - in favour of the vendor/printer tag.
+void install_slice_context_log_sink()
+{
+    namespace logging = boost::log;
+    namespace sinks   = boost::log::sinks;
+    namespace expr    = boost::log::expressions;
+
+    auto backend = boost::make_shared<sinks::text_ostream_backend>();
+    backend->add_stream(boost::shared_ptr<std::ostream>(&std::clog, boost::null_deleter()));
+    backend->auto_flush(true);
+
+    auto sink = boost::make_shared<sinks::synchronous_sink<sinks::text_ostream_backend>>(backend);
+    sink->set_formatter([](const logging::record_view &rec, logging::formatting_ostream &strm) {
+        strm << "[" << rec[logging::trivial::severity] << "]";
+        if (!g_slice_context.empty())
+            strm << " [" << g_slice_context << "]";
+        strm << " " << rec[expr::smessage];
+    });
+
+    logging::core::get()->remove_all_sinks(); // drop the default trivial sink so lines are not doubled
+    logging::core::get()->add_sink(sink);
+}
+
+// Slice-and-export a two-colour cube through every shipped printer (optionally scoped to one vendor via
+// -v). Unlike the static reference/placeholder checks, this expands every custom *_gcode - including
+// change_filament_gcode at the one filament change - against the printer's fully-resolved config, so
+// undefined-placeholder / invalid-flow bugs surface here. Reports every offending printer and returns 1
+// if any failed, 0 otherwise. When outdir is non-empty, each printer's g-code is also written there as
+// "<vendor>__<printer>.gcode" for manual inspection. The sweep is SEQUENTIAL by necessity:
+// Print::process() keeps process-global state, so slicing printers concurrently in one process races
+// even with per-slice Model+Print. Load in validation mode so the vendors are read straight from the -p
+// profiles dir (no data_dir/system tree) and -v scoping is honoured for free.
+int slice_all_printers(const std::string &vendor, const std::string &outdir)
+{
+    install_slice_context_log_sink();
+
+    if (!outdir.empty()) {
+        boost::system::error_code ec;
+        fs::create_directories(outdir, ec);
+        if (ec) {
+            BOOST_LOG_TRIVIAL(error) << "Could not create output directory \"" << outdir << "\": " << ec.message();
+            std::cout << "Validation failed" << std::endl;
+            return 1;
+        }
+        std::cout << "Saving sliced g-code to " << outdir << std::endl;
+    }
+
+    PresetBundle bundle;
+    bundle.set_is_validation_mode(true);
+    bundle.set_vendor_to_validate(vendor); // empty == all vendors
+    AppConfig app_config;
+    app_config.set("preset_folder", "default");
+    try {
+        bundle.load_presets(app_config, ForwardCompatibilitySubstitutionRule::Disable);
+    } catch (const std::exception &ex) {
+        BOOST_LOG_TRIVIAL(error) << ex.what();
+        std::cout << "Validation failed" << std::endl;
+        return 1;
+    }
+
+    // Enable every instantiable model/variant in AppConfig - system printers are hidden until enabled;
+    // without this select_preset_by_name silently falls back to the "Default Printer".
+    std::vector<std::pair<std::string, std::string>> printers; // (vendor name, preset name)
+    for (const Preset &p : bundle.printers.get_presets()) {
+        if (p.vendor == nullptr) continue;                 // skips the Default Printer
+        const std::string model   = p.config.opt_string("printer_model");
+        const std::string variant = p.config.opt_string("printer_variant");
+        if (model.empty() || variant.empty()) continue;    // skip non-instantiable base/common configs
+        app_config.set_variant(p.vendor->id, model, variant, true);
+        printers.push_back({p.vendor->name, p.name});
+    }
+    bundle.load_installed_printers(app_config);
+
+    if (printers.empty()) {
+        BOOST_LOG_TRIVIAL(error) << "No instantiable printer presets found"
+            << (vendor.empty() ? "" : " for vendor " + vendor);
+        std::cout << "Validation failed" << std::endl;
+        return 1;
+    }
+    std::cout << "Slicing " << printers.size() << " printer preset(s)"
+              << (vendor.empty() ? "" : " for vendor " + vendor) << "..." << std::endl;
+
+    int failures = 0;
+    for (const auto &[vendor_name, printer] : printers) {
+        g_slice_context = vendor_name + " / " + printer; // tag every engine log line from this slice
+        const bool selected = bundle.printers.select_preset_by_name(printer, /*force=*/true);
+        if (!selected || bundle.printers.get_selected_preset_name() != printer) {
+            BOOST_LOG_TRIVIAL(error) << "Printer preset \"" << printer << "\" could not be selected";
+            ++failures;
+            continue;
+        }
+
+        select_printer_default_presets(bundle);          // slice with the printer's shipped process/filament
+        bundle.update_multi_material_filament_presets();  // size filament_presets to nozzle count
+        bundle.update_compatible(PresetSelectCompatibleType::Always);
+
+        // Never slice with a generic default preset - that would validate stand-in settings, not the
+        // real profile (a legit per-profile error).
+        if (bundle.prints.get_selected_preset().is_default || bundle.filaments.get_selected_preset().is_default) {
+            BOOST_LOG_TRIVIAL(error) << "Printer \"" << printer << "\" fell back to a default preset (process=\""
+                << bundle.prints.get_selected_preset_name() << "\", filament=\""
+                << bundle.filaments.get_selected_preset_name() << "\")";
+            ++failures;
+            continue;
+        }
+
+        // Grow to a 2nd filament so the cube can change colour; never shrink a multi-nozzle printer
+        // below its nozzle count, or full_config()'s flush-volume matrix no longer matches validate().
+        const size_t nozzles = bundle.printers.get_selected_preset().config.option<ConfigOptionFloats>("nozzle_diameter")->size();
+        bundle.set_num_filaments((unsigned int) std::max<size_t>(2, nozzles));
+
+        // Mirror the app's manual filament->nozzle assignment for a multi-nozzle BBL printer: put each
+        // filament on its own nozzle and pin the map (fmmManual) so full_config() collapses every filament to
+        // the variant of the nozzle it actually prints from, and the engine keeps that assignment instead of
+        // auto-remapping it during process(). Without this the synthetic 2nd filament keeps nozzle 1's variant
+        // while the auto map moves it to nozzle 2 - harmless, but on the one printer whose nozzles differ in
+        // type (Direct Drive + Bowden) the mismatched lookup spams [error] lines. Single-nozzle and non-BBL
+        // printers keep the default map (their toolchange rides the AMS/tool-changer path unchanged).
+        const bool pin_filament_map = bundle.is_bbl_vendor() && nozzles > 1;
+        if (pin_filament_map) {
+            auto &fmap = bundle.project_config.option<ConfigOptionInts>("filament_map", true)->values;
+            for (size_t i = 0; i < fmap.size(); ++i)
+                fmap[i] = int(i % nozzles) + 1;
+        }
+
+        DynamicPrintConfig cfg = bundle.full_config();
+        cfg.set_key_value("enable_prime_tower", new ConfigOptionBool(true)); // force a purge tower so the change is detectable
+        // The map above drives full_config()'s per-filament variant collapse; fmmManual on the sliced config
+        // stops process() from auto-remapping filaments back onto a different nozzle (which would re-introduce
+        // the variant mismatch this pinning avoids).
+        if (pin_filament_map)
+            cfg.set_key_value("filament_map_mode", new ConfigOptionEnum<FilamentMapMode>(fmmManual));
+
+        // full_config() grows filament_extruder_variant to one entry per filament, but because the synthetic
+        // 2nd filament is a duplicate of the first (set_num_filaments copies the same preset), it leaves
+        // filament_self_index at size 1. That makes update_values_to_printer_extruders_for_multiple_filaments
+        // fail to resolve the 2nd filament's variant - a benign fallback that spams [error] lines. A real
+        // 2-colour project ships filament_self_index = 1,2,...; mirror that so the sweep log stays clean. The
+        // slice output is unaffected: the duplicated filament's per-variant values are identical to the first.
+        if (auto *variants = cfg.option<ConfigOptionStrings>("filament_extruder_variant")) {
+            auto &self_index = cfg.option<ConfigOptionInts>("filament_self_index", true)->values;
+            if (self_index.size() != variants->size()) {
+                self_index.resize(variants->size());
+                for (size_t i = 0; i < self_index.size(); ++i)
+                    self_index[i] = int(i) + 1;
+            }
+        }
+
+        try {
+            const std::string out = slice_two_color_cube_and_export(cfg, bundle.is_bbl_vendor());
+            if (!outdir.empty() && !out.empty()) {
+                const fs::path f = fs::path(outdir) / (sanitize_filename(vendor_name) + "__" + sanitize_filename(printer) + ".gcode");
+                save_string_file(f, out);
+            }
+            if (out.empty() || out.find("G1") == std::string::npos) {
+                BOOST_LOG_TRIVIAL(error) << "Printer \"" << printer << "\" produced no g-code";
+                ++failures;
+            } else if (out.find("CP TOOLCHANGE START") == std::string::npos) {
+                // The filament change never rode the tower, so change_filament_gcode was not exercised.
+                BOOST_LOG_TRIVIAL(error) << "Printer \"" << printer
+                    << "\" sliced but the filament change never fired (no CP TOOLCHANGE START)";
+                ++failures;
+            }
+        } catch (const std::exception &ex) {
+            BOOST_LOG_TRIVIAL(error) << "Printer \"" << printer << "\" failed to slice: " << ex.what();
+            ++failures;
+        }
+    }
+    g_slice_context.clear();
+
+    if (failures > 0) {
+        std::cout << failures << " of " << printers.size() << " printer preset(s) failed to slice" << std::endl;
+        std::cout << "Validation failed" << std::endl;
+        return 1;
+    }
+    std::cout << "All " << printers.size() << " printer preset(s) sliced successfully" << std::endl;
+    std::cout << "Validation completed successfully" << std::endl;
+    return 0;
+}
+
+} // namespace
+
 int main(int argc, char* argv[])
 {
    po::options_description desc("Orca Profile Validator\nUsage");
@@ -95,6 +379,8 @@ int main(int argc, char* argv[])
 #endif
    ("vendor,v", po::value<std::string>()->default_value(""), "Vendor name. Optional, all profiles present in the folder will be validated if not specified")
    ("generate_presets,g", po::value<bool>()->default_value(false), "Generate user presets for mock test")
+    ("slice,s", po::bool_switch()->default_value(false), "Slice a two-colour cube through every printer to expand all custom g-code (catches placeholder/flow errors that static checks miss). Off unless this flag is present.")
+    ("outdir,o", po::value<std::string>()->default_value(""), "With -s, also save each printer's g-code to this folder (as <vendor>__<printer>.gcode) for manual inspection. Optional.")
    ("check_filament_subtypes,f", po::bool_switch()->default_value(false), "Also flag printers with duplicate (ambiguous) filament subtypes. Off unless this flag is present.")
    ("log_level,l", po::value<int>()->default_value(2), "Log level. Optional, default is 2 (warning). Higher values produce more detailed logs.");
    // clang-format on
@@ -119,6 +405,8 @@ int main(int argc, char* argv[])
    std::string vendor               = vm["vendor"].as<std::string>();
    int         log_level            = vm["log_level"].as<int>();
    bool        generate_user_preset = vm["generate_presets"].as<bool>();
+    bool        slice_mode           = vm["slice"].as<bool>();
+    std::string slice_outdir         = vm["outdir"].as<std::string>();
    bool        check_filament_subtypes = vm["check_filament_subtypes"].as<bool>();

    //  check if path is valid, and return error if not
@@ -132,6 +420,12 @@ int main(int argc, char* argv[])
    // std::cout<<"log_level: "<<log_level<<std::endl;

    set_data_dir(path);
+    // Orca: the profiles folder lives at <resources>/profiles, so point resources_dir() at that
+    // <resources> parent. Without this, resources_dir() is empty and slice mode's HRC lookup
+    // (info/nozzle_info.json) resolves to a non-existent relative path and falls back to a
+    // built-in table (logging a spurious parse error and dropping the E3D entry).
+    if (fs::exists(fs::path(path).parent_path() / "info"))
+        set_resources_dir(fs::path(path).parent_path().string());

    auto user_dir = fs::path(Slic3r::data_dir()) / PRESET_USER_DIR;
    user_dir.make_preferred();
@@ -139,6 +433,12 @@ int main(int argc, char* argv[])
        fs::create_directory(user_dir);

    set_logging_level(log_level);
+
+    // Slice mode expands every printer's custom g-code by actually slicing (see slice_all_printers).
+    // A distinct opt-in mode so the default static checks stay fast for every profile PR.
+    if (slice_mode)
+        return slice_all_printers(vendor, slice_outdir);
+
    auto preset_bundle = new PresetBundle();
    // preset_bundle->setup_directories();
    preset_bundle->set_is_validation_mode(true);
@@ -171,6 +171,33 @@ echo -n "[9/9] Generating Linux app..."
    fi
    cp -fl "${ORIGINAL_BINARY_LOCATION}" "$BIN_DIR/@SLIC3R_APP_CMD@"

+    # Bundle the embedded Python runtime (interpreter + stdlib) that CMake staged
+    # next to the binary. OrcaSlicer resolves PYTHONHOME at <resources_dir>/../lib/python,
+    # which is $APPDIR/lib/python (resources_dir is $APPDIR/resources). Staging it here,
+    # before the dependency-closure pass below, lets that pass also bundle the extension
+    # modules' shared libraries; libpython itself is found via rpath ($ORIGIN entries set
+    # in src/CMakeLists.txt and by the dep recipe). Without this the plugin system cannot start.
+    PYTHON_RUNTIME_SRC="$(dirname "${ORIGINAL_BINARY_LOCATION}")/python"
+    if [ -d "$PYTHON_RUNTIME_SRC" ]; then
+        echo "Bundling Python runtime from ${PYTHON_RUNTIME_SRC} ..."
+        copy_directory_if_present "$PYTHON_RUNTIME_SRC" "$LIB_DIR/python"
+    else
+        echo "Warning: bundled Python runtime not found at ${PYTHON_RUNTIME_SRC}; plugin support will be disabled in this AppImage."
+    fi
+
+    # Bundle the uv executable (CMake staged it next to the binary) so the plugin
+    # system can install Python package dependencies. bundled_uv_path() looks under
+    # <resources_dir>/tools/uv == $APPDIR/resources/tools/uv -- the same layout the
+    # install()-based packagers (Windows/Flatpak/FHS) use. Unlike the AppImage, those
+    # run `make install`; this build copies artifacts, so stage uv explicitly.
+    UV_RUNTIME_SRC="$(dirname "${ORIGINAL_BINARY_LOCATION}")/tools/uv"
+    if [ -d "$UV_RUNTIME_SRC" ]; then
+        echo "Bundling uv from ${UV_RUNTIME_SRC} ..."
+        copy_directory_if_present "$UV_RUNTIME_SRC" "$APPDIR/resources/tools/uv"
+    else
+        echo "Warning: bundled uv not found at ${UV_RUNTIME_SRC}; Python package installation will be unavailable in this AppImage."
+    fi
+
    if [ "$BUNDLE_DESKTOP_STACK" = "1" ]; then
        GSTREAMER_PLUGIN_SOURCE_DIR="$(find_pkg_config_dir pluginsdir gstreamer-1.0 || true)"
        if [ -z "$GSTREAMER_PLUGIN_SOURCE_DIR" ]; then