Revert "Revert "Merge branch 'master' of https://github.com/QIDITECH/QIDISlicer""

This reverts commit 5bba8ccb1b.
This commit is contained in:
sunsets
2024-01-17 14:38:24 +08:00
parent 5bba8ccb1b
commit bf9dbfae79
12 changed files with 594 additions and 13 deletions

View File

@@ -144,6 +144,9 @@ enum class PerimeterGeneratorType
//B3
enum class GCodeThumbnailsFormat { QIDI,PNG, JPG, QOI };
//w16
enum class TopOneWallType { None, Alltop, Onlytopmost };
#define CONFIG_OPTION_ENUM_DECLARE_STATIC_MAPS(NAME) \
template<> const t_config_enum_names& ConfigOptionEnum<NAME>::get_enum_names(); \
template<> const t_config_enum_values& ConfigOptionEnum<NAME>::get_enum_values();
@@ -524,6 +527,8 @@ PRINT_CONFIG_CLASS_DEFINE(
((ConfigOptionFloat, raft_first_layer_expansion))
((ConfigOptionInt, raft_layers))
((ConfigOptionEnum<SeamPosition>, seam_position))
//Y21
((ConfigOptionPercent, seam_gap))
((ConfigOptionBool, staggered_inner_seams))
// ((ConfigOptionFloat, seam_preferred_direction))
// ((ConfigOptionFloat, seam_preferred_direction_jitter))
@@ -585,6 +590,8 @@ PRINT_CONFIG_CLASS_DEFINE(
((ConfigOptionBool, wipe_into_objects))
//w11
((ConfigOptionBool, detect_narrow_internal_solid_infill))
//w16
((ConfigOptionEnum<TopOneWallType>, top_one_wall_type))
)
PRINT_CONFIG_CLASS_DEFINE(