From 85645a12530ed730742f86ce710eef7567e55da1 Mon Sep 17 00:00:00 2001 From: YuSanka Date: Mon, 9 Dec 2019 13:01:20 +0100 Subject: [PATCH] Fixed crash on ConfigWizard opening after a language change + updated Creality.ini and PrusaResearch.ini --- resources/profiles/Creality.ini | 11 +- resources/profiles/PrusaResearch.ini | 220 +++++++++++++++++++++------ src/slic3r/GUI/GUI_App.cpp | 3 + 3 files changed, 183 insertions(+), 51 deletions(-) diff --git a/resources/profiles/Creality.ini b/resources/profiles/Creality.ini index 340235aed..4ebf99d32 100644 --- a/resources/profiles/Creality.ini +++ b/resources/profiles/Creality.ini @@ -259,9 +259,8 @@ inherits = *PLA* # alias = Generic PLA filament_vendor = Generic -[filament:Generic PET @ENDER3] +[filament:Generic PETG @ENDER3] inherits = *PET* -# alias = Generic PET filament_vendor = Generic [filament:Generic ABS @ENDER3] @@ -280,9 +279,9 @@ bed_temperature = 40 first_layer_temperature = 210 first_layer_bed_temperature =40 -[filament:Creality PET @ENDER3] +[filament:Creality PETG @ENDER3] inherits = *PET* -# alias = Creality PET +# alias = Creality PETG filament_vendor = Creality temperature = 240 bed_temperature = 70 @@ -303,7 +302,7 @@ first_layer_bed_temperature =90 [filament:Prusament PLA @ENDER3] inherits = *PLA* # alias = Prusament PLA -filament_vendor = Prusa Research +filament_vendor = Prusa Polymers temperature = 215 bed_temperature = 40 first_layer_temperature = 215 @@ -314,7 +313,7 @@ filament_density = 1.24 [filament:Prusament PETG @ENDER3] inherits = *PET* # alias = Prusament PETG -filament_vendor = Prusa Research +filament_vendor = Prusa Polymers temperature = 245 bed_temperature = 70 first_layer_temperature = 245 diff --git a/resources/profiles/PrusaResearch.ini b/resources/profiles/PrusaResearch.ini index 9d3277d8d..aefff5c85 100644 --- a/resources/profiles/PrusaResearch.ini +++ b/resources/profiles/PrusaResearch.ini @@ -1715,7 +1715,7 @@ filament_type = ASA [filament:Prusament ASA] inherits = *ABS* -filament_vendor = Prusa Research +filament_vendor = Prusa Polymers filament_cost = 35.28 filament_density = 1.07 fan_always_on = 1 @@ -1763,14 +1763,36 @@ inherits = *ABS* filament_vendor = Generic filament_cost = 27.82 filament_density = 1.04 -filament_notes = "List of materials tested with standard ABS print settings:\n\nEsun ABS\nFil-A-Gehr ABS\nHatchboxABS\nPlasty Mladec ABS" -[filament:Generic PET] +[filament:Esun ABS] +inherits = *ABS* +filament_vendor = Esun +filament_cost = 27.82 +filament_density = 1.04 + +[filament:Hatchbox ABS] +inherits = *ABS* +filament_vendor = Hatchbox +filament_cost = 27.82 +filament_density = 1.04 + +[filament:Plasty Mladec ABS] +inherits = *ABS* +filament_vendor = Plasty Mladec +filament_cost = 27.82 +filament_density = 1.04 + +[filament:Generic PETG] inherits = *PET* filament_vendor = Generic filament_cost = 27.82 filament_density = 1.27 -filament_notes = "List of manufacturers tested with standard PET print settings:\n\nE3D Edge\nFillamentum CPE GH100\nPlasty Mladec PETG" + +[filament:Plasty Mladec PETG] +inherits = *PET* +filament_vendor = Plasty Mladec +filament_cost = 27.82 +filament_density = 1.27 [filament:Generic PLA] inherits = *PLA* @@ -1899,7 +1921,7 @@ filament_vendor = Generic [filament:Prusament ASA @MMU2] inherits = *ABS MMU2* # alias = Prusament ASA -filament_vendor = Prusa Research +filament_vendor = Prusa Polymers filament_cost = 35.28 filament_density = 1.07 fan_always_on = 1 @@ -1925,6 +1947,10 @@ inherits = *ABS MMU2* # alias = Prusa ABS filament_vendor = Made for Prusa +[filament:Plasty Mladec ABS @MMU2] +inherits = *ABS MMU2* +filament_vendor = Plasty Mladec + [filament:Prusa HIPS] inherits = *ABS* filament_vendor = Made for Prusa @@ -1944,17 +1970,17 @@ min_fan_speed = 20 start_filament_gcode = "M900 K{if printer_notes=~/.*PRINTER_MODEL_MINI.*/}0{elsif printer_notes=~/.*PRINTER_HAS_BOWDEN.*/}0{else}10{endif}; Filament gcode" temperature = 220 -[filament:Prusa PET] +[filament:Prusa PETG] inherits = *PET* filament_vendor = Made for Prusa filament_cost = 27.82 filament_density = 1.27 -filament_notes = "List of manufacturers tested with standard PET print settings:\n\nE3D Edge\nPlasty Mladec PETG" +filament_notes = "List of manufacturers tested with standard PETG print settings:\n\nE3D Edge\nPlasty Mladec PETG" compatible_printers_condition = nozzle_diameter[0]!=0.6 and printer_model!="MK2SMM" and printer_model!="MINI" and ! (printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK(2.5|3).*/ and single_extruder_multi_material) [filament:Prusament PETG] inherits = *PET* -filament_vendor = Prusa Research +filament_vendor = Prusa Polymers first_layer_temperature = 240 temperature = 250 filament_cost = 24.99 @@ -1962,18 +1988,26 @@ filament_density = 1.27 filament_type = PETG compatible_printers_condition = nozzle_diameter[0]!=0.6 and printer_model!="MK2SMM" and printer_model!="MINI" and ! (printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK(2.5|3).*/ and single_extruder_multi_material) -[filament:Prusa PET @0.6 nozzle] +[filament:Prusa PETG @0.6 nozzle] inherits = *PET06* -# alias = Prusa PET +# alias = Prusa PETG filament_vendor = Made for Prusa filament_cost = 27.82 filament_density = 1.27 -filament_notes = "List of manufacturers tested with standard PET print settings:\n\nE3D Edge\nPlasty Mladec PETG" +filament_notes = "List of manufacturers tested with standard PETG print settings:\n\nE3D Edge\nPlasty Mladec PETG" [filament:Prusament PETG @0.6 nozzle] inherits = *PET06* -# alias = Prusament PETG -filament_vendor = Prusa Research +filament_vendor = Prusa Polymers +first_layer_temperature = 240 +temperature = 250 +filament_cost = 24.99 +filament_density = 1.27 +filament_type = PETG + +[filament:Plasty Mladec PETG @0.6 nozzle] +inherits = *PET06* +filament_vendor = Plasty Mladec first_layer_temperature = 240 temperature = 250 filament_cost = 24.99 @@ -1981,7 +2015,7 @@ filament_density = 1.27 filament_type = PETG [filament:*PET MMU2*] -inherits = Prusa PET +inherits = Prusa PETG compatible_printers_condition = nozzle_diameter[0]!=0.6 and printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK(2.5|3).*/ and single_extruder_multi_material temperature = 230 first_layer_temperature = 230 @@ -2004,48 +2038,105 @@ inherits = *PET MMU2* compatible_printers_condition = nozzle_diameter[0]==0.6 and printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK(2.5|3).*/ and single_extruder_multi_material filament_max_volumetric_speed = 13 -[filament:Generic PET @MMU2] +[filament:Generic PETG @MMU2] inherits = *PET MMU2* -# alias = Generic PET +# alias = Generic PETG filament_vendor = Generic -[filament:Prusa PET @MMU2] +[filament:Plasty Mladec PETG @MMU2] inherits = *PET MMU2* -# alias = Prusa PET +filament_vendor = Plasty Mladec + +[filament:Prusa PETG @MMU2] +inherits = *PET MMU2* +# alias = Prusa PETG filament_vendor = Made for Prusa [filament:Prusament PETG @MMU2] inherits = *PET MMU2* filament_type = PETG # alias = Prusament PETG -filament_vendor = Prusa Research +filament_vendor = Prusa Polymers -[filament:Generic PET @MMU2 0.6 nozzle] +[filament:Generic PETG @MMU2 0.6 nozzle] inherits = *PET MMU2 06* -# alias = Generic PET +# alias = Generic PETG filament_vendor = Generic -[filament:Prusa PET @MMU2 0.6 nozzle] +[filament:Prusa PETG @MMU2 0.6 nozzle] inherits = *PET MMU2 06* -# alias = Prusa PET +# alias = Prusa PETG filament_vendor = Made for Prusa [filament:Prusament PETG @MMU2 0.6 nozzle] inherits = *PET MMU2 06* filament_type = PETG # alias = Prusament PETG -filament_vendor = Prusa Research +filament_vendor = Prusa Polymers + +[filament:Plasty Mladec PETG @MMU2 0.6 nozzle] +inherits = *PET MMU2 06* +filament_type = PETG +# alias = Prusament PETG +filament_vendor = Plasty Mladec [filament:Prusa PLA] inherits = *PLA* filament_vendor = Made for Prusa filament_cost = 25.4 filament_density = 1.24 -filament_notes = "List of materials tested with standard PLA print settings:\n\nDas Filament\nEsun PLA\nEUMAKERS PLA\nFiberlogy HD-PLA\nFiberlogy PLA\nFloreon3D\nHatchbox PLA\nPlasty Mladec PLA\nPrimavalue PLA\nProto pasta Matte Fiber\nAmazonBasics PLA" + +[filament:Fiberlogy PLA] +inherits = *PLA* +filament_vendor = Fiberlogy +filament_cost = 25.4 +filament_density = 1.24 + +[filament:Plasty Mladec PLA] +inherits = *PLA* +filament_vendor = Plasty Mladec +filament_cost = 25.4 +filament_density = 1.24 + +[filament:AmazonBasics PLA] +inherits = *PLA* +filament_vendor = AmazonBasics +filament_cost = 25.4 +filament_density = 1.24 + +[filament:Hatchbox PLA] +inherits = *PLA* +filament_vendor = Hatchbox +filament_cost = 25.4 +filament_density = 1.24 + +[filament:Esun PLA] +inherits = *PLA* +filament_vendor = Esun +filament_cost = 25.4 +filament_density = 1.24 + +[filament:Das Filament PLA] +inherits = *PLA* +filament_vendor = Das Filament +filament_cost = 25.4 +filament_density = 1.24 + +[filament:EUMAKERS PLA] +inherits = *PLA* +filament_vendor = EUMAKERS +filament_cost = 25.4 +filament_density = 1.24 + +[filament:Floreon3D PLA] +inherits = *PLA* +filament_vendor = Floreon3D +filament_cost = 25.4 +filament_density = 1.24 [filament:Prusament PLA] inherits = *PLA* -filament_vendor = Prusa Research +filament_vendor = Prusa Polymers temperature = 215 filament_cost = 24.99 filament_density = 1.24 @@ -2077,7 +2168,7 @@ filament_vendor = Made for Prusa [filament:Prusament PLA @MMU2] inherits = *PLA MMU2* -filament_vendor = Prusa Research +filament_vendor = Prusa Polymers [filament:SemiFlex or Flexfill 98A] inherits = *FLEX* @@ -2300,7 +2391,7 @@ filament_vendor = E3D filament_cost = 56.9 filament_density = 1.26 filament_type = EDGE -filament_notes = "List of manufacturers tested with standard PET print settings:\n\nE3D Edge\nFillamentum CPE GH100\nPlasty Mladec PETG" +filament_notes = "List of manufacturers tested with standard PETG print settings:\n\nE3D Edge\nFillamentum CPE GH100\nPlasty Mladec PETG" [filament:Fillamentum CPE @MMU1] inherits = *PETMMU1* @@ -2315,26 +2406,32 @@ max_fan_speed = 50 min_fan_speed = 50 temperature = 275 -[filament:Generic PET @MMU1] +[filament:Generic PETG @MMU1] inherits = *PETMMU1* -# alias = Generic PET +# alias = Generic PETG filament_vendor = Generic filament_cost = 27.82 filament_density = 1.27 -filament_notes = "List of manufacturers tested with standard PET print settings:\n\nE3D Edge\nFillamentum CPE GH100\nPlasty Mladec PETG" -[filament:Prusa PET @MMU1] +[filament:Plasty Mladec PETG @MMU1] inherits = *PETMMU1* -# alias = Prusa PET +# alias = Generic PETG +filament_vendor = Plasty Mladec +filament_cost = 27.82 +filament_density = 1.27 + +[filament:Prusa PETG @MMU1] +inherits = *PETMMU1* +# alias = Prusa PETG filament_vendor = Made for Prusa filament_cost = 27.82 filament_density = 1.27 -filament_notes = "List of manufacturers tested with standard PET print settings:\n\nE3D Edge\nPlasty Mladec PETG" +filament_notes = "List of manufacturers tested with standard PETG print settings:\n\nE3D Edge\nPlasty Mladec PETG" [filament:Prusament PETG @MMU1] inherits = *PETMMU1* # alias = Prusament PETG -filament_vendor = Prusa Research +filament_vendor = Prusa Polymers first_layer_temperature = 240 temperature = 250 filament_cost = 24.99 @@ -2381,21 +2478,49 @@ compatible_printers_condition = printer_model=="MK2SMM" ## Filaments MINI -[filament:Generic PET @MINI] -inherits = Generic PET; *PETMINI* -# alias = Generic PET +[filament:Generic PETG @MINI] +inherits = Generic PETG; *PETMINI* +filament_vendor = Generic +# alias = Generic PETG +filament_cost = 27.82 +filament_density = 1.27 +compatible_printers_condition = printer_model=="MINI" and nozzle_diameter[0]!=0.6 + +[filament:Plasty Mladec PETG @MINI] +inherits = Generic PETG; *PETMINI* +filament_vendor = Plasty Mladec filament_cost = 27.82 filament_density = 1.27 compatible_printers_condition = printer_model=="MINI" and nozzle_diameter[0]!=0.6 [filament:Generic ABS @MINI] inherits = Generic ABS; *ABSMINI* +filament_vendor = Generic # alias = Generic ABS filament_cost = 27.82 filament_density = 1.08 +[filament:Esun ABS @MINI] +inherits = Generic ABS; *ABSMINI* +filament_vendor = Esun +filament_cost = 27.82 +filament_density = 1.08 + +[filament:Hatchbox ABS @MINI] +inherits = Generic ABS; *ABSMINI* +filament_vendor = Hatchbox +filament_cost = 27.82 +filament_density = 1.08 + +[filament:Plasty Mladec ABS @MINI] +inherits = Generic ABS; *ABSMINI* +filament_vendor = Plasty Mladec +filament_cost = 27.82 +filament_density = 1.08 + [filament:Prusament PETG @MINI] inherits = Prusament PETG; *PETMINI* +filament_vendor = Prusa Polymers # alias = Prusament PETG first_layer_temperature = 240 temperature = 250 @@ -2411,9 +2536,14 @@ temperature = 250 filament_density = 1.27 filament_cost = 24.99 -[filament:Generic PET @0.6 nozzle MINI] -inherits = Generic PET; *PETMINI06* -# alias = Generic PET +[filament:Generic PETG @0.6 nozzle MINI] +inherits = Generic PETG; *PETMINI06* +# alias = Generic PETG + +[filament:Plasty Mladec PETG @0.6 nozzle MINI] +inherits = Generic PETG; *PETMINI06* +filament_vendor = Plasty Mladec +# alias = Generic PETG [filament:Prusament ASA @MINI] inherits = Prusament ASA; *ABSMINI* @@ -2684,17 +2814,17 @@ filament_cost = 56.9 filament_density = 1.26 filament_type = EDGE -[filament:Prusa PET @MINI] +[filament:Prusa PETG @MINI] inherits = *PETMINI* -# alias = Prusa PET +# alias = Prusa PETG filament_vendor = Made for Prusa filament_cost = 27.82 filament_density = 1.27 compatible_printers_condition = printer_model=="MINI" and nozzle_diameter[0]!=0.6 -[filament:Prusa PET @0.6 nozzle MINI] +[filament:Prusa PETG @0.6 nozzle MINI] inherits = *PETMINI06* -# alias = Prusa PET +# alias = Prusa PETG filament_vendor = Made for Prusa filament_cost = 27.82 filament_density = 1.27 diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp index 71448cb05..e02dd5f6e 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -466,6 +466,9 @@ void GUI_App::recreate_GUI() dlg.Update(30, _(L("Recreating")) + dots); topwindow->Destroy(); + + // For this moment ConfigWizard is deleted, invalidate it + m_wizard = nullptr; } dlg.Update(80, _(L("Loading of current presets")) + dots);