mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-10-07 07:41:06 +00:00
HanifKoh
d1a3ef68c5
* Fix CLI Crashes on Malformed Project, Assemble List and No-Input Runs Four CLI paths indexed vectors without checking their size and crashed with SIGSEGV on malformed input: - A project inherits_group whose length is not the filament count plus the process and printer entries was split by position. It is now ignored with a warning, as if the project had none. - An assemble list object with an empty filaments list passed validation and was then read at index 0. It is now rejected as a config error, as is a negative filament id. - --slice N --arrange 1 on a project without plate metadata read the missing plate data. It now falls back to the plate's own filaments, like the other plate data reads. - --assemble with no input model built an object with no volumes. It is now rejected as invalid parameters. A tests/cli script covers each case through the binary, since all four live inline in CLI::run(). * Move the Assemble List Parser into libslic3r Behaviour-preserving move of the --load-assemble-list JSON parser and its plate/object structs from the CLI into libslic3r/Format/AssembleList, so the format can be unit tested. The parser returns its own AssembleListResult and takes the plate limit as a parameter; CLI::run maps the result to the same exit codes as before. Every validation rule and log message is unchanged. Adds Catch2 coverage of the valid layout and each validation rule. * Keep the Process and Printer of an inherits_group of the Wrong Length A project whose inherits_group did not have one entry per filament plus the process and printer entries was loaded as if it had none. The CLI then looked for system presets under the names of the user presets, found none and refused to slice a project that slices on main. The group is now read as before: the process first, the printer last and the filaments in between, up to the filament count. A filament without an entry counts as a system preset. A group with fewer than two entries is still ignored. The warning stays.
97 lines
3.2 KiB
C++
97 lines
3.2 KiB
C++
#ifndef SLIC3R_HPP
|
|
#define SLIC3R_HPP
|
|
|
|
#include <map>
|
|
#include "libslic3r/BoundingBox.hpp"
|
|
#include "libslic3r/PrintConfig.hpp"
|
|
#include "libslic3r/Format/bbs_3mf.hpp"
|
|
#include "libslic3r/GCode/ThumbnailData.hpp"
|
|
#include <set>
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#include "libslic3r/Config.hpp"
|
|
#include "libslic3r/Model.hpp"
|
|
#include "libslic3r/Format/AssembleList.hpp"
|
|
|
|
namespace Slic3r {
|
|
|
|
namespace IO {
|
|
enum ExportFormat : int {
|
|
AMF,
|
|
OBJ,
|
|
STL,
|
|
// SVG,
|
|
TMF,
|
|
Gcode
|
|
};
|
|
}
|
|
|
|
typedef struct _printer_plate_info {
|
|
std::string printer_name;
|
|
int printable_width{0};
|
|
int printable_depth{0};
|
|
int printable_height{0};
|
|
|
|
int exclude_width{0};
|
|
int exclude_depth{0};
|
|
int exclude_x{0};
|
|
int exclude_y{0};
|
|
|
|
int wrapping_width{0};
|
|
int wrapping_depth{0};
|
|
int wrapping_x{0};
|
|
int wrapping_y{0};
|
|
}printer_plate_info_t;
|
|
|
|
typedef struct _plate_obj_size_info {
|
|
bool has_wipe_tower{false};
|
|
float wipe_x{0.f};
|
|
float wipe_y{0.f};
|
|
float wipe_width{0.f};
|
|
float wipe_depth{0.f};
|
|
BoundingBoxf3 obj_bbox;
|
|
}plate_obj_size_info_t;
|
|
|
|
|
|
class CLI {
|
|
public:
|
|
int run(int argc, char **argv);
|
|
|
|
private:
|
|
DynamicPrintAndCLIConfig m_config;
|
|
DynamicPrintConfig m_print_config;
|
|
DynamicPrintConfig m_extra_config;
|
|
std::vector<std::string> m_input_files;
|
|
std::vector<std::string> m_actions;
|
|
std::vector<std::string> m_transforms;
|
|
// Options the user typed; setup() fills the CLI's own options with defaults afterwards.
|
|
std::set<std::string> m_given_option_keys;
|
|
std::vector<Model> m_models;
|
|
|
|
bool setup(int argc, char **argv);
|
|
|
|
/// Prints usage of the CLI.
|
|
void print_help(bool include_print_options = false, PrinterTechnology printer_technology = ptAny) const;
|
|
|
|
/// Exports loaded models to a file of the specified format, according to the options affecting output filename.
|
|
bool export_models(IO::ExportFormat format, std::string path = std::string());
|
|
//BBS: add export_project function
|
|
bool export_project(Model *model, std::string& path, PlateDataPtrs &partplate_data, std::vector<Preset*>& project_presets,
|
|
std::vector<ThumbnailData *> &thumbnails,
|
|
std::vector<ThumbnailData *> &no_light_thumbnails,
|
|
std::vector<ThumbnailData *> &top_thumbnails,
|
|
std::vector<ThumbnailData *> &pick_thumbnails,
|
|
std::vector<ThumbnailData*>& calibration_thumbnails,
|
|
std::vector<PlateBBoxData*>& plate_bboxes, const DynamicPrintConfig* config, bool minimum_save, int plate_to_export = -1);
|
|
|
|
bool has_print_action() const { return m_config.opt_bool("export_gcode") || m_config.opt_bool("export_sla"); }
|
|
|
|
std::string output_filepath(const Model &model, IO::ExportFormat format) const;
|
|
std::string output_filepath(const ModelObject &object, unsigned int index, IO::ExportFormat format, std::string path_dir) const;
|
|
};
|
|
|
|
}
|
|
|
|
#endif
|