3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/prusa3d/slic3r

Browse source
This commit is contained in:
bubnikv 2018-05-11 16:03:18 +02:00
commit 4a99fe6d84
3 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
resources/profiles/PrusaResearch.idx
View file

@ -1 +1,3 @@
0.1.2 Wipe tower changes
0.1.1 Minor print speed adjustments
0.1.0 Initial 0.1.0 Initial

23
resources/profiles/PrusaResearch.ini
View file

@ -5,7 +5,7 @@
name = Prusa Research name = Prusa Research
# Configuration version of this file. Config file will only be installed, if the config_version differs. # 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. # 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? # Where to get the updates from?
config_update_url = https://raw.githubusercontent.com/prusa3d/Slic3r-settings/master/live/PrusaResearch/ config_update_url = https://raw.githubusercontent.com/prusa3d/Slic3r-settings/master/live/PrusaResearch/
@ -90,7 +90,7 @@ seam_position = nearest
skirts = 1 skirts = 1
skirt_distance = 2 skirt_distance = 2
skirt_height = 3 skirt_height = 3
small_perimeter_speed = 20 small_perimeter_speed = 25
solid_infill_below_area = 0 solid_infill_below_area = 0
solid_infill_every_layers = 0 solid_infill_every_layers = 0
solid_infill_extruder = 1 solid_infill_extruder = 1
@ -180,7 +180,7 @@ gap_fill_speed = 20
infill_acceleration = 800 infill_acceleration = 800
infill_speed = 30 infill_speed = 30
max_print_speed = 80 max_print_speed = 80
small_perimeter_speed = 15 small_perimeter_speed = 20
solid_infill_speed = 30 solid_infill_speed = 30
support_material_extrusion_width = 0.3 support_material_extrusion_width = 0.3
support_material_spacing = 1.5 support_material_spacing = 1.5
@ -215,7 +215,7 @@ infill_speed = 20
max_print_speed = 100 max_print_speed = 100
perimeter_extrusion_width = 0 perimeter_extrusion_width = 0
perimeter_speed = 20 perimeter_speed = 20
small_perimeter_speed = 10 small_perimeter_speed = 15
solid_infill_extrusion_width = 0 solid_infill_extrusion_width = 0
solid_infill_speed = 20 solid_infill_speed = 20
support_material_speed = 20 support_material_speed = 20
@ -268,7 +268,7 @@ infill_acceleration = 1600
infill_speed = 40 infill_speed = 40
perimeter_acceleration = 600 perimeter_acceleration = 600
perimeter_speed = 25 perimeter_speed = 25
small_perimeter_speed = 10 small_perimeter_speed = 15
solid_infill_speed = 40 solid_infill_speed = 40
top_solid_infill_speed = 30 top_solid_infill_speed = 30
@ -341,7 +341,7 @@ infill_acceleration = 1600
infill_speed = 40 infill_speed = 40
perimeter_acceleration = 600 perimeter_acceleration = 600
perimeter_speed = 25 perimeter_speed = 25
small_perimeter_speed = 10 small_perimeter_speed = 15
solid_infill_speed = 40 solid_infill_speed = 40
support_material_extrusion_width = 0.2 support_material_extrusion_width = 0.2
top_solid_infill_speed = 30 top_solid_infill_speed = 30
@ -549,7 +549,7 @@ filament_diameter = 1.75
filament_notes = "" filament_notes = ""
filament_settings_id = filament_settings_id =
filament_soluble = 0 filament_soluble = 0
min_print_speed = 5 min_print_speed = 15
slowdown_below_layer_time = 20 slowdown_below_layer_time = 20
start_filament_gcode = "M900 K{if printer_notes=~/.*PRINTER_HAS_BOWDEN.*/}200{else}30{endif}; Filament gcode" start_filament_gcode = "M900 K{if printer_notes=~/.*PRINTER_HAS_BOWDEN.*/}200{else}30{endif}; Filament gcode"
@ -643,7 +643,6 @@ first_layer_bed_temperature = 105
first_layer_temperature = 270 first_layer_temperature = 270
max_fan_speed = 20 max_fan_speed = 20
min_fan_speed = 10 min_fan_speed = 10
min_print_speed = 5
start_filament_gcode = "M900 K{if printer_notes=~/.*PRINTER_HAS_BOWDEN.*/}200{else}45{endif}; Filament gcode" start_filament_gcode = "M900 K{if printer_notes=~/.*PRINTER_HAS_BOWDEN.*/}200{else}45{endif}; Filament gcode"
temperature = 270 temperature = 270
@ -657,7 +656,6 @@ extrusion_multiplier = 1.2
filament_colour = #804040 filament_colour = #804040
filament_max_volumetric_speed = 10 filament_max_volumetric_speed = 10
first_layer_temperature = 200 first_layer_temperature = 200
min_print_speed = 5
start_filament_gcode = "M900 K{if printer_notes=~/.*PRINTER_HAS_BOWDEN.*/}200{else}10{endif}; Filament gcode" start_filament_gcode = "M900 K{if printer_notes=~/.*PRINTER_HAS_BOWDEN.*/}200{else}10{endif}; Filament gcode"
temperature = 200 temperature = 200
@ -823,7 +821,6 @@ first_layer_bed_temperature = 60
first_layer_temperature = 240 first_layer_temperature = 240
max_fan_speed = 5 max_fan_speed = 5
min_fan_speed = 0 min_fan_speed = 0
min_print_speed = 5
start_filament_gcode = "M900 K{if printer_notes=~/.*PRINTER_HAS_BOWDEN.*/}200{else}10{endif}; Filament gcode" start_filament_gcode = "M900 K{if printer_notes=~/.*PRINTER_HAS_BOWDEN.*/}200{else}10{endif}; Filament gcode"
temperature = 250 temperature = 250
@ -856,7 +853,6 @@ first_layer_bed_temperature = 60
first_layer_temperature = 215 first_layer_temperature = 215
max_fan_speed = 100 max_fan_speed = 100
min_fan_speed = 100 min_fan_speed = 100
min_print_speed = 15
start_filament_gcode = "M900 K{if printer_notes=~/.*PRINTER_HAS_BOWDEN.*/}200{else}10{endif}; Filament gcode" start_filament_gcode = "M900 K{if printer_notes=~/.*PRINTER_HAS_BOWDEN.*/}200{else}10{endif}; Filament gcode"
temperature = 210 temperature = 210
@ -877,7 +873,6 @@ first_layer_bed_temperature = 100
first_layer_temperature = 220 first_layer_temperature = 220
max_fan_speed = 100 max_fan_speed = 100
min_fan_speed = 100 min_fan_speed = 100
min_print_speed = 15
start_filament_gcode = "M900 K{if printer_notes=~/.*PRINTER_HAS_BOWDEN.*/}200{else}10{endif}; Filament gcode" start_filament_gcode = "M900 K{if printer_notes=~/.*PRINTER_HAS_BOWDEN.*/}200{else}10{endif}; Filament gcode"
temperature = 220 temperature = 220
@ -938,11 +933,11 @@ retract_lift_below = 199
retract_restart_extra = 0 retract_restart_extra = 0
retract_restart_extra_toolchange = 0 retract_restart_extra_toolchange = 0
retract_speed = 80 retract_speed = 80
single_extruder_multi_material = 1
printer_model = MK2SMM
parking_pos_retraction = 92 parking_pos_retraction = 92
cooling_tube_length = 5 cooling_tube_length = 5
cooling_tube_retraction = 91.5 cooling_tube_retraction = 91.5
single_extruder_multi_material = 1
printer_model = MK2SMM
[printer:*mm-single*] [printer:*mm-single*]
inherits = *multimaterial* inherits = *multimaterial*

9
xs/src/slic3r/GUI/Field.cpp
View file

@ -183,14 +183,21 @@ namespace Slic3r { namespace GUI {
//! to allow the default handling //! to allow the default handling
event.Skip(); event.Skip();
//! eliminating the g-code pop up text description //! eliminating the g-code pop up text description
temp->GetToolTip()->Enable(false); bool flag = false;
#ifdef __WXGTK__
// I have no idea why, but on GTK flag works in other way
flag = true;
#endif // __WXGTK__
temp->GetToolTip()->Enable(flag);
}), temp->GetId()); }), temp->GetId());
#if !defined(__WXGTK__)
temp->Bind(wxEVT_KILL_FOCUS, ([this, temp](wxEvent& e) temp->Bind(wxEVT_KILL_FOCUS, ([this, temp](wxEvent& e)
{ {
e.Skip();// on_kill_focus(e); e.Skip();// on_kill_focus(e);
temp->GetToolTip()->Enable(true); temp->GetToolTip()->Enable(true);
}), temp->GetId()); }), temp->GetId());
#endif // __WXGTK__
temp->Bind(wxEVT_TEXT, ([this](wxCommandEvent) { on_change_field(); }), temp->GetId()); temp->Bind(wxEVT_TEXT, ([this](wxCommandEvent) { on_change_field(); }), temp->GetId());