mirror of
https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git
synced 2025-07-25 09:24:25 +08:00
some littles changes to default profiles.
ironing setting now disable if no ironing change some prusaslicer to slic3r++ to avoid confusion
This commit is contained in:
parent
31dad9c4b5
commit
54483086d2
@ -43,6 +43,7 @@ retract_restart_extra = 0
|
||||
retract_restart_extra_toolchange = 0
|
||||
retract_speed = 35
|
||||
start_gcode = M115 U3.1.0 ; tell printer latest fw version\nM83 ; extruder relative mode\nM204 S[machine_max_acceleration_extruding] T[machine_max_acceleration_retracting] ; ENDER3 firmware may only supports the old M204 format\nG28 W ; home all\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG1 X0.0 Y0.0 F1000.0 ; go outside print area\nG92 E0.0\nG1 X150.0 E20 F1000.0 ; intro line\nG92 E0.0
|
||||
toolchange_gcode = M600
|
||||
use_firmware_retraction = 0
|
||||
use_relative_e_distances = 0
|
||||
use_volumetric_e = 0
|
||||
@ -59,77 +60,77 @@ nozzle_diameter = 0.15
|
||||
max_layer_height = 0.12
|
||||
min_layer_height = 0.05
|
||||
printer_variant = 0.15
|
||||
default_print_profile = 0.05mm
|
||||
default_print_profile = 0.08mm NORMAL .15N
|
||||
|
||||
[printer:*0.2nozzle*]
|
||||
nozzle_diameter = 0.2
|
||||
max_layer_height = 0.16
|
||||
min_layer_height = 0.05
|
||||
printer_variant = 0.2
|
||||
default_print_profile = 0.1mm
|
||||
default_print_profile = 0.1m NORMAL .2N
|
||||
|
||||
[printer:*0.25nozzle*]
|
||||
nozzle_diameter = 0.25
|
||||
max_layer_height = 0.2
|
||||
min_layer_height = 0.05
|
||||
printer_variant = 0.25
|
||||
default_print_profile = 0.1mm
|
||||
default_print_profile = 0.1m NORMAL .25N
|
||||
|
||||
[printer:*0.3nozzle*]
|
||||
nozzle_diameter = 0.3
|
||||
max_layer_height = 0.25
|
||||
min_layer_height = 0.05
|
||||
printer_variant = 0.3
|
||||
default_print_profile = 0.15mm
|
||||
default_print_profile = 0.15m NORMAL .3N
|
||||
|
||||
[printer:*0.35nozzle*]
|
||||
nozzle_diameter = 0.35
|
||||
max_layer_height = 0.25
|
||||
min_layer_height = 0.05
|
||||
printer_variant = 0.35
|
||||
default_print_profile = 0.15mm
|
||||
default_print_profile = 0.15m NORMAL .35N
|
||||
|
||||
[printer:*0.4nozzle*]
|
||||
nozzle_diameter = 0.4
|
||||
max_layer_height = 0.3
|
||||
min_layer_height = 0.075
|
||||
printer_variant = 0.4
|
||||
default_print_profile = 0.2mm
|
||||
default_print_profile = 0.20mm NORMAL .4N
|
||||
|
||||
[printer:*0.5nozzle*]
|
||||
nozzle_diameter = 0.5
|
||||
max_layer_height = 0.4
|
||||
min_layer_height = 0.075
|
||||
printer_variant = 0.5
|
||||
default_print_profile = 0.2mm
|
||||
default_print_profile = 0.20mm NORMAL .5N
|
||||
|
||||
[printer:*0.6nozzle*]
|
||||
nozzle_diameter = 0.6
|
||||
max_layer_height = 0.5
|
||||
min_layer_height = 0.1
|
||||
printer_variant = 0.6
|
||||
default_print_profile = 0.3mm
|
||||
default_print_profile = 0.30mm NORMAL .6N
|
||||
|
||||
[printer:*0.8nozzle*]
|
||||
nozzle_diameter = 0.8
|
||||
max_layer_height = 0.6
|
||||
min_layer_height = 0.1
|
||||
printer_variant = 0.8
|
||||
default_print_profile = 0.3mm
|
||||
default_print_profile = 0.30mm NORMAL .7N
|
||||
|
||||
[printer:*1.0nozzle*]
|
||||
nozzle_diameter = 1.0
|
||||
max_layer_height = 0.8
|
||||
min_layer_height = 0.15
|
||||
printer_variant = 1.0
|
||||
default_print_profile = 0.5mm
|
||||
default_print_profile = 0.50mm NORMAL 1N
|
||||
|
||||
[printer:*1.2nozzle*]
|
||||
nozzle_diameter = 1.2
|
||||
max_layer_height = 1.0
|
||||
min_layer_height = 0.2
|
||||
printer_variant = 1.0
|
||||
default_print_profile = 0.5mm
|
||||
printer_variant = 1.2
|
||||
default_print_profile = 0.50mm NORMAL 1.2N
|
||||
|
||||
[printer:Basic 0.15 nozzle]
|
||||
inherits = *common*; *0.15nozzle*
|
||||
@ -181,18 +182,26 @@ bridge_angle = 0
|
||||
bridge_flow_ratio = 80%
|
||||
over_bridge_flow_ratio = 105%
|
||||
fill_top_flow_ratio = 100%
|
||||
bottom_fill_pattern = concentricgapfill
|
||||
bridge_speed = 20
|
||||
brim_inside_holes = 0
|
||||
brim_width = 0
|
||||
brim_width_interior = 0
|
||||
brim_ears = 1
|
||||
brim_ears_max_angle = 120
|
||||
clip_multipart_objects = 1
|
||||
compatible_printers =
|
||||
complete_objects = 0
|
||||
curve_smoothing_precision = 0
|
||||
curve_smoothing_angle_convex = 170
|
||||
curve_smoothing_angle_concave = 170
|
||||
curve_smoothing_cutoff_dist = 2
|
||||
default_acceleration = 1000
|
||||
dont_support_bridges = 1
|
||||
ensure_vertical_shell_thickness = 1
|
||||
top_fill_pattern = smooth
|
||||
bottom_fill_pattern = concentricgapfill
|
||||
external_perimeters_first = 0
|
||||
extra_perimeters = 0
|
||||
extra_perimeters_odd_layers = 0
|
||||
only_one_perimeter_top = 1
|
||||
elefant_foot_compensation = -0.05
|
||||
extruder_clearance_height = 20
|
||||
@ -201,7 +210,7 @@ fill_angle = 45
|
||||
fill_density = 13%
|
||||
fill_pattern = gyroid
|
||||
first_layer_acceleration = 1000
|
||||
first_layer_height = 100%
|
||||
first_layer_height = 75%
|
||||
first_layer_speed = 30
|
||||
gap_fill_speed = 40
|
||||
gcode_comments = 0
|
||||
@ -215,7 +224,7 @@ infill_extruder = 1
|
||||
infill_first = 0
|
||||
infill_not_connected = 0
|
||||
infill_only_where_needed = 0
|
||||
infill_overlap = 25%
|
||||
infill_overlap = 20%
|
||||
interface_shells = 0
|
||||
label_printed_objects = 1
|
||||
max_print_speed = 100
|
||||
@ -247,6 +256,7 @@ spiral_vase = 0
|
||||
standby_temperature_delta = -5
|
||||
support_material = 0
|
||||
support_material_extruder = 0
|
||||
support_material_extrusion_width = 110%
|
||||
support_material_interface_extruder = 0
|
||||
support_material_angle = 0
|
||||
support_material_buildplate_only = 0
|
||||
@ -269,6 +279,7 @@ support_material_xy_spacing = 60%
|
||||
thin_walls = 1
|
||||
thin_walls_min_width = 50%
|
||||
thin_walls_overlap = 50%
|
||||
top_fill_pattern = smooth
|
||||
top_solid_infill_speed = 40
|
||||
travel_speed = 180
|
||||
wipe_tower = 0
|
||||
|
@ -5,7 +5,7 @@
|
||||
name = Creality ENDER3 (fan-made)
|
||||
# Configuration version of this file. Config file will only be installed, if the config_version differs.
|
||||
# This means, the server may force the Slic3r configuration to be downgraded.
|
||||
config_version = 0.1.0
|
||||
config_version = 0.1.2
|
||||
# Where to get the updates from?
|
||||
config_update_url =
|
||||
|
||||
@ -16,7 +16,7 @@ config_update_url =
|
||||
# Printer model name will be shown by the installation wizard.
|
||||
[printer_model:ENDER-3]
|
||||
name = Creality ENDER-3
|
||||
variants = 0.4; 0.2; 0.6
|
||||
variants = 0.4; 0.2; 0.6; 0.4 manual MMU
|
||||
|
||||
[printer_model:CR-10]
|
||||
name = Creality CR-10
|
||||
@ -31,7 +31,6 @@ extruder_offset = 0x0
|
||||
gcode_flavor = marlin
|
||||
before_layer_gcode = ;BEFORE_LAYER_CHANGE\nG92 E0.0\n;[layer_z]\n\n
|
||||
layer_gcode = ;AFTER_LAYER_CHANGE\n;[layer_z]
|
||||
nozzle_diameter = 0.4
|
||||
host_type = octoprint
|
||||
octoprint_apikey =
|
||||
octoprint_host =
|
||||
@ -48,7 +47,6 @@ retract_restart_extra = 0
|
||||
retract_restart_extra_toolchange = 0
|
||||
retract_speed = 35
|
||||
start_gcode = M115 U3.1.0 ; tell printer latest fw version\nM83 ; extruder relative mode\nM204 S[machine_max_acceleration_extruding] T[machine_max_acceleration_retracting] ; ENDER3 firmware may only supports the old M204 format\nG28 W ; home all\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG1 Y-3.0 F1000.0 ; go outside print area\nG92 E0.0\nG1 X150.0 E20 F1000.0 ; intro line\nG92 E0.0
|
||||
toolchange_gcode =
|
||||
use_firmware_retraction = 0
|
||||
use_relative_e_distances = 0
|
||||
use_volumetric_e = 0
|
||||
@ -80,7 +78,7 @@ default_print_profile = 0.32mm NORMAL 0.6 nozzle
|
||||
|
||||
[printer:*ENDER-3*]
|
||||
inherits = *common*
|
||||
bed_shape = 0x0,220x0,220x220,0x220
|
||||
bed_shape = 0x0,232x0,232x232,0x232
|
||||
max_print_height = 250
|
||||
printer_model = ENDER-3
|
||||
machine_max_acceleration_e = 5000
|
||||
@ -111,6 +109,30 @@ retract_speed = 40
|
||||
default_print_profile = 0.16mm NORMAL 0.4 nozzle
|
||||
default_filament_profile = Creality PLA
|
||||
|
||||
[printer:ENDER-3 0.4N MMU (manual)]
|
||||
inherits = *ENDER-3*; *0.4nozzle*
|
||||
nozzle_diameter = 0.4
|
||||
retract_before_travel = 0.5
|
||||
retract_length = 6
|
||||
retract_speed = 40
|
||||
default_print_profile = 0.16mm NORMAL 0.4 nozzle
|
||||
default_filament_profile = Creality PLA
|
||||
nozzle_diameter = 0.4
|
||||
max_layer_height = 0.32
|
||||
min_layer_height = 0.07
|
||||
printer_variant = 0.4 manual MMU
|
||||
default_print_profile = 0.16mm NORMAL 0.4 nozzle
|
||||
single_extruder_multi_material_priming = 1
|
||||
toolchange_gcode = M600
|
||||
retract_layer_change = 0
|
||||
retract_restart_extra = 0
|
||||
retract_restart_extra_toolchange = 0
|
||||
retract_speed = 80
|
||||
parking_pos_retraction = 200
|
||||
cooling_tube_length = 10
|
||||
cooling_tube_retraction = 100
|
||||
nozzle_diameter = 0.4,0.4,0.4
|
||||
|
||||
[printer:ENDER-3 0.2 nozzle]
|
||||
inherits = *ENDER-3*; *0.2nozzle*
|
||||
nozzle_diameter = 0.4
|
||||
@ -167,28 +189,36 @@ bridge_acceleration = 1000
|
||||
bridge_angle = 0
|
||||
bridge_flow_ratio = 0.8
|
||||
over_bridge_flow_ratio = 1.1
|
||||
fill_top_flow_ratio = 100%
|
||||
bottom_fill_pattern = rectilineargapfill
|
||||
bridge_speed = 20
|
||||
brim_inside_holes = 0
|
||||
brim_width = 0
|
||||
brim_width_interior = 0
|
||||
brim_ears = 1
|
||||
brim_ears_max_angle = 120
|
||||
clip_multipart_objects = 1
|
||||
compatible_printers =
|
||||
complete_objects = 0
|
||||
curve_smoothing_precision = 0
|
||||
curve_smoothing_angle_convex = 170
|
||||
curve_smoothing_angle_concave = 170
|
||||
curve_smoothing_cutoff_dist = 2
|
||||
default_acceleration = 1000
|
||||
dont_support_bridges = 1
|
||||
ensure_vertical_shell_thickness = 1
|
||||
top_fill_pattern = smooth
|
||||
bottom_fill_pattern = rectilinear
|
||||
external_perimeters_first = 0
|
||||
extra_perimeters = 0
|
||||
only_one_perimeter_top = 0
|
||||
extra_perimeters_odd_layers = 0
|
||||
only_one_perimeter_top = 1
|
||||
elefant_foot_compensation = -0.05
|
||||
extruder_clearance_height = 20
|
||||
extruder_clearance_radius = 20
|
||||
fill_angle = 45
|
||||
fill_density = 20%
|
||||
fill_density = 13%
|
||||
fill_pattern = gyroid
|
||||
first_layer_acceleration = 1000
|
||||
first_layer_extrusion_width = 140%
|
||||
first_layer_height = 100%
|
||||
first_layer_height = 75%
|
||||
first_layer_speed = 30
|
||||
gap_fill_speed = 40
|
||||
gcode_comments = 0
|
||||
@ -200,7 +230,7 @@ infill_every_layers = 1
|
||||
infill_extruder = 1
|
||||
infill_first = 0
|
||||
infill_only_where_needed = 0
|
||||
infill_overlap = 25%
|
||||
infill_overlap = 22%
|
||||
interface_shells = 0
|
||||
label_printed_objects = 1
|
||||
max_print_speed = 100
|
||||
@ -232,7 +262,6 @@ spiral_vase = 0
|
||||
standby_temperature_delta = -5
|
||||
support_material = 0
|
||||
support_material_extruder = 0
|
||||
support_material_extrusion_width = 0.35
|
||||
support_material_interface_extruder = 0
|
||||
support_material_angle = 0
|
||||
support_material_buildplate_only = 0
|
||||
@ -255,6 +284,7 @@ support_material_xy_spacing = 60%
|
||||
thin_walls = 1
|
||||
thin_walls_min_width = 50%
|
||||
thin_walls_overlap = 50%
|
||||
top_fill_pattern = smooth
|
||||
top_solid_infill_speed = 40
|
||||
travel_speed = 180
|
||||
wipe_tower = 1
|
||||
@ -264,6 +294,14 @@ wipe_tower_width = 60
|
||||
wipe_tower_x = 180
|
||||
wipe_tower_y = 140
|
||||
xy_size_compensation = 0
|
||||
extrusion_width = 110%
|
||||
external_perimeter_extrusion_width = 105%
|
||||
first_layer_extrusion_width = 140%
|
||||
infill_extrusion_width = 110%
|
||||
perimeter_extrusion_width = 110%
|
||||
solid_infill_extrusion_width = 110%
|
||||
top_infill_extrusion_width = 110%
|
||||
support_material_extrusion_width = 110%
|
||||
|
||||
# Print parameters common to a 0.2mm diameter nozzle.
|
||||
[print:*0.2nozzle*]
|
||||
@ -280,6 +318,7 @@ support_material_interface_layers = 0
|
||||
support_material_interface_spacing = 0.15
|
||||
support_material_spacing = 1
|
||||
support_material_xy_spacing = 150%
|
||||
first_layer_height = 0.16
|
||||
|
||||
# Print parameters common to a 0.2mm diameter nozzle.
|
||||
[print:*0.4nozzle*]
|
||||
@ -296,6 +335,7 @@ support_material_interface_layers = 0
|
||||
support_material_interface_spacing = 0.15
|
||||
support_material_spacing = 1
|
||||
support_material_xy_spacing = 150%
|
||||
first_layer_height = 0.24
|
||||
|
||||
# Print parameters common to a 0.2mm diameter nozzle.
|
||||
[print:*0.6nozzle*]
|
||||
@ -312,6 +352,7 @@ support_material_interface_layers = 0
|
||||
support_material_interface_spacing = 0.2
|
||||
support_material_spacing = 1.2
|
||||
support_material_xy_spacing = 150%
|
||||
first_layer_height = 0.32
|
||||
|
||||
# Print parameters common to a 0.8mm diameter nozzle.
|
||||
[print:*0.8nozzle*]
|
||||
@ -323,13 +364,13 @@ infill_extrusion_width = 0.85
|
||||
perimeter_extrusion_width = 0.85
|
||||
solid_infill_extrusion_width = 0.85
|
||||
top_infill_extrusion_width = 0.85
|
||||
first_layer_height = 0.48
|
||||
|
||||
[print:*0.08mm*]
|
||||
inherits = *common*
|
||||
bottom_solid_layers = 7
|
||||
top_solid_layers = 9
|
||||
layer_height = 0.08
|
||||
first_layer_height = 0.24
|
||||
bridge_flow_ratio = 0.7
|
||||
perimeter_acceleration = 400
|
||||
|
||||
@ -338,7 +379,14 @@ inherits = *common*
|
||||
bottom_solid_layers = 5
|
||||
top_solid_layers = 6
|
||||
layer_height = 0.16
|
||||
first_layer_height = 0.24
|
||||
bridge_flow_ratio = 0.9
|
||||
|
||||
|
||||
[print:*0.24mm*]
|
||||
inherits = *common*
|
||||
bottom_solid_layers = 4
|
||||
top_solid_layers = 5
|
||||
layer_height = 0.24
|
||||
bridge_flow_ratio = 0.9
|
||||
|
||||
[print:*0.32mm*]
|
||||
@ -346,7 +394,6 @@ inherits = *common*
|
||||
bottom_solid_layers = 3
|
||||
top_solid_layers = 4
|
||||
layer_height = 0.32
|
||||
first_layer_height = 0.24
|
||||
bridge_flow_ratio = 0.9
|
||||
|
||||
[print:*0.48mm*]
|
||||
@ -354,7 +401,6 @@ inherits = *common*
|
||||
bottom_solid_layers = 2
|
||||
top_solid_layers = 3
|
||||
layer_height = 0.48
|
||||
first_layer_height = 0.24
|
||||
bridge_flow_ratio = 0.9
|
||||
|
||||
[print:0.08mm DETAIL 0.2 nozzle]
|
||||
@ -416,6 +462,24 @@ compatible_printers_condition = printer_notes=~/.*creality.*/ and nozzle_diamete
|
||||
inherits = *0.16mm*; *0.8nozzle*
|
||||
compatible_printers_condition = printer_notes=~/.*creality.*/ and nozzle_diameter[0]==0.8
|
||||
|
||||
|
||||
[print:0.24mm NORMAL 0.2 nozzle]
|
||||
inherits = *0.24mm*; *0.2nozzle*
|
||||
compatible_printers_condition = printer_notes=~/.*creality.*/ and nozzle_diameter[0]==0.2
|
||||
fill_pattern = grid
|
||||
|
||||
[print:0.24mm NORMAL 0.4 nozzle]
|
||||
inherits = *0.24mm*; *0.4nozzle*
|
||||
compatible_printers_condition = printer_notes=~/.*creality.*/ and nozzle_diameter[0]==0.4
|
||||
|
||||
[print:0.24mm FINE 0.6 nozzle]
|
||||
inherits = *0.24mm*; *0.6nozzle*
|
||||
compatible_printers_condition = printer_notes=~/.*creality.*/ and nozzle_diameter[0]==0.6
|
||||
|
||||
[print:0.24mm FINE 0.8 nozzle]
|
||||
inherits = *0.24mm*; *0.8nozzle*
|
||||
compatible_printers_condition = printer_notes=~/.*creality.*/ and nozzle_diameter[0]==0.8
|
||||
|
||||
[print:0.32mm SPEED 0.4 nozzle]
|
||||
inherits = *0.32mm*; *0.4nozzle*
|
||||
compatible_printers_condition = printer_notes=~/.*creality.*/ and nozzle_diameter[0]==0.4
|
||||
|
@ -10,7 +10,7 @@ technologies = FFF; SLA
|
||||
# This means, the server may force the PrusaSlicer configuration to be downgraded.
|
||||
config_version = 1.0.1
|
||||
# Where to get the updates from?
|
||||
config_update_url = http://files.prusa3d.com/wp-content/uploads/repository/PrusaSlicer-settings-master/live/PrusaResearch/
|
||||
config_update_url =
|
||||
changelog_url = http://files.prusa3d.com/?latest=slicer-profiles&lng=%1%
|
||||
|
||||
# The printer models will be shown by the Configuration Wizard in this order,
|
||||
@ -181,7 +181,9 @@ support_material_synchronize_layers = 0
|
||||
support_material_threshold = 55
|
||||
support_material_with_sheath = 0
|
||||
support_material_xy_spacing = 50%
|
||||
thin_walls = 0
|
||||
thin_walls = 1
|
||||
thin_walls_min_width = 100%
|
||||
thin_walls_overlap = 50%
|
||||
top_infill_extrusion_width = 0.45
|
||||
top_solid_infill_speed = 40
|
||||
travel_speed = 180
|
||||
|
@ -287,7 +287,7 @@ void PrintConfigDef::init_fff_params()
|
||||
def->tooltip = L("Horizontal width of the brim that will be printed inside each object on the first layer.");
|
||||
def->sidetext = L("mm");
|
||||
def->min = 0;
|
||||
def->mode = comSimple;
|
||||
def->mode = comAdvanced;
|
||||
def->set_default_value(new ConfigOptionFloat(0));
|
||||
|
||||
def = this->add("brim_ears", coBool);
|
||||
|
@ -342,6 +342,13 @@ void ConfigManipulation::toggle_print_fff_options(DynamicPrintConfig* config)
|
||||
bool have_wipe_tower = config->opt_bool("wipe_tower");
|
||||
for (auto el : { "wipe_tower_x", "wipe_tower_y", "wipe_tower_width", "wipe_tower_rotation_angle", "wipe_tower_bridging" })
|
||||
toggle_field(el, have_wipe_tower);
|
||||
|
||||
|
||||
for (auto el : { "fill_smooth_width", "fill_smooth_distribution" })
|
||||
toggle_field(el, (have_solid_infill && (config->option<ConfigOptionEnum<InfillPattern>>("top_fill_pattern")->value == InfillPattern::ipSmooth
|
||||
|| config->option<ConfigOptionEnum<InfillPattern>>("bottom_fill_pattern")->value == InfillPattern::ipSmooth
|
||||
|| config->option<ConfigOptionEnum<InfillPattern>>("solid_fill_pattern")->value == InfillPattern::ipSmooth))
|
||||
|| (config->option<ConfigOptionEnum<InfillPattern>>("support_material_interface_pattern")->value == InfillPattern::ipSmooth && have_support_material));
|
||||
}
|
||||
|
||||
void ConfigManipulation::update_print_sla_config(DynamicPrintConfig* config, const bool is_global_config/* = false*/)
|
||||
|
@ -42,7 +42,7 @@ static wxString generate_html_row(const Config::Snapshot &snapshot, bool row_eve
|
||||
text += " (" + wxString::FromUTF8(snapshot.comment.data()) + ")";
|
||||
text += "</b></font><br>";
|
||||
// End of row header.
|
||||
text += _(L("PrusaSlicer version")) + ": " + snapshot.slic3r_version_captured.to_string() + "<br>";
|
||||
text += _(L("Slic3r++ version")) + ": " + snapshot.slic3r_version_captured.to_string() + "<br>";
|
||||
text += _(L("print")) + ": " + snapshot.print + "<br>";
|
||||
text += _(L("filaments")) + ": " + snapshot.filaments.front() + "<br>";
|
||||
text += _(L("printer")) + ": " + snapshot.printer + "<br>";
|
||||
@ -50,9 +50,9 @@ static wxString generate_html_row(const Config::Snapshot &snapshot, bool row_eve
|
||||
bool compatible = true;
|
||||
for (const Config::Snapshot::VendorConfig &vc : snapshot.vendor_configs) {
|
||||
text += _(L("vendor")) + ": " + vc.name +", " + _(L("version")) + ": " + vc.version.config_version.to_string() +
|
||||
", " + _(L("min PrusaSlicer version")) + ": " + vc.version.min_slic3r_version.to_string();
|
||||
", " + _(L("min Slic3r++ version")) + ": " + vc.version.min_slic3r_version.to_string();
|
||||
if (vc.version.max_slic3r_version != Semver::inf())
|
||||
text += ", " + _(L("max PrusaSlicer version")) + ": " + vc.version.max_slic3r_version.to_string();
|
||||
text += ", " + _(L("max Slic3r++ version")) + ": " + vc.version.max_slic3r_version.to_string();
|
||||
text += "<br>";
|
||||
for (const std::pair<std::string, std::set<std::string>> &model : vc.models_variants_installed) {
|
||||
text += _(L("model")) + ": " + model.first + ", " + _(L("variants")) + ": ";
|
||||
|
@ -349,7 +349,7 @@ PagePrinters::PagePrinters(ConfigWizard *parent, wxString title, wxString shortn
|
||||
|
||||
if (check_first_variant) {
|
||||
// Select the default (first) model/variant on the Prusa vendor
|
||||
picker->select_one(0, true);
|
||||
//picker->select_one(0, true);
|
||||
check_first_variant = false;
|
||||
}
|
||||
|
||||
|
@ -270,15 +270,15 @@ void GLCanvas3DManager::init_gl()
|
||||
if (! s_gl_info.is_version_greater_or_equal_to(2, 0)) {
|
||||
// Complain about the OpenGL version.
|
||||
wxString message = wxString::Format(
|
||||
_(L("PrusaSlicer requires OpenGL 2.0 capable graphics driver to run correctly, \n"
|
||||
_(L("Slic3r++ requires OpenGL 2.0 capable graphics driver to run correctly, \n"
|
||||
"while OpenGL version %s, render %s, vendor %s was detected.")), wxString(s_gl_info.get_version()), wxString(s_gl_info.get_renderer()), wxString(s_gl_info.get_vendor()));
|
||||
message += "\n";
|
||||
message += _(L("You may need to update your graphics card driver."));
|
||||
#ifdef _WIN32
|
||||
message += "\n";
|
||||
message += _(L("As a workaround, you may run PrusaSlicer with a software rendered 3D graphics by running prusa-slicer.exe with the --sw_renderer parameter."));
|
||||
message += _(L("As a workaround, you may run Slic3r++ with a software rendered 3D graphics by running prusa-slicer.exe with the --sw_renderer parameter."));
|
||||
#endif
|
||||
wxMessageBox(message, wxString("PrusaSlicer - ") + _(L("Unsupported OpenGL version")), wxOK | wxICON_ERROR);
|
||||
wxMessageBox(message, wxString("Slic3r++ - ") + _(L("Unsupported OpenGL version")), wxOK | wxICON_ERROR);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -655,7 +655,7 @@ bool GUI_App::load_language(wxString language, bool initial)
|
||||
// Get the active language from PrusaSlicer.ini, or empty string if the key does not exist.
|
||||
language = app_config->get("translation_language");
|
||||
if (! language.empty())
|
||||
BOOST_LOG_TRIVIAL(trace) << boost::format("translation_language provided by PrusaSlicer.ini: %1%") % language;
|
||||
BOOST_LOG_TRIVIAL(trace) << boost::format("translation_language provided by Slic3r++.ini: %1%") % language;
|
||||
|
||||
// Get the system language.
|
||||
{
|
||||
@ -671,7 +671,7 @@ bool GUI_App::load_language(wxString language, bool initial)
|
||||
wxLocale temp_locale;
|
||||
// Set the current translation's language to default, otherwise GetBestTranslation() may not work (see the wxWidgets source code).
|
||||
wxTranslations::Get()->SetLanguage(wxLANGUAGE_DEFAULT);
|
||||
// Let the wxFileTranslationsLoader enumerate all translation dictionaries for PrusaSlicer
|
||||
// Let the wxFileTranslationsLoader enumerate all translation dictionaries for Slic3r++
|
||||
// and try to match them with the system specific "preferred languages".
|
||||
// There seems to be a support for that on Windows and OSX, while on Linuxes the code just returns wxLocale::GetSystemLanguage().
|
||||
// The last parameter gets added to the list of detected dictionaries. This is a workaround
|
||||
@ -693,7 +693,7 @@ bool GUI_App::load_language(wxString language, bool initial)
|
||||
}
|
||||
|
||||
if (language_info != nullptr && language_info->LayoutDirection == wxLayout_RightToLeft) {
|
||||
BOOST_LOG_TRIVIAL(trace) << boost::format("The following language code requires right to left layout, which is not supported by PrusaSlicer: %1%") % language_info->CanonicalName.ToUTF8().data();
|
||||
BOOST_LOG_TRIVIAL(trace) << boost::format("The following language code requires right to left layout, which is not supported by Slic3r++: %1%") % language_info->CanonicalName.ToUTF8().data();
|
||||
language_info = nullptr;
|
||||
}
|
||||
|
||||
@ -718,14 +718,14 @@ bool GUI_App::load_language(wxString language, bool initial)
|
||||
|
||||
if (! wxLocale::IsAvailable(language_info->Language)) {
|
||||
// Loading the language dictionary failed.
|
||||
wxString message = "Switching PrusaSlicer to language " + language_info->CanonicalName + " failed.";
|
||||
wxString message = "Switching Slic3r++ to language " + language_info->CanonicalName + " failed.";
|
||||
#if !defined(_WIN32) && !defined(__APPLE__)
|
||||
// likely some linux system
|
||||
message += "\nYou may need to reconfigure the missing locales, likely by running the \"locale-gen\" and \"dpkg-reconfigure locales\" commands.\n";
|
||||
#endif
|
||||
if (initial)
|
||||
message + "\n\nApplication will close.";
|
||||
wxMessageBox(message, "PrusaSlicer - Switching language failed", wxOK | wxICON_ERROR);
|
||||
wxMessageBox(message, "Slic3r++ - Switching language failed", wxOK | wxICON_ERROR);
|
||||
if (initial)
|
||||
std::exit(EXIT_FAILURE);
|
||||
else
|
||||
|
@ -152,7 +152,7 @@ public:
|
||||
// Translate the language code to a code, for which Prusa Research maintains translations. Defaults to "en_US".
|
||||
wxString current_language_code_safe() const;
|
||||
|
||||
virtual bool OnExceptionInMainLoop();
|
||||
virtual bool OnExceptionInMainLoop() override;
|
||||
|
||||
#ifdef __APPLE__
|
||||
// wxWidgets override to get an event on open files.
|
||||
|
Loading…
x
Reference in New Issue
Block a user