QIDITECH/QIDISlicer
1
0
Fork 0
mirror of https://github.com/QIDITECH/QIDISlicer.git synced 2026-02-02 08:58:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/QIDITECH/QIDISlicer

Browse Source
This commit is contained in:
sunsets
2023-07-17 19:01:45 +08:00
parent 729dc96934 bcb8a14ed7
commit 6fd7c6dac5
10 changed files with 5 additions and 424 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/libslic3r/Preset.cpp
View File

@@ -511,12 +511,7 @@ static std::vector<std::string> s_Preset_filament_options {
//B26
"advance_pressure",
//B26
"smooth_time",
//Y7
"filament_property_drying_box", "filament_property_anneal_temperature", "filament_property_water_resistance", "filament_property_corrosion_resistance",
"filament_property_creep_resistance", "filament_property_hdt_045", "filament_property_hdt_180", "filament_property_tensile_strength",
"filament_property_tensile_modulus", "filament_property_elongation_at_break", "filament_property_flexural_strength","filament_property_flexural_modulus",
"filament_property_notch_impact_strength"
"smooth_time"
};
static std::vector<std::string> s_Preset_machine_limits_options {

123
src/libslic3r/PrintConfig.cpp
View File

@@ -206,14 +206,6 @@ static const t_config_enum_values s_keys_map_GCodeThumbnailsFormat = {
{ "QOI", int(GCodeThumbnailsFormat::QOI) }
};
CONFIG_OPTION_ENUM_DEFINE_STATIC_MAPS(GCodeThumbnailsFormat)
//Y7
static const t_config_enum_values s_keys_map_WaterResistance = {
{ "none", int(WaterResistance::None) },
{ "weak", int(WaterResistance::Weak) },
{ "fine", int(WaterResistance::Fine) },
{ "strong", int(WaterResistance::Strong) }
};
CONFIG_OPTION_ENUM_DEFINE_STATIC_MAPS(WaterResistance)
static const t_config_enum_values s_keys_map_ForwardCompatibilitySubstitutionRule = {
{ "disable", ForwardCompatibilitySubstitutionRule::Disable },
@@ -1379,121 +1371,6 @@ void PrintConfigDef::init_fff_params()
def->mode = comExpert;
def->set_default_value(new ConfigOptionInts { 0 });
////////////Y7
def = this->add_nullable("filament_property_drying_box", coInts);
def->label = L("Drying box");
def->tooltip = L("The maximum humidity in the drying box. Please place the desiccant in the drying box so that the internal humidity is lower than this value.");
def->sidetext = L("%");
def->min = 0;
def->max = 100;
def->mode = comSimple;
def->set_default_value(new ConfigOptionIntsNullable { ConfigOptionIntsNullable::nil_value() });
def = this->add_nullable("filament_property_anneal_temperature", coInts);
def->label = L("Anneal temperature");
def->tooltip = L("Annealing temperature of the filament.Placing the model in a drying oven for 4-6 hours immediately after printing can improve its physical properties.");
def->sidetext = L("°C");
def->mode = comExpert;
def->set_default_value(new ConfigOptionIntsNullable { ConfigOptionIntsNullable::nil_value() });
def = this->add("filament_property_water_resistance", coEnum);
def->label = L("Water resistance");
def->tooltip = L("Water resistance of the filament.");
def->set_enum<WaterResistance>({
{ "none", L("None") },
{ "weak", L("Weak") },
{ "fine", L("Fine") },
{ "strong", L("Strong") }
});
def->mode = comAdvanced;
def->set_default_value(new ConfigOptionEnum<WaterResistance>(WaterResistance::None));
def = this->add("filament_property_corrosion_resistance", coEnum);
def->label = L("Corrosion resistance");
def->tooltip = L("Corrosion resistance of the filament.");
def->set_enum<WaterResistance>({
{ "none", L("None") },
{ "weak", L("Weak") },
{ "fine", L("Fine") },
{ "strong", L("Strong") }
});
def->mode = comAdvanced;
def->set_default_value(new ConfigOptionEnum<WaterResistance>(WaterResistance::None));
def = this->add("filament_property_creep_resistance", coEnum);
def->label = L("Creep resistance");
def->tooltip = L("Creep resistance of the filament.");
def->set_enum<WaterResistance>({
{ "none", L("None") },
{ "weak", L("Weak") },
{ "fine", L("Fine") },
{ "strong", L("Strong") }
});
def->mode = comAdvanced;
def->set_default_value(new ConfigOptionEnum<WaterResistance>(WaterResistance::None));
def = this->add("filament_property_hdt_045", coFloats);
def->label = L("HDT(0.45MPa)");
def->tooltip = L("Heat distortion temp(0.45MPa).");
def->sidetext = L("°C");
def->mode = comExpert;
def->set_default_value(new ConfigOptionFloats { 0. });
def = this->add("filament_property_hdt_180", coFloats);
def->label = L("HDT(1.80MPa)");
def->tooltip = L("Heat distortion temp(1.80MPa).");
def->sidetext = L("°C");
def->mode = comExpert;
def->set_default_value(new ConfigOptionFloats { 0. });
def = this->add("filament_property_tensile_strength", coStrings);
def->label = L("Tensile strength");
def->tooltip = L("Tensile strength of the filament.");
def->sidetext = L("MPa");
def->width = 15;
def->mode = comExpert;
def->set_default_value(new ConfigOptionStrings { "" });
def = this->add("filament_property_tensile_modulus", coStrings);
def->label = L("Tensile modulus");
def->tooltip = L("Tensile modulus of the filament.");
def->sidetext = L("MPa");
def->width = 15;
def->mode = comExpert;
def->set_default_value(new ConfigOptionStrings { "" });
def = this->add("filament_property_elongation_at_break", coStrings);
def->label = L("Elongation at break");
def->tooltip = L("Elongation at break of the filament.");
def->sidetext = L("%");
def->width = 15;
def->mode = comExpert;
def->set_default_value(new ConfigOptionStrings { "" });
def = this->add("filament_property_flexural_strength", coStrings);
def->label = L("Flexural strength");
def->tooltip = L("Flexural strength of the filament.");
def->sidetext = L("MPa");
def->width = 15;
def->mode = comExpert;
def->set_default_value(new ConfigOptionStrings { "" });
def = this->add("filament_property_flexural_modulus", coStrings);
def->label = L("Flexural modulus");
def->tooltip = L("Flexural modulus of the filament.");
def->sidetext = L("MPa");
def->width = 15;
def->mode = comExpert;
def->set_default_value(new ConfigOptionStrings { "" });
def = this->add("filament_property_notch_impact_strength", coStrings);
def->label = L("Notch impact strength");
def->tooltip = L("Notch impact strength of the filament.");
def->sidetext = L("MPa");
def->width = 15;
def->mode = comExpert;
def->set_default_value(new ConfigOptionStrings { "" });
////////////Y7
def = this->add("fuzzy_skin", coEnum);
def->label = L("Fuzzy Skin");
def->category = L("Fuzzy Skin");

22
src/libslic3r/PrintConfig.hpp
View File

@@ -137,10 +137,6 @@ enum class PerimeterGeneratorType
enum class GCodeThumbnailsFormat {
QIDI, PNG, JPG, QOI
};
//Y7
enum class WaterResistance {
None, Weak, Fine, Strong
};
#define CONFIG_OPTION_ENUM_DECLARE_STATIC_MAPS(NAME) \
template<> const t_config_enum_names& ConfigOptionEnum<NAME>::get_enum_names(); \
@@ -167,9 +163,6 @@ CONFIG_OPTION_ENUM_DECLARE_STATIC_MAPS(DraftShield)
CONFIG_OPTION_ENUM_DECLARE_STATIC_MAPS(GCodeThumbnailsFormat)
CONFIG_OPTION_ENUM_DECLARE_STATIC_MAPS(ForwardCompatibilitySubstitutionRule)
CONFIG_OPTION_ENUM_DECLARE_STATIC_MAPS(PerimeterGeneratorType)
//Y7
CONFIG_OPTION_ENUM_DECLARE_STATIC_MAPS(WaterResistance)
#undef CONFIG_OPTION_ENUM_DECLARE_STATIC_MAPS
@@ -795,21 +788,6 @@ PRINT_CONFIG_CLASS_DERIVED_DEFINE(
((ConfigOptionFloatOrPercent, first_layer_height))
((ConfigOptionFloatOrPercent, first_layer_speed))
((ConfigOptionInts, first_layer_temperature))
//Y7
((ConfigOptionIntsNullable, filament_property_drying_box))
((ConfigOptionIntsNullable, filament_property_anneal_temperature))
((ConfigOptionEnum<WaterResistance>, filament_property_water_resistance))
((ConfigOptionEnum<WaterResistance>, filament_property_corrosion_resistance))
((ConfigOptionEnum<WaterResistance>, filament_property_creep_resistance))
((ConfigOptionFloats, filament_property_hdt_045))
((ConfigOptionFloats, filament_property_hdt_180))
((ConfigOptionStrings, filament_property_tensile_strength))
((ConfigOptionStrings, filament_property_tensile_modulus))
((ConfigOptionStrings, filament_property_elongation_at_break))
((ConfigOptionStrings, filament_property_flexural_strength))
((ConfigOptionStrings, filament_property_flexural_modulus))
((ConfigOptionStrings, filament_property_notch_impact_strength))
((ConfigOptionIntsNullable, idle_temperature))
//B26
((ConfigOptionBools, enable_advance_pressure))