mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-05-16 18:12:10 +00:00
Merge branch 'main' into dev/h2d-2
This commit is contained in:
@@ -706,7 +706,7 @@ void PrintConfigDef::init_common_params()
|
||||
def = this->add("preferred_orientation", coFloat);
|
||||
def->label = L("Preferred orientation");
|
||||
def->tooltip = L("Automatically orient stls on the Z axis upon initial import.");
|
||||
def->sidetext = "°"; // degrees, don't need translation
|
||||
def->sidetext = u8"°"; // degrees, don't need translation
|
||||
def->max = 360;
|
||||
def->min = -360;
|
||||
def->mode = comAdvanced;
|
||||
@@ -1141,7 +1141,7 @@ void PrintConfigDef::init_fff_params()
|
||||
def->tooltip = L("Bridging angle override. If left to zero, the bridging angle will be calculated "
|
||||
"automatically. Otherwise the provided angle will be used for external bridges. "
|
||||
"Use 180°for zero angle.");
|
||||
def->sidetext = "°"; // degrees, don't need translation
|
||||
def->sidetext = u8"°"; // degrees, don't need translation
|
||||
def->min = 0;
|
||||
def->mode = comAdvanced;
|
||||
def->set_default_value(new ConfigOptionFloat(0.));
|
||||
@@ -1153,7 +1153,7 @@ void PrintConfigDef::init_fff_params()
|
||||
def->tooltip = L("Internal bridging angle override. If left to zero, the bridging angle will be calculated "
|
||||
"automatically. Otherwise the provided angle will be used for internal bridges. "
|
||||
"Use 180°for zero angle.\n\nIt is recommended to leave it at 0 unless there is a specific model need not to.");
|
||||
def->sidetext = "°"; // degrees, don't need translation
|
||||
def->sidetext = u8"°"; // degrees, don't need translation
|
||||
def->min = 0;
|
||||
def->mode = comAdvanced;
|
||||
def->set_default_value(new ConfigOptionFloat(0.));
|
||||
@@ -1472,7 +1472,7 @@ void PrintConfigDef::init_fff_params()
|
||||
def->tooltip = L("Maximum angle to let a brim ear appear.\n"
|
||||
"If set to 0, no brim will be created.\n"
|
||||
"If set to ~180, brim will be created on everything but straight sections.");
|
||||
def->sidetext = "°"; // degrees, don't need translation
|
||||
def->sidetext = u8"°"; // degrees, don't need translation
|
||||
def->min = 0;
|
||||
def->max = 180;
|
||||
def->mode = comAdvanced;
|
||||
@@ -2613,7 +2613,7 @@ void PrintConfigDef::init_fff_params()
|
||||
def->label = L("Sparse infill direction");
|
||||
def->category = L("Strength");
|
||||
def->tooltip = L("Angle for sparse infill pattern, which controls the start or main direction of line.");
|
||||
def->sidetext = "°"; // degrees, don't need translation
|
||||
def->sidetext = u8"°"; // degrees, don't need translation
|
||||
def->min = 0;
|
||||
def->max = 360;
|
||||
def->mode = comAdvanced;
|
||||
@@ -2623,7 +2623,7 @@ void PrintConfigDef::init_fff_params()
|
||||
def->label = L("Solid infill direction");
|
||||
def->category = L("Strength");
|
||||
def->tooltip = L("Angle for solid infill pattern, which controls the start or main direction of line.");
|
||||
def->sidetext = "°"; // degrees, don't need translation
|
||||
def->sidetext = u8"°"; // degrees, don't need translation
|
||||
def->min = 0;
|
||||
def->max = 360;
|
||||
def->mode = comAdvanced;
|
||||
@@ -2725,7 +2725,7 @@ void PrintConfigDef::init_fff_params()
|
||||
def->label = L("Lateral lattice angle 1");
|
||||
def->category = L("Strength");
|
||||
def->tooltip = L("The angle of the first set of Lateral lattice elements in the Z direction. Zero is vertical.");
|
||||
def->sidetext = "°"; // degrees, don't need translation
|
||||
def->sidetext = u8"°"; // degrees, don't need translation
|
||||
def->min = -75;
|
||||
def->max = 75;
|
||||
def->mode = comAdvanced;
|
||||
@@ -2735,7 +2735,7 @@ void PrintConfigDef::init_fff_params()
|
||||
def->label = L("Lateral lattice angle 2");
|
||||
def->category = L("Strength");
|
||||
def->tooltip = L("The angle of the second set of Lateral lattice elements in the Z direction. Zero is vertical.");
|
||||
def->sidetext = "°"; // degrees, don't need translation
|
||||
def->sidetext = u8"°"; // degrees, don't need translation
|
||||
def->min = -75;
|
||||
def->max = 75;
|
||||
def->mode = comAdvanced;
|
||||
@@ -2745,7 +2745,7 @@ void PrintConfigDef::init_fff_params()
|
||||
def->label = L("Infill overhang angle");
|
||||
def->category = L("Strength");
|
||||
def->tooltip = L("The angle of the infill angled lines. 60° will result in a pure honeycomb.");
|
||||
def->sidetext = "°"; // degrees, don't need translation
|
||||
def->sidetext = u8"°"; // degrees, don't need translation
|
||||
def->min = 15;
|
||||
def->max = 75;
|
||||
def->mode = comAdvanced;
|
||||
@@ -3474,7 +3474,7 @@ void PrintConfigDef::init_fff_params()
|
||||
"The template is a comma-separated list of angles in degrees, e.g. '0,90'. "
|
||||
"The first angle is applied to the first layer, the second angle to the second layer, and so on. "
|
||||
"If there are more layers than angles, the angles will be repeated. Note that not all solid infill patterns support rotation.");
|
||||
def->sidetext = "°"; // degrees, don't need translation
|
||||
def->sidetext = u8"°"; // degrees, don't need translation
|
||||
def->mode = comAdvanced;
|
||||
def->set_default_value(new ConfigOptionString(""));
|
||||
|
||||
@@ -3705,7 +3705,7 @@ void PrintConfigDef::init_fff_params()
|
||||
def = this->add("interlocking_orientation", coFloat);
|
||||
def->label = L("Interlocking direction");
|
||||
def->tooltip = L("Orientation of interlock beams.");
|
||||
def->sidetext = "°"; // degrees, don't need translation
|
||||
def->sidetext = u8"°"; // degrees, don't need translation
|
||||
def->min = 0;
|
||||
def->max = 360;
|
||||
def->category = L("Advanced");
|
||||
@@ -3815,7 +3815,7 @@ void PrintConfigDef::init_fff_params()
|
||||
def->label = L("Ironing angle");
|
||||
def->category = L("Quality");
|
||||
def->tooltip = L("The angle ironing is done at. A negative number disables this function and uses the default method.");
|
||||
def->sidetext = "°"; // degrees, don't need translation
|
||||
def->sidetext = u8"°"; // degrees, don't need translation
|
||||
def->min = -1;
|
||||
def->max = 359;
|
||||
def->mode = comAdvanced;
|
||||
@@ -4310,7 +4310,7 @@ void PrintConfigDef::init_fff_params()
|
||||
def->tooltip = L("Maximum angle of overhangs to allow after making more steep overhangs printable."
|
||||
"90° will not change the model at all and allow any overhang, while 0 will "
|
||||
"replace all overhangs with conical material.");
|
||||
def->sidetext = "°"; // degrees, don't need translation
|
||||
def->sidetext = u8"°"; // degrees, don't need translation
|
||||
def->mode = comAdvanced;
|
||||
def->min = 0.;
|
||||
def->max = 90.;
|
||||
@@ -4321,7 +4321,7 @@ void PrintConfigDef::init_fff_params()
|
||||
def->category = L("Quality");
|
||||
def->tooltip = L("Maximum area of a hole in the base of the model before it's filled by conical material. "
|
||||
"A value of 0 will fill all the holes in the model base.");
|
||||
def->sidetext = "mm²"; // square milimeters, don't need translation
|
||||
def->sidetext = u8"mm²"; // square millimeters, don't need translation
|
||||
def->mode = comAdvanced;
|
||||
def->min = 0.;
|
||||
def->set_default_value(new ConfigOptionFloat(0.));
|
||||
@@ -4603,7 +4603,7 @@ void PrintConfigDef::init_fff_params()
|
||||
def = this->add("travel_slope", coFloats);
|
||||
def->label = L("Traveling angle");
|
||||
def->tooltip = L("Traveling angle for Slope and Spiral Z-hop type. Setting it to 90° results in Normal Lift.");
|
||||
def->sidetext = "°"; // degrees, don't need translation
|
||||
def->sidetext = u8"°"; // degrees, don't need translation
|
||||
def->mode = comAdvanced;
|
||||
def->min = 1;
|
||||
def->max = 90;
|
||||
@@ -4839,7 +4839,7 @@ void PrintConfigDef::init_fff_params()
|
||||
"This option sets the threshold angle for applying a conditional scarf joint seam.\nIf the maximum angle within the perimeter loop "
|
||||
"exceeds this value (indicating the absence of sharp corners), a scarf joint seam will be used. The default value is 155°.");
|
||||
def->mode = comAdvanced;
|
||||
def->sidetext = "°"; // degrees, don't need translation
|
||||
def->sidetext = u8"°"; // degrees, don't need translation
|
||||
def->min = 0;
|
||||
def->max = 180;
|
||||
def->set_default_value(new ConfigOptionInt(155));
|
||||
@@ -4960,7 +4960,7 @@ void PrintConfigDef::init_fff_params()
|
||||
def = this->add("skirt_start_angle", coFloat);
|
||||
def->label = L("Skirt start point");
|
||||
def->tooltip = L("Angle from the object center to skirt start point. Zero is the most right position, counter clockwise is positive angle.");
|
||||
def->sidetext = "°"; // degrees, don't need translation
|
||||
def->sidetext = u8"°"; // degrees, don't need translation
|
||||
def->min = -180;
|
||||
def->max = 180;
|
||||
def->mode = comAdvanced;
|
||||
@@ -5050,7 +5050,7 @@ void PrintConfigDef::init_fff_params()
|
||||
def->label = L("Minimum sparse infill threshold");
|
||||
def->category = L("Strength");
|
||||
def->tooltip = L("Sparse infill area which is smaller than threshold value is replaced by internal solid infill.");
|
||||
def->sidetext = "mm²"; // square milimeters, don't need translation
|
||||
def->sidetext = u8"mm²"; // square millimeters, don't need translation
|
||||
def->min = 0;
|
||||
def->mode = comAdvanced;
|
||||
def->set_default_value(new ConfigOptionFloat(15));
|
||||
@@ -5327,7 +5327,7 @@ void PrintConfigDef::init_fff_params()
|
||||
def->label = L("Pattern angle");
|
||||
def->category = L("Support");
|
||||
def->tooltip = L("Use this setting to rotate the support pattern on the horizontal plane.");
|
||||
def->sidetext = "°"; // degrees, don't need translation
|
||||
def->sidetext = u8"°"; // degrees, don't need translation
|
||||
def->min = 0;
|
||||
def->max = 359;
|
||||
def->mode = comAdvanced;
|
||||
@@ -5611,7 +5611,7 @@ void PrintConfigDef::init_fff_params()
|
||||
def->label = L("Threshold angle");
|
||||
def->category = L("Support");
|
||||
def->tooltip = L("Support will be generated for overhangs whose slope angle is below the threshold.");
|
||||
def->sidetext = "°"; // degrees, don't need translation
|
||||
def->sidetext = u8"°"; // degrees, don't need translation
|
||||
def->min = 0;
|
||||
def->max = 90;
|
||||
def->mode = comSimple;
|
||||
@@ -5633,7 +5633,7 @@ void PrintConfigDef::init_fff_params()
|
||||
def->category = L("Support");
|
||||
def->tooltip = L("This setting determines the maximum overhang angle that the branches of tree support are allowed to make. "
|
||||
"If the angle is increased, the branches can be printed more horizontally, allowing them to reach farther.");
|
||||
def->sidetext = "°"; // degrees, don't need translation
|
||||
def->sidetext = u8"°"; // degrees, don't need translation
|
||||
def->min = 0;
|
||||
def->max = 60;
|
||||
def->mode = comAdvanced;
|
||||
@@ -5644,7 +5644,7 @@ void PrintConfigDef::init_fff_params()
|
||||
def->category = L("Support");
|
||||
def->tooltip = L("This setting determines the maximum overhang angle that the branches of tree support are allowed to make. "
|
||||
"If the angle is increased, the branches can be printed more horizontally, allowing them to reach farther.");
|
||||
def->sidetext = "°"; // degrees, don't need translation
|
||||
def->sidetext = u8"°"; // degrees, don't need translation
|
||||
def->min = 0;
|
||||
def->max = 60;
|
||||
def->mode = comAdvanced;
|
||||
@@ -5656,7 +5656,7 @@ void PrintConfigDef::init_fff_params()
|
||||
// TRN PrintSettings: "Organic supports" > "Preferred Branch Angle"
|
||||
def->tooltip = L("The preferred angle of the branches, when they do not have to avoid the model. "
|
||||
"Use a lower angle to make them more vertical and more stable. Use a higher angle for branches to merge faster.");
|
||||
def->sidetext = "°"; // degrees, don't need translation
|
||||
def->sidetext = u8"°"; // degrees, don't need translation
|
||||
def->min = 10;
|
||||
def->max = 85;
|
||||
def->mode = comAdvanced;
|
||||
@@ -5744,7 +5744,7 @@ void PrintConfigDef::init_fff_params()
|
||||
def->tooltip = L("The angle of the branches' diameter as they gradually become thicker towards the bottom. "
|
||||
"An angle of 0 will cause the branches to have uniform thickness over their length. "
|
||||
"A bit of an angle can increase stability of the organic support.");
|
||||
def->sidetext = "°"; // degrees, don't need translation
|
||||
def->sidetext = u8"°"; // degrees, don't need translation
|
||||
def->min = 0;
|
||||
def->max = 15;
|
||||
def->mode = comAdvanced;
|
||||
@@ -6082,7 +6082,7 @@ void PrintConfigDef::init_fff_params()
|
||||
def = this->add("wipe_tower_rotation_angle", coFloat);
|
||||
def->label = L("Wipe tower rotation angle");
|
||||
def->tooltip = L("Wipe tower rotation angle with respect to X axis.");
|
||||
def->sidetext = "°"; // degrees, don't need translation
|
||||
def->sidetext = u8"°"; // degrees, don't need translation
|
||||
def->mode = comAdvanced;
|
||||
def->set_default_value(new ConfigOptionFloat(0.));
|
||||
|
||||
@@ -6101,7 +6101,7 @@ void PrintConfigDef::init_fff_params()
|
||||
def->label = L("Stabilization cone apex angle");
|
||||
def->tooltip = L("Angle at the apex of the cone that is used to stabilize the wipe tower. "
|
||||
"Larger angle means wider base.");
|
||||
def->sidetext = "°"; // degrees, don't need translation
|
||||
def->sidetext = u8"°"; // degrees, don't need translation
|
||||
def->mode = comAdvanced;
|
||||
def->min = 0.;
|
||||
def->max = 90.;
|
||||
@@ -6384,7 +6384,7 @@ void PrintConfigDef::init_fff_params()
|
||||
" an angle greater than this setting will not have transitions and no walls will be "
|
||||
"printed in the center to fill the remaining space. Reducing this setting reduces "
|
||||
"the number and length of these center walls, but may leave gaps or overextrude.");
|
||||
def->sidetext = "°"; // degrees, don't need translation
|
||||
def->sidetext = u8"°"; // degrees, don't need translation
|
||||
def->mode = comAdvanced;
|
||||
def->min = 1.;
|
||||
def->max = 59.;
|
||||
@@ -9645,19 +9645,19 @@ CLITransformConfigDef::CLITransformConfigDef()
|
||||
def = this->add("rotate", coFloat);
|
||||
def->label = L("Rotate");
|
||||
def->tooltip = L("Rotation angle around the Z axis in degrees.");
|
||||
def->sidetext = "°"; // degrees, don't need translation
|
||||
def->sidetext = u8"°"; // degrees, don't need translation
|
||||
def->set_default_value(new ConfigOptionFloat(0));
|
||||
|
||||
def = this->add("rotate_x", coFloat);
|
||||
def->label = L("Rotate around X");
|
||||
def->tooltip = L("Rotation angle around the X axis in degrees.");
|
||||
def->sidetext = "°"; // degrees, don't need translation
|
||||
def->sidetext = u8"°"; // degrees, don't need translation
|
||||
def->set_default_value(new ConfigOptionFloat(0));
|
||||
|
||||
def = this->add("rotate_y", coFloat);
|
||||
def->label = L("Rotate around Y");
|
||||
def->tooltip = L("Rotation angle around the Y axis in degrees.");
|
||||
def->sidetext = "°"; // degrees, don't need translation
|
||||
def->sidetext = u8"°"; // degrees, don't need translation
|
||||
def->set_default_value(new ConfigOptionFloat(0));
|
||||
|
||||
def = this->add("scale", coFloat);
|
||||
|
||||
Reference in New Issue
Block a user