amd/orcaslicer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge branch 'master-remote' into SoftFever

Browse source 
# Conflicts:
#	bbl/i18n/BambuStudio.pot
#	bbl/i18n/de/BambuStudio_de.po
#	bbl/i18n/en/BambuStudio_en.po
#	bbl/i18n/es/BambuStudio_es.po
#	bbl/i18n/fr/BambuStudio_fr.po
#	bbl/i18n/hu/BambuStudio_hu.po
#	bbl/i18n/nl/BambuStudio_nl.po
#	bbl/i18n/sv/BambuStudio_sv.po
#	bbl/i18n/zh_cn/BambuStudio_zh_CN.po
#	resources/i18n/de/BambuStudio.mo
#	resources/i18n/en/BambuStudio.mo
#	resources/i18n/es/BambuStudio.mo
#	resources/i18n/fr/BambuStudio.mo
#	resources/i18n/hu/BambuStudio.mo
#	resources/i18n/nl/BambuStudio.mo
#	resources/i18n/sv/BambuStudio.mo
#	resources/i18n/zh_cn/BambuStudio.mo
#	resources/profiles/BBL.json
#	resources/profiles/Creality.json
#	resources/profiles/Voron.json
#	src/libslic3r/PrintConfig.cpp
#	src/libslic3r/TreeSupport.cpp
#	src/slic3r/GUI/DeviceManager.cpp
#	src/slic3r/GUI/ReleaseNote.cpp
#	version.inc
This commit is contained in:
SoftFever 2022-12-31 15:15:58 +08:00
commit 260156648d
104 changed files with 12137 additions and 1384 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

106
bbl/i18n/BambuStudio.pot
View file

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-12-13 20:02+0800\n"
"POT-Creation-Date: 2022-12-24 13:01+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -1328,6 +1328,9 @@ msgstr ""
msgid "An SD card needs to be inserted before printing via LAN."
msgstr ""
msgid "Failed to send the print job. Please try again."
msgstr ""
msgid "Send to Printer failed. Please try again."
msgstr ""
@ -1770,8 +1773,8 @@ msgid ""
msgstr ""
msgid ""
"Spiral mode only works when wall loops is 1, \n"
"support is disabled, top shell layers is 0 and sparse infill density is 0\n"
"Spiral mode only works when wall loops is 1, support is disabled, top shell "
"layers is 0, sparse infill density is 0 and timelapse type is traditional"
msgstr ""
msgid ""
@ -3098,6 +3101,12 @@ msgstr ""
msgid "Undo integration was successful."
msgstr ""
msgid "New network plug-in available."
msgstr ""
msgid "Details"
msgstr ""
msgid "Undo integration failed."
msgstr ""
@ -4229,6 +4238,30 @@ msgid ""
"model without prime tower. Do you want to enable prime tower?"
msgstr ""
msgid ""
"We have added an experimental style \"Tree Slim\" that features smaller "
"support volume but weaker strength.\n"
"We recommand using it with: 0 interface layers, 0 top distance, 2 walls."
msgstr ""
msgid ""
"Change these settings automatically? \n"
"Yes - Change these settings automatically\n"
"No - Do not change these settings for me"
msgstr ""
msgid ""
"For \"Tree Strong\" and \"Tree Hybrid\" styles, we recommand the following "
"settings: at least 2 interface layers, at least 0.1 top z distance or using "
"support materials on interface."
msgstr ""
msgid ""
"When using support material for the support interface, We recommand the "
"following settings:\n"
"0 top distance, 0 interface spacing, concentric pattern."
msgstr ""
msgid ""
"When recording timelapse without toolhead, it is recommended to add a "
"\"Timelapse Wipe Tower\" \n"
@ -4943,6 +4976,17 @@ msgstr ""
msgid "version %s update information :"
msgstr ""
msgid "Network plug-in update"
msgstr ""
msgid ""
"Click OK to update the Network plug-in when Bambu Studio launches next time."
msgstr ""
#, possible-c-format, possible-boost-format
msgid "A new Network plug-in(%s) available, Do you want to install it?"
msgstr ""
msgid "New version of Bambu Studio"
msgstr ""
@ -5583,20 +5627,6 @@ msgstr ""
msgid "Bridge flow"
msgstr ""
msgid "Top surface flow ratio"
msgstr ""
msgid "Bottom surface flow ratio"
msgstr ""
msgid "This factor affects the amount of material for bottom solid infill"
msgstr ""
msgid ""
"This factor affects the amount of material for top solid infill. "
"You can decrease it slightly to have smooth surface finish"
msgstr ""
msgid ""
"Decrease this value slightly(for example 0.9) to reduce the amount of "
"material for bridge, to improve sag"
@ -5605,19 +5635,11 @@ msgstr ""
msgid "Only one wall on top surfaces"
msgstr ""
msgid "Only one wall on first layer"
msgstr ""
msgid ""
"Use only one wall on flat top surface, to give more space to the top infill "
"pattern"
msgstr ""
msgid ""
"Use only one wall on first layer, to give more space to the bottom infill "
"pattern"
msgstr ""
msgid "Slow down for overhang"
msgstr ""
@ -6698,7 +6720,8 @@ msgstr ""
msgid ""
"normal(auto) and tree(auto) is used to generate support automatically. If "
"normal or tree is selected, only support enforcers are generated"
"normal(manual) or tree(manual) is selected, only support enforcers are "
"generated"
msgstr ""
msgid "normal(auto)"
@ -6707,9 +6730,6 @@ msgstr ""
msgid "tree(auto)"
msgstr ""
msgid "hybrid(auto)"
msgstr ""
msgid "normal(manual)"
msgstr ""
@ -6754,9 +6774,12 @@ msgstr ""
msgid "The z gap between the bottom support interface and object"
msgstr ""
msgid "Support base"
msgstr ""
msgid ""
"Filament to print support and raft. \"Default\" means no specific filament "
"for support and current filament is used"
"Filament to print support base and raft. \"Default\" means no specific "
"filament for support and current filament is used"
msgstr ""
msgid "Line width of support"
@ -6807,6 +6830,9 @@ msgstr ""
msgid "Rectilinear grid"
msgstr ""
msgid "Hollow"
msgstr ""
msgid "Interface pattern"
msgstr ""
@ -6834,9 +6860,27 @@ msgstr ""
msgid "Style"
msgstr ""
msgid ""
"Style and shape of the support. For normal support, projecting the supports "
"into a regular grid will create more stable supports (default), while snug "
"support towers will save material and reduce object scarring.\n"
"For tree support, tight style will merge branches more aggressively and save "
"a lot of material (default), while hybrid style will create similar "
"structure to normal support under large flat overhangs."
msgstr ""
msgid "Snug"
msgstr ""
msgid "Tree Slim"
msgstr ""
msgid "Tree Strong"
msgstr ""
msgid "Tree Hybrid"
msgstr ""
msgid "Independent support layer height"
msgstr ""

226
bbl/i18n/de/BambuStudio_de.po
View file

@ -2,16 +2,13 @@ msgid ""
msgstr ""
"Project-Id-Version: Bambu Studio\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-12-13 20:02+0800\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
"POT-Creation-Date: 2022-12-24 13:01+0800\n"
"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Localazy (https://localazy.com)\n"
"Plural-Forms: nplurals=2; plural=(n==1) ? 0 : 1;\n"
"X-Generator: Poedit 3.1\n"
msgid "Supports Painting"
msgstr "Supports aufmalen"
@ -1395,6 +1392,9 @@ msgstr ""
msgid "An SD card needs to be inserted before printing via LAN."
msgstr ""
msgid "Failed to send the print job. Please try again."
msgstr ""
msgid "Send to Printer failed. Please try again."
msgstr ""
@ -1903,12 +1903,9 @@ msgstr ""
"Der Wert wird auf 0 zurückgesetzt."
msgid ""
"Spiral mode only works when wall loops is 1, \n"
"support is disabled, top shell layers is 0 and sparse infill density is 0\n"
"Spiral mode only works when wall loops is 1, support is disabled, top shell "
"layers is 0, sparse infill density is 0 and timelapse type is traditional"
msgstr ""
"Der Spiralmodus funktioniert nur, wenn die Wand 1 Linienweite breit sind, \n"
"Support ist deaktiviert, die oberen Schalenschichten sind 0 und die Dichte "
"der Füllung ist 0\n"
msgid ""
"Change these settings automatically? \n"
@ -3259,6 +3256,12 @@ msgstr "Die Integration ist gescheitert."
msgid "Undo integration was successful."
msgstr "Die Rückgängigmachung der Integration war erfolgreich."
msgid "New network plug-in available."
msgstr ""
msgid "Details"
msgstr ""
msgid "Undo integration failed."
msgstr "Die Rückgängigmachung der Integration war nicht erfolgreich."
@ -3558,11 +3561,11 @@ msgstr "Sie sollten Ihre Software aktualisieren.\n"
msgid "Newer 3mf version"
msgstr "Neuere 3mf-Version"
#, c-format, boost-format
#, fuzzy, c-format, boost-format
msgid ""
"The 3mf's version %s is newer than %s's version %s, Suggest to upgrade your "
"software.\n"
msgstr ""
msgstr "\n"
msgid "The 3mf is not compatible, load geometry data only!"
msgstr ""
@ -3843,9 +3846,9 @@ msgid ""
"on Bambu Studio(windows) or CAD softwares."
msgstr ""
#, c-format, boost-format
#, fuzzy, c-format, boost-format
msgid "Plate %d: %s does not support filament %s (%s).\n"
msgstr ""
msgstr "\n"
msgid "Switching the language requires application restart.\n"
msgstr "Der Wechsel der Sprache erfordert einen Neustart der Anwendung.\n"
@ -4442,6 +4445,30 @@ msgid ""
"model without prime tower. Do you want to enable prime tower?"
msgstr ""
msgid ""
"We have added an experimental style \"Tree Slim\" that features smaller "
"support volume but weaker strength.\n"
"We recommand using it with: 0 interface layers, 0 top distance, 2 walls."
msgstr ""
msgid ""
"Change these settings automatically? \n"
"Yes - Change these settings automatically\n"
"No - Do not change these settings for me"
msgstr ""
msgid ""
"For \"Tree Strong\" and \"Tree Hybrid\" styles, we recommand the following "
"settings: at least 2 interface layers, at least 0.1 top z distance or using "
"support materials on interface."
msgstr ""
msgid ""
"When using support material for the support interface, We recommand the "
"following settings:\n"
"0 top distance, 0 interface spacing, concentric pattern."
msgstr ""
msgid ""
"When recording timelapse without toolhead, it is recommended to add a "
"\"Timelapse Wipe Tower\" \n"
@ -5213,6 +5240,17 @@ msgstr ""
msgid "version %s update information :"
msgstr ""
msgid "Network plug-in update"
msgstr ""
msgid ""
"Click OK to update the Network plug-in when Bambu Studio launches next time."
msgstr ""
#, c-format, boost-format
msgid "A new Network plug-in(%s) available, Do you want to install it?"
msgstr ""
msgid "New version of Bambu Studio"
msgstr "Neue Version von Bambu Studio"
@ -5635,9 +5673,9 @@ msgstr ""
msgid "Layer height cannot exceed nozzle diameter"
msgstr "Schichthöhe kann Druckdüsendurchmesser nicht überschreiten"
#, c-format, boost-format
#, fuzzy, c-format, boost-format
msgid "Plate %d: %s does not support filament %s\n"
msgstr ""
msgstr "\n"
msgid "Generating skirt & brim"
msgstr "Erzeugen von Schürze und Rand (skirt & brim)"
@ -7169,11 +7207,9 @@ msgstr "Support-Erzeugung aktivieren."
msgid ""
"normal(auto) and tree(auto) is used to generate support automatically. If "
"normal or tree is selected, only support enforcers are generated"
"normal(manual) or tree(manual) is selected, only support enforcers are "
"generated"
msgstr ""
"Normal(automatisch) und Baum(automatisch) wird verwendet, um automatischen "
"Support zu erzeugen. Wenn Normal oder Baum ausgewählt ist, werden nur "
"Support Enforcer erzeugt"
msgid "normal(auto)"
msgstr "Normal(automatisch)"
@ -7181,9 +7217,6 @@ msgstr "Normal(automatisch)"
msgid "tree(auto)"
msgstr "Baum(automatisch)"
msgid "hybrid(auto)"
msgstr "Hybrid(automatisch)"
msgid "normal(manual)"
msgstr ""
@ -7232,9 +7265,12 @@ msgstr ""
msgid "The z gap between the bottom support interface and object"
msgstr ""
msgid "Support base"
msgstr ""
msgid ""
"Filament to print support and raft. \"Default\" means no specific filament "
"for support and current filament is used"
"Filament to print support base and raft. \"Default\" means no specific "
"filament for support and current filament is used"
msgstr ""
msgid "Line width of support"
@ -7288,6 +7324,9 @@ msgstr "Linienmuster der Supports"
msgid "Rectilinear grid"
msgstr "Rechtwinkliges Gitter"
msgid "Hollow"
msgstr ""
msgid "Interface pattern"
msgstr "Schnittstellenmuster"
@ -7318,9 +7357,27 @@ msgstr "Druckgeschwindigkeit für Supports"
msgid "Style"
msgstr "Stil"
msgid ""
"Style and shape of the support. For normal support, projecting the supports "
"into a regular grid will create more stable supports (default), while snug "
"support towers will save material and reduce object scarring.\n"
"For tree support, tight style will merge branches more aggressively and save "
"a lot of material (default), while hybrid style will create similar "
"structure to normal support under large flat overhangs."
msgstr ""
msgid "Snug"
msgstr "Nahtlos"
msgid "Tree Slim"
msgstr ""
msgid "Tree Strong"
msgstr ""
msgid "Tree Hybrid"
msgstr ""
msgid "Independent support layer height"
msgstr "Unabhängige Support-Schichthöhe"
@ -7988,55 +8045,6 @@ msgid ""
"density to improve the strength of the model?"
msgstr ""
#~ msgid "Choose one or more files (3mf/step/stl/obj/amf):"
#~ msgstr "Wählen sie eine oder mer Dateien (3mf/step/stl/obj/amf):"
#~ msgid "Import 3MF/STL/STEP/OBJ/AMF"
#~ msgstr "Importiere 3MF/STL/STEP/OBJ/AMF"
#~ msgid "Part Cooling"
#~ msgstr "BAuteilkühlung"
#~ msgid "Aux Cooling"
#~ msgstr "Hilfskühlung"
#~ msgid ""
#~ "Filament to print support and skirt. 0 means no specific filament for "
#~ "support and current filament is used"
#~ msgstr ""
#~ "Filament für den Druck der Supports und der Umrandung. 0 bedeutet, dass "
#~ "kein spezielles Filament für den Support und das aktuelle Filament wird "
#~ "verwendet"
#~ msgid ""
#~ "Filament to print support interface. 0 means no specific filament for "
#~ "support interface and current filament is used"
#~ msgstr ""
#~ "Filament zum Drucken der Support-Schnittstelle. 0 bedeutet, dass kein "
#~ "spezielles Filament für die Support-Schnittstelle vorhanden ist und das "
#~ "aktuelle Filament verwendet wird"
#~ msgid "Repair"
#~ msgstr "Reparieren"
#~ msgid "Repair the model's meshes if it is non-manifold mesh"
#~ msgstr ""
#~ "Reparieren Sie die Maschen des Modells, wenn es sich um nicht-verzweigte "
#~ "Maschen handelt"
#~ msgid "Monitoring Recording"
#~ msgstr "Überwachung der Aufzeichnung"
#~ msgid "Tree support with infill"
#~ msgstr "Baumsupport mit Füllung"
#~ msgid ""
#~ "This setting specifies whether to add infill inside large hollows of tree "
#~ "support"
#~ msgstr ""
#~ "Diese Einstellung legt fest, ob in großen Hohlräumen von Baumsupports "
#~ "Füllmaterial hinzugefügt werden soll"
#~ msgid ""
#~ "\n"
#~ "%1% is too close to exclusion area, there will be collisions when "
@ -8078,6 +8086,9 @@ msgstr ""
#~ "Wenn es ausgewählte Objekte gibt, werden nur die ausgewählten Objekte "
#~ "ausgerichtet, ansonsten werden alle Objekte im Projekt ausgerichtet."
#~ msgid "Aux Cooling"
#~ msgstr "Hilfskühlung"
#~ msgid "Avoid crossing wall when travel"
#~ msgstr "Vermeiden Sie das Überqueren von Mauern während der Fahrt"
@ -8090,6 +8101,9 @@ msgstr ""
#~ "dieses Filaments.\n"
#~ "Dies kann zu einer Verstopfung der Düse und zu Druckfehlern führen"
#~ msgid "Choose one or more files (3mf/step/stl/obj/amf):"
#~ msgstr "Wählen sie eine oder mer Dateien (3mf/step/stl/obj/amf):"
#~ msgid "Clear all"
#~ msgstr "Alles löschen"
@ -8201,6 +8215,22 @@ msgstr ""
#~ msgid "Filament N XX"
#~ msgstr "Filament N XX"
#~ msgid ""
#~ "Filament to print support and skirt. 0 means no specific filament for "
#~ "support and current filament is used"
#~ msgstr ""
#~ "Filament für den Druck der Supports und der Umrandung. 0 bedeutet, dass "
#~ "kein spezielles Filament für den Support und das aktuelle Filament wird "
#~ "verwendet"
#~ msgid ""
#~ "Filament to print support interface. 0 means no specific filament for "
#~ "support interface and current filament is used"
#~ msgstr ""
#~ "Filament zum Drucken der Support-Schnittstelle. 0 bedeutet, dass kein "
#~ "spezielles Filament für die Support-Schnittstelle vorhanden ist und das "
#~ "aktuelle Filament verwendet wird"
#~ msgid "Filaments Selection"
#~ msgstr "Auswahl der Filamente"
@ -8251,6 +8281,9 @@ msgstr ""
#~ "automatische Anordnung verwendet, um Kollisionen zu vermeiden, wenn "
#~ "Objekt für Objekt gedruckt wird"
#~ msgid "Import 3MF/STL/STEP/OBJ/AMF"
#~ msgstr "Importiere 3MF/STL/STEP/OBJ/AMF"
#~ msgid "In the calibration of extrusion flow"
#~ msgstr "Kalibrierung des Materialflusses"
@ -8292,6 +8325,9 @@ msgstr ""
#~ msgid "Monitoring"
#~ msgstr "Überwachung"
#~ msgid "Monitoring Recording"
#~ msgstr "Überwachung der Aufzeichnung"
#~ msgid "Open"
#~ msgstr "Öffnen"
@ -8304,6 +8340,9 @@ msgstr ""
#~ msgid "Output file"
#~ msgstr "Ausgabedatei"
#~ msgid "Part Cooling"
#~ msgstr "BAuteilkühlung"
#~ msgid "Pause(heated bed temperature error)"
#~ msgstr "Pause (Temperaturfehler beim Heizbett)"
@ -8385,6 +8424,14 @@ msgstr ""
#~ msgid "Reload items"
#~ msgstr "Elemente neu laden"
#~ msgid "Repair"
#~ msgstr "Reparieren"
#~ msgid "Repair the model's meshes if it is non-manifold mesh"
#~ msgstr ""
#~ "Reparieren Sie die Maschen des Modells, wenn es sich um nicht-verzweigte "
#~ "Maschen handelt"
#~ msgid "Report"
#~ msgstr "Bericht"
@ -8418,6 +8465,16 @@ msgstr ""
#~ msgid "Spiral mode"
#~ msgstr "Spiralförmiger Modus"
#~ msgid ""
#~ "Spiral mode only works when wall loops is 1, \n"
#~ "support is disabled, top shell layers is 0 and sparse infill density is "
#~ "0\n"
#~ msgstr ""
#~ "Der Spiralmodus funktioniert nur, wenn die Wand 1 Linienweite breit "
#~ "sind, \n"
#~ "Support ist deaktiviert, die oberen Schalenschichten sind 0 und die "
#~ "Dichte der Füllung ist 0\n"
#~ msgid "Successfully sent.Will automatically jump to the device page in %s s"
#~ msgstr "Erfolgreich gesendet, springt automatisch zur Geräteseite in %s"
@ -8475,6 +8532,13 @@ msgstr ""
#~ "säubern, um Filament zu sparen und die Druckzeit zu verkürzen. Die Farben "
#~ "der Objekte werden als Ergebnis gemischt"
#~ msgid ""
#~ "This setting specifies whether to add infill inside large hollows of tree "
#~ "support"
#~ msgstr ""
#~ "Diese Einstellung legt fest, ob in großen Hohlräumen von Baumsupports "
#~ "Füllmaterial hinzugefügt werden soll"
#~ msgid ""
#~ "This setting stands for how much volume of filament can be melted and "
#~ "extruded per second. Printing speed is limited by max volumetric speed, "
@ -8491,6 +8555,9 @@ msgstr ""
#~ msgid "Translation"
#~ msgstr "Übersetzung"
#~ msgid "Tree support with infill"
#~ msgstr "Baumsupport mit Füllung"
#~ msgid "Unable to create zip file"
#~ msgstr "ZIP-Datei kann nicht erstellt werden"
@ -8525,9 +8592,20 @@ msgstr ""
#~ msgid " is too close to others, there will be collisions when printing.\n"
#~ msgstr " zu nahe an anderen, es kommt beim Drucken zu Kollisionen.\n"
#~ msgid "hybrid(auto)"
#~ msgstr "Hybrid(automatisch)"
#~ msgid "normal"
#~ msgstr "Normal"
#~ msgid ""
#~ "normal(auto) and tree(auto) is used to generate support automatically. If "
#~ "normal or tree is selected, only support enforcers are generated"
#~ msgstr ""
#~ "Normal(automatisch) und Baum(automatisch) wird verwendet, um "
#~ "automatischen Support zu erzeugen. Wenn Normal oder Baum ausgewählt ist, "
#~ "werden nur Support Enforcer erzeugt"
#~ msgid "the 3mf is not compatible, load geometry data only!"
#~ msgstr "die 3mf ist nicht kompatibel, laden Sie nur Geometriedaten!"

910
bbl/i18n/en/BambuStudio_en.po
View file

File diff suppressed because it is too large Load diff

224
bbl/i18n/es/BambuStudio_es.po
View file

@ -2,16 +2,13 @@ msgid ""
msgstr ""
"Project-Id-Version: Bambu Studio\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-12-13 20:02+0800\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
"POT-Creation-Date: 2022-12-24 13:01+0800\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Localazy (https://localazy.com)\n"
"Plural-Forms: nplurals=2; plural=(n==1) ? 0 : 1;\n"
"X-Generator: Poedit 3.1\n"
msgid "Supports Painting"
msgstr "Pintando Soportes"
@ -1392,6 +1389,9 @@ msgstr ""
msgid "An SD card needs to be inserted before printing via LAN."
msgstr ""
msgid "Failed to send the print job. Please try again."
msgstr ""
msgid "Send to Printer failed. Please try again."
msgstr ""
@ -1896,12 +1896,9 @@ msgstr ""
"El valor se restablecerá a 0."
msgid ""
"Spiral mode only works when wall loops is 1, \n"
"support is disabled, top shell layers is 0 and sparse infill density is 0\n"
"Spiral mode only works when wall loops is 1, support is disabled, top shell "
"layers is 0, sparse infill density is 0 and timelapse type is traditional"
msgstr ""
"El modo espiral sólo funciona cuando los bucles de pared son 1, \n"
"el soporte está desactivado, las capas superiores de la cáscara es 0 y la "
"densidad de relleno dispersa es 0\n"
msgid ""
"Change these settings automatically? \n"
@ -3257,6 +3254,12 @@ msgstr "La integración ha fallado."
msgid "Undo integration was successful."
msgstr "La operación de deshacer se ha realizado con éxito."
msgid "New network plug-in available."
msgstr ""
msgid "Details"
msgstr ""
msgid "Undo integration failed."
msgstr "La operación de deshacer ha fallado."
@ -3557,11 +3560,11 @@ msgstr "Será mejor que actualices tu software.\n"
msgid "Newer 3mf version"
msgstr "Nueva versión 3mf"
#, c-format, boost-format
#, fuzzy, c-format, boost-format
msgid ""
"The 3mf's version %s is newer than %s's version %s, Suggest to upgrade your "
"software.\n"
msgstr ""
msgstr "\n"
msgid "The 3mf is not compatible, load geometry data only!"
msgstr ""
@ -3844,9 +3847,9 @@ msgid ""
"on Bambu Studio(windows) or CAD softwares."
msgstr ""
#, c-format, boost-format
#, fuzzy, c-format, boost-format
msgid "Plate %d: %s does not support filament %s (%s).\n"
msgstr ""
msgstr "\n"
msgid "Switching the language requires application restart.\n"
msgstr "El cambio de idioma requiere el reinicio de la aplicación.\n"
@ -4439,6 +4442,30 @@ msgid ""
"model without prime tower. Do you want to enable prime tower?"
msgstr ""
msgid ""
"We have added an experimental style \"Tree Slim\" that features smaller "
"support volume but weaker strength.\n"
"We recommand using it with: 0 interface layers, 0 top distance, 2 walls."
msgstr ""
msgid ""
"Change these settings automatically? \n"
"Yes - Change these settings automatically\n"
"No - Do not change these settings for me"
msgstr ""
msgid ""
"For \"Tree Strong\" and \"Tree Hybrid\" styles, we recommand the following "
"settings: at least 2 interface layers, at least 0.1 top z distance or using "
"support materials on interface."
msgstr ""
msgid ""
"When using support material for the support interface, We recommand the "
"following settings:\n"
"0 top distance, 0 interface spacing, concentric pattern."
msgstr ""
msgid ""
"When recording timelapse without toolhead, it is recommended to add a "
"\"Timelapse Wipe Tower\" \n"
@ -5204,6 +5231,17 @@ msgstr ""
msgid "version %s update information :"
msgstr ""
msgid "Network plug-in update"
msgstr ""
msgid ""
"Click OK to update the Network plug-in when Bambu Studio launches next time."
msgstr ""
#, c-format, boost-format
msgid "A new Network plug-in(%s) available, Do you want to install it?"
msgstr ""
msgid "New version of Bambu Studio"
msgstr "Nueva versión de Bambu Studio"
@ -5625,9 +5663,9 @@ msgstr ""
msgid "Layer height cannot exceed nozzle diameter"
msgstr "La altura de la capa no puede superar el diámetro de la boquilla"
#, c-format, boost-format
#, fuzzy, c-format, boost-format
msgid "Plate %d: %s does not support filament %s\n"
msgstr ""
msgstr "\n"
msgid "Generating skirt & brim"
msgstr "Generando falda y ala"
@ -7160,10 +7198,9 @@ msgstr "Habilitar la generación de soporte."
msgid ""
"normal(auto) and tree(auto) is used to generate support automatically. If "
"normal or tree is selected, only support enforcers are generated"
"normal(manual) or tree(manual) is selected, only support enforcers are "
"generated"
msgstr ""
"normal(auto) y tree(auto) se utiliza para generar soporte automáticamente. "
"Si se selecciona normal o árbol, sólo se generan los soportes"
msgid "normal(auto)"
msgstr "normal(auto)"
@ -7171,9 +7208,6 @@ msgstr "normal(auto)"
msgid "tree(auto)"
msgstr "árbol(auto)"
msgid "hybrid(auto)"
msgstr "híbrido(auto)"
msgid "normal(manual)"
msgstr ""
@ -7220,9 +7254,12 @@ msgstr ""
msgid "The z gap between the bottom support interface and object"
msgstr ""
msgid "Support base"
msgstr ""
msgid ""
"Filament to print support and raft. \"Default\" means no specific filament "
"for support and current filament is used"
"Filament to print support base and raft. \"Default\" means no specific "
"filament for support and current filament is used"
msgstr ""
msgid "Line width of support"
@ -7278,6 +7315,9 @@ msgstr "Patrón lineal de apoyo"
msgid "Rectilinear grid"
msgstr "Rejilla rectilínea"
msgid "Hollow"
msgstr ""
msgid "Interface pattern"
msgstr "Patrón de interfaz"
@ -7308,9 +7348,27 @@ msgstr "Velocidad de la asistencia"
msgid "Style"
msgstr "Estilo"
msgid ""
"Style and shape of the support. For normal support, projecting the supports "
"into a regular grid will create more stable supports (default), while snug "
"support towers will save material and reduce object scarring.\n"
"For tree support, tight style will merge branches more aggressively and save "
"a lot of material (default), while hybrid style will create similar "
"structure to normal support under large flat overhangs."
msgstr ""
msgid "Snug"
msgstr "Ajustado"
msgid "Tree Slim"
msgstr ""
msgid "Tree Strong"
msgstr ""
msgid "Tree Hybrid"
msgstr ""
msgid "Independent support layer height"
msgstr "Altura de la capa de soporte independiente"
@ -7976,55 +8034,6 @@ msgid ""
"density to improve the strength of the model?"
msgstr ""
#~ msgid "Choose one or more files (3mf/step/stl/obj/amf):"
#~ msgstr "Elija uno o varios archivos (3mf/step/stl/obj/amf):"
#~ msgid "Finish"
#~ msgstr "Finalizar"
#~ msgid "Import 3MF/STL/STEP/OBJ/AMF"
#~ msgstr "Importar 3MF/STL/STEP/OBJ/AMF"
#~ msgid "Part Cooling"
#~ msgstr "Refrigeración de Piezas"
#~ msgid "Aux Cooling"
#~ msgstr "Enfriamiento Auxiliar"
#~ msgid ""
#~ "Filament to print support and skirt. 0 means no specific filament for "
#~ "support and current filament is used"
#~ msgstr ""
#~ "Filamento para imprimir el soporte y el faldón. 0 significa que no hay "
#~ "filamento específico para el soporte y se utiliza el filamento actual"
#~ msgid ""
#~ "Filament to print support interface. 0 means no specific filament for "
#~ "support interface and current filament is used"
#~ msgstr ""
#~ "Filamento para imprimir la interfaz de soporte. 0 significa que no hay "
#~ "filamento específico para la interfaz de soporte y se utiliza el "
#~ "filamento actual"
#~ msgid "Repair"
#~ msgstr "Reparar"
#~ msgid "Repair the model's meshes if it is non-manifold mesh"
#~ msgstr "Reparar las mallas del modelo si se trata de una malla no plegable"
#~ msgid "Monitoring Recording"
#~ msgstr "Monitoreo de grabación"
#~ msgid "Tree support with infill"
#~ msgstr "Soporte para árboles con relleno"
#~ msgid ""
#~ "This setting specifies whether to add infill inside large hollows of tree "
#~ "support"
#~ msgstr ""
#~ "Este ajuste especifica si se añade relleno dentro de los grandes huecos "
#~ "del soporte del árbol"
#~ msgid ""
#~ "\n"
#~ "%1% is too close to exclusion area, there will be collisions when "
@ -8067,6 +8076,9 @@ msgstr ""
#~ "hay objetos seleccionados, sólo orienta los seleccionados.En caso "
#~ "contrario, orienta todos los objetos del proyecto."
#~ msgid "Aux Cooling"
#~ msgstr "Enfriamiento Auxiliar"
#~ msgid "Avoid crossing wall when travel"
#~ msgstr "Evitar cruzar el muro en los desplazamientos"
@ -8079,6 +8091,9 @@ msgstr ""
#~ "este filamento.\n"
#~ "Esto puede causar el bloqueo de la boquilla y el fracaso de la impresión"
#~ msgid "Choose one or more files (3mf/step/stl/obj/amf):"
#~ msgstr "Elija uno o varios archivos (3mf/step/stl/obj/amf):"
#~ msgid "Clear all"
#~ msgstr "Borrar todo"
@ -8189,9 +8204,27 @@ msgstr ""
#~ msgid "Filament N XX"
#~ msgstr "Filamento N XX"
#~ msgid ""
#~ "Filament to print support and skirt. 0 means no specific filament for "
#~ "support and current filament is used"
#~ msgstr ""
#~ "Filamento para imprimir el soporte y el faldón. 0 significa que no hay "
#~ "filamento específico para el soporte y se utiliza el filamento actual"
#~ msgid ""
#~ "Filament to print support interface. 0 means no specific filament for "
#~ "support interface and current filament is used"
#~ msgstr ""
#~ "Filamento para imprimir la interfaz de soporte. 0 significa que no hay "
#~ "filamento específico para la interfaz de soporte y se utiliza el "
#~ "filamento actual"
#~ msgid "Filaments Selection"
#~ msgstr "Selección de filamentos"
#~ msgid "Finish"
#~ msgstr "Finalizar"
#~ msgid "Finished"
#~ msgstr "Terminado"
@ -8240,6 +8273,9 @@ msgstr ""
#~ "entrada de auto-organización para evitar la colisión cuando se imprime "
#~ "objeto por objeto."
#~ msgid "Import 3MF/STL/STEP/OBJ/AMF"
#~ msgstr "Importar 3MF/STL/STEP/OBJ/AMF"
#~ msgid "In the calibration of extrusion flow"
#~ msgstr "En la calibración del flujo de extrusión"
@ -8281,6 +8317,9 @@ msgstr ""
#~ msgid "Monitoring"
#~ msgstr "Monitorizando"
#~ msgid "Monitoring Recording"
#~ msgstr "Monitoreo de grabación"
#~ msgid "Open"
#~ msgstr "Abrir"
@ -8293,6 +8332,9 @@ msgstr ""
#~ msgid "Output file"
#~ msgstr "Archivo de salida"
#~ msgid "Part Cooling"
#~ msgstr "Refrigeración de Piezas"
#~ msgid "Pause(heated bed temperature error)"
#~ msgstr "Pausa (error de temperatura de la cama caliente)"
@ -8376,6 +8418,12 @@ msgstr ""
#~ msgid "Reload items"
#~ msgstr "Recarga de objetos"
#~ msgid "Repair"
#~ msgstr "Reparar"
#~ msgid "Repair the model's meshes if it is non-manifold mesh"
#~ msgstr "Reparar las mallas del modelo si se trata de una malla no plegable"
#~ msgid "Report"
#~ msgstr "Informe"
@ -8409,6 +8457,15 @@ msgstr ""
#~ msgid "Spiral mode"
#~ msgstr "Modo espiral"
#~ msgid ""
#~ "Spiral mode only works when wall loops is 1, \n"
#~ "support is disabled, top shell layers is 0 and sparse infill density is "
#~ "0\n"
#~ msgstr ""
#~ "El modo espiral sólo funciona cuando los bucles de pared son 1, \n"
#~ "el soporte está desactivado, las capas superiores de la cáscara es 0 y la "
#~ "densidad de relleno dispersa es 0\n"
#~ msgid "Successfully sent.Will automatically jump to the device page in %s s"
#~ msgstr ""
#~ "Enviado con éxito. Saltará automáticamente a la página del dispositivo en "
@ -8466,6 +8523,13 @@ msgstr ""
#~ "filamento para ahorrar filamento y disminuir el tiempo de impresión. Los "
#~ "colores de los objetos se mezclarán como resultado"
#~ msgid ""
#~ "This setting specifies whether to add infill inside large hollows of tree "
#~ "support"
#~ msgstr ""
#~ "Este ajuste especifica si se añade relleno dentro de los grandes huecos "
#~ "del soporte del árbol"
#~ msgid ""
#~ "This setting stands for how much volume of filament can be melted and "
#~ "extruded per second. Printing speed is limited by max volumetric speed, "
@ -8482,6 +8546,9 @@ msgstr ""
#~ msgid "Translation"
#~ msgstr "Translación"
#~ msgid "Tree support with infill"
#~ msgstr "Soporte para árboles con relleno"
#~ msgid "Unable to create zip file"
#~ msgstr "No se puede crear un archivo zip"
@ -8516,9 +8583,20 @@ msgstr ""
#~ msgid " is too close to others, there will be collisions when printing.\n"
#~ msgstr " está demasiado cerca de otros, habrá colisiones al imprimir.\n"
#~ msgid "hybrid(auto)"
#~ msgstr "híbrido(auto)"
#~ msgid "normal"
#~ msgstr "normal"
#~ msgid ""
#~ "normal(auto) and tree(auto) is used to generate support automatically. If "
#~ "normal or tree is selected, only support enforcers are generated"
#~ msgstr ""
#~ "normal(auto) y tree(auto) se utiliza para generar soporte "
#~ "automáticamente. Si se selecciona normal o árbol, sólo se generan los "
#~ "soportes"
#~ msgid "the 3mf is not compatible, load geometry data only!"
#~ msgstr "el 3mf no es compatible, ¡cargue sólo los datos geométricos!"

226
bbl/i18n/fr/BambuStudio_fr.po
View file

@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Bambu Studio\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-12-13 20:02+0800\n"
"POT-Creation-Date: 2022-12-24 13:01+0800\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
@ -1386,6 +1386,9 @@ msgstr ""
msgid "An SD card needs to be inserted before printing via LAN."
msgstr ""
msgid "Failed to send the print job. Please try again."
msgstr ""
msgid "Send to Printer failed. Please try again."
msgstr ""
@ -1877,12 +1880,9 @@ msgstr ""
"La valeur sera remise à 0."
msgid ""
"Spiral mode only works when wall loops is 1, \n"
"support is disabled, top shell layers is 0 and sparse infill density is 0\n"
"Spiral mode only works when wall loops is 1, support is disabled, top shell "
"layers is 0, sparse infill density is 0 and timelapse type is traditional"
msgstr ""
"Le mode spirale ne fonctionne que lorsque les boucles murales sont à 1, \n"
"le support est désactivé, les couches de coque supérieures sont à 0 et la "
"densité de remplissage clairsemée est à 0\n"
msgid ""
"Change these settings automatically? \n"
@ -3231,6 +3231,12 @@ msgstr "L'intégration a échoué."
msgid "Undo integration was successful."
msgstr "Annuler l'intégration a réussi."
msgid "New network plug-in available."
msgstr ""
msgid "Details"
msgstr ""
msgid "Undo integration failed."
msgstr "L'annulation de l'intégration a échoué."
@ -3527,11 +3533,11 @@ msgstr "Vous feriez mieux de mettre à jour votre logiciel.\n"
msgid "Newer 3mf version"
msgstr "Nouvelle version 3mf"
#, c-format, boost-format
#, fuzzy, c-format, boost-format
msgid ""
"The 3mf's version %s is newer than %s's version %s, Suggest to upgrade your "
"software.\n"
msgstr ""
msgstr "\n"
msgid "The 3mf is not compatible, load geometry data only!"
msgstr ""
@ -3814,9 +3820,9 @@ msgid ""
"on Bambu Studio(windows) or CAD softwares."
msgstr ""
#, c-format, boost-format
#, fuzzy, c-format, boost-format
msgid "Plate %d: %s does not support filament %s (%s).\n"
msgstr ""
msgstr "\n"
msgid "Switching the language requires application restart.\n"
msgstr "Le changement de langue nécessite le redémarrage de l'application.\n"
@ -4310,8 +4316,6 @@ msgid ""
"Please check the following infomation and click Confirm to continue sending "
"print:\n"
msgstr ""
"Please check the following infomation and click Confirm to continue sending "
"print:\n"
msgid ""
"The printer type used to generate G-code is not the same type as the "
@ -4415,6 +4419,30 @@ msgid ""
"model without prime tower. Do you want to enable prime tower?"
msgstr ""
msgid ""
"We have added an experimental style \"Tree Slim\" that features smaller "
"support volume but weaker strength.\n"
"We recommand using it with: 0 interface layers, 0 top distance, 2 walls."
msgstr ""
msgid ""
"Change these settings automatically? \n"
"Yes - Change these settings automatically\n"
"No - Do not change these settings for me"
msgstr ""
msgid ""
"For \"Tree Strong\" and \"Tree Hybrid\" styles, we recommand the following "
"settings: at least 2 interface layers, at least 0.1 top z distance or using "
"support materials on interface."
msgstr ""
msgid ""
"When using support material for the support interface, We recommand the "
"following settings:\n"
"0 top distance, 0 interface spacing, concentric pattern."
msgstr ""
msgid ""
"When recording timelapse without toolhead, it is recommended to add a "
"\"Timelapse Wipe Tower\" \n"
@ -5185,6 +5213,17 @@ msgstr ""
msgid "version %s update information :"
msgstr ""
msgid "Network plug-in update"
msgstr ""
msgid ""
"Click OK to update the Network plug-in when Bambu Studio launches next time."
msgstr ""
#, c-format, boost-format
msgid "A new Network plug-in(%s) available, Do you want to install it?"
msgstr ""
msgid "New version of Bambu Studio"
msgstr "Nouvelle version de Bambu Studio"
@ -5498,7 +5537,7 @@ msgid "%1% is too tall, and collisions will be caused."
msgstr "%1% est trop grand, cela pourrait provoquer des collisions."
msgid " is too close to others, there may be collisions when printing.\n"
msgstr " is too close to others, there may be collisions when printing.\n"
msgstr ""
msgid ""
" is too close to exclusion area, there may be collisions when printing.\n"
@ -5608,9 +5647,9 @@ msgstr ""
msgid "Layer height cannot exceed nozzle diameter"
msgstr "La hauteur de la couche ne peut pas dépasser le diamètre de la buse"
#, c-format, boost-format
#, fuzzy, c-format, boost-format
msgid "Plate %d: %s does not support filament %s\n"
msgstr ""
msgstr "\n"
msgid "Generating skirt & brim"
msgstr "Génération jupe et bord"
@ -7156,11 +7195,9 @@ msgstr "Activer la génération de support."
msgid ""
"normal(auto) and tree(auto) is used to generate support automatically. If "
"normal or tree is selected, only support enforcers are generated"
"normal(manual) or tree(manual) is selected, only support enforcers are "
"generated"
msgstr ""
"normal(auto) et tree(auto) sont utilisés pour générer automatiquement le "
"support. Si normal ou arbre est sélectionné, seuls les exécuteurs de support "
"sont générés"
msgid "normal(auto)"
msgstr "normale (auto)"
@ -7168,9 +7205,6 @@ msgstr "normale (auto)"
msgid "tree(auto)"
msgstr "arbre (auto)"
msgid "hybrid(auto)"
msgstr "hybride (auto)"
msgid "normal(manual)"
msgstr ""
@ -7219,9 +7253,12 @@ msgstr ""
msgid "The z gap between the bottom support interface and object"
msgstr ""
msgid "Support base"
msgstr ""
msgid ""
"Filament to print support and raft. \"Default\" means no specific filament "
"for support and current filament is used"
"Filament to print support base and raft. \"Default\" means no specific "
"filament for support and current filament is used"
msgstr ""
msgid "Line width of support"
@ -7276,6 +7313,9 @@ msgstr "Motif de ligne de support"
msgid "Rectilinear grid"
msgstr "Grille rectiligne"
msgid "Hollow"
msgstr ""
msgid "Interface pattern"
msgstr "Modèle d'interface"
@ -7306,9 +7346,27 @@ msgstr "Vitesse pour les supports"
msgid "Style"
msgstr "Style"
msgid ""
"Style and shape of the support. For normal support, projecting the supports "
"into a regular grid will create more stable supports (default), while snug "
"support towers will save material and reduce object scarring.\n"
"For tree support, tight style will merge branches more aggressively and save "
"a lot of material (default), while hybrid style will create similar "
"structure to normal support under large flat overhangs."
msgstr ""
msgid "Snug"
msgstr "Confortable"
msgid "Tree Slim"
msgstr ""
msgid "Tree Strong"
msgstr ""
msgid "Tree Hybrid"
msgstr ""
msgid "Independent support layer height"
msgstr "Hauteur de la couche de support indépendante"
@ -7977,56 +8035,6 @@ msgid ""
"density to improve the strength of the model?"
msgstr ""
#~ msgid "Choose one or more files (3mf/step/stl/obj/amf):"
#~ msgstr "Choisissez un ou plusieurs fichiers (3mf/step/stl/obj/amf) :"
#~ msgid "Finish"
#~ msgstr "Finish"
#~ msgid "Import 3MF/STL/STEP/OBJ/AMF"
#~ msgstr "Importer 3MF/STL/STEP/OBJ/AMF"
#~ msgid "Part Cooling"
#~ msgstr "Refroidissement des pièces"
#~ msgid "Aux Cooling"
#~ msgstr "Refroidissement auxiliaire"
#~ msgid ""
#~ "Filament to print support and skirt. 0 means no specific filament for "
#~ "support and current filament is used"
#~ msgstr ""
#~ "Filament pour imprimer le support et la jupe. 0 signifie qu'aucun "
#~ "filament spécifique pour le support et le filament actuel est utilisé"
#~ msgid ""
#~ "Filament to print support interface. 0 means no specific filament for "
#~ "support interface and current filament is used"
#~ msgstr ""
#~ "Filament pour imprimer l'interface de support. 0 signifie qu'aucun "
#~ "filament spécifique pour l'interface de support et le filament actuel est "
#~ "utilisé"
#~ msgid "Repair"
#~ msgstr "Réparation"
#~ msgid "Repair the model's meshes if it is non-manifold mesh"
#~ msgstr ""
#~ "Réparer les maillages du modèle s'il s'agit d'un maillage non multiple"
#~ msgid "Monitoring Recording"
#~ msgstr "Enregistrement de surveillance"
#~ msgid "Tree support with infill"
#~ msgstr "Support d'arbre avec remplissage"
#~ msgid ""
#~ "This setting specifies whether to add infill inside large hollows of tree "
#~ "support"
#~ msgstr ""
#~ "Ce paramètre spécifie s'il faut ajouter un remplissage à l'intérieur des "
#~ "grands creux du support d'arbre"
#~ msgid ""
#~ "\n"
#~ "%1% is too close to exclusion area, there will be collisions when "
@ -8069,6 +8077,9 @@ msgstr ""
#~ "y a des objets sélectionnés, il oriente uniquement ceux qui sont "
#~ "sélectionnés. Sinon, il oriente tous les objets du projet."
#~ msgid "Aux Cooling"
#~ msgstr "Refroidissement auxiliaire"
#~ msgid "Avoid crossing wall when travel"
#~ msgstr "Évitez de traverser le mur lorsque vous voyagez"
@ -8081,6 +8092,9 @@ msgstr ""
#~ "ce filament. Cela peut entraîner le blocage de la buse et l'échec de "
#~ "l'impression"
#~ msgid "Choose one or more files (3mf/step/stl/obj/amf):"
#~ msgstr "Choisissez un ou plusieurs fichiers (3mf/step/stl/obj/amf) :"
#~ msgid "Clear all"
#~ msgstr "Tout effacer"
@ -8192,9 +8206,27 @@ msgstr ""
#~ msgid "Filament N XX"
#~ msgstr "Filament N XX"
#~ msgid ""
#~ "Filament to print support and skirt. 0 means no specific filament for "
#~ "support and current filament is used"
#~ msgstr ""
#~ "Filament pour imprimer le support et la jupe. 0 signifie qu'aucun "
#~ "filament spécifique pour le support et le filament actuel est utilisé"
#~ msgid ""
#~ "Filament to print support interface. 0 means no specific filament for "
#~ "support interface and current filament is used"
#~ msgstr ""
#~ "Filament pour imprimer l'interface de support. 0 signifie qu'aucun "
#~ "filament spécifique pour l'interface de support et le filament actuel est "
#~ "utilisé"
#~ msgid "Filaments Selection"
#~ msgstr "Sélection de filaments"
#~ msgid "Finish"
#~ msgstr "Finish"
#~ msgid "Finished"
#~ msgstr "Terminé"
@ -8242,6 +8274,9 @@ msgstr ""
#~ "entrée de l'auto-arrangement pour éviter les collisions lors de "
#~ "l'impression objet par objet"
#~ msgid "Import 3MF/STL/STEP/OBJ/AMF"
#~ msgstr "Importer 3MF/STL/STEP/OBJ/AMF"
#~ msgid "In the calibration of extrusion flow"
#~ msgstr "Calibrage du flux d'extrusion en cours"
@ -8283,6 +8318,9 @@ msgstr ""
#~ msgid "Monitoring"
#~ msgstr "Surveillance"
#~ msgid "Monitoring Recording"
#~ msgstr "Enregistrement de surveillance"
#~ msgid "Open"
#~ msgstr "Open"
@ -8295,6 +8333,9 @@ msgstr ""
#~ msgid "Output file"
#~ msgstr "Fichier de sortie"
#~ msgid "Part Cooling"
#~ msgstr "Refroidissement des pièces"
#~ msgid "Pause(heated bed temperature error)"
#~ msgstr "Pause (erreur de température du plateau chauffant)"
@ -8376,6 +8417,13 @@ msgstr ""
#~ msgid "Reload items"
#~ msgstr "Recharger les éléments"
#~ msgid "Repair"
#~ msgstr "Réparation"
#~ msgid "Repair the model's meshes if it is non-manifold mesh"
#~ msgstr ""
#~ "Réparer les maillages du modèle s'il s'agit d'un maillage non multiple"
#~ msgid "Report"
#~ msgstr "Signaler"
@ -8409,6 +8457,15 @@ msgstr ""
#~ msgid "Spiral mode"
#~ msgstr "Mode spirale"
#~ msgid ""
#~ "Spiral mode only works when wall loops is 1, \n"
#~ "support is disabled, top shell layers is 0 and sparse infill density is "
#~ "0\n"
#~ msgstr ""
#~ "Le mode spirale ne fonctionne que lorsque les boucles murales sont à 1, \n"
#~ "le support est désactivé, les couches de coque supérieures sont à 0 et la "
#~ "densité de remplissage clairsemée est à 0\n"
#~ msgid "Successfully sent.Will automatically jump to the device page in %s s"
#~ msgstr ""
#~ "Envoyé avec succès. Sautera automatiquement à la page de l&#39;appareil "
@ -8466,6 +8523,13 @@ msgstr ""
#~ "filament afin d'économiser du filament et de diminuer le temps "
#~ "d'impression. Les couleurs des objets seront mélangées en conséquence."
#~ msgid ""
#~ "This setting specifies whether to add infill inside large hollows of tree "
#~ "support"
#~ msgstr ""
#~ "Ce paramètre spécifie s'il faut ajouter un remplissage à l'intérieur des "
#~ "grands creux du support d'arbre"
#~ msgid ""
#~ "This setting stands for how much volume of filament can be melted and "
#~ "extruded per second. Printing speed is limited by max volumetric speed, "
@ -8482,6 +8546,9 @@ msgstr ""
#~ msgid "Translation"
#~ msgstr "Traduction"
#~ msgid "Tree support with infill"
#~ msgstr "Support d'arbre avec remplissage"
#~ msgid "Unable to create zip file"
#~ msgstr "Création du fichier zip impossible"
@ -8518,9 +8585,20 @@ msgstr ""
#~ "est trop proche des autres, il y aura des collisions lors de "
#~ "l'impression.\n"
#~ msgid "hybrid(auto)"
#~ msgstr "hybride (auto)"
#~ msgid "normal"
#~ msgstr "Ordinaire"
#~ msgid ""
#~ "normal(auto) and tree(auto) is used to generate support automatically. If "
#~ "normal or tree is selected, only support enforcers are generated"
#~ msgstr ""
#~ "normal(auto) et tree(auto) sont utilisés pour générer automatiquement le "
#~ "support. Si normal ou arbre est sélectionné, seuls les exécuteurs de "
#~ "support sont générés"
#~ msgid "the 3mf is not compatible, load geometry data only!"
#~ msgstr ""
#~ "le 3mf n'est pas compatible, chargez uniquement les données de géométrie !"

250
bbl/i18n/hu/BambuStudio_hu.po
View file

@ -2,16 +2,13 @@ msgid ""
msgstr ""
"Project-Id-Version: Bambu Studio\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-12-13 20:02+0800\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
"POT-Creation-Date: 2022-12-24 13:01+0800\n"
"Language: hu\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Localazy (https://localazy.com)\n"
"Plural-Forms: nplurals=2; plural=(n==1) ? 0 : 1;\n"
"X-Generator: Poedit 3.1\n"
msgid "Supports Painting"
msgstr "Támaszok festése"
@ -1387,6 +1384,9 @@ msgstr ""
msgid "An SD card needs to be inserted before printing via LAN."
msgstr "A LAN-on keresztüli nyomtatáshoz helyezz be egy SD kártyát."
msgid "Failed to send the print job. Please try again."
msgstr ""
msgid "Send to Printer failed. Please try again."
msgstr ""
@ -1892,12 +1892,9 @@ msgstr ""
"Az érték 0-ra áll vissza."
msgid ""
"Spiral mode only works when wall loops is 1, \n"
"support is disabled, top shell layers is 0 and sparse infill density is 0\n"
"Spiral mode only works when wall loops is 1, support is disabled, top shell "
"layers is 0, sparse infill density is 0 and timelapse type is traditional"
msgstr ""
"A spirál mód csak akkor működik, ha a falak száma 1,\n"
"a támaszok ki vannak kapcsolva, a felső rétegek száma 0 és a hiányos "
"kitöltés sűrűsége 0\n"
msgid ""
"Change these settings automatically? \n"
@ -1965,9 +1962,6 @@ msgid ""
"Yes - switch to rectilinear pattern automaticlly\n"
"No - reset density to default non 100% value automaticlly\n"
msgstr ""
"Switch to rectilinear pattern?\n"
"Yes - switch to rectilinear pattern automaticlly\n"
"No - reset density to default non 100% value automaticlly\n"
msgid "Auto bed leveling"
msgstr "Automatikus asztalszintezés"
@ -3261,6 +3255,12 @@ msgstr "Az integráció nem sikerült."
msgid "Undo integration was successful."
msgstr "Az integráció visszavonása sikeres volt."
msgid "New network plug-in available."
msgstr ""
msgid "Details"
msgstr ""
msgid "Undo integration failed."
msgstr "Az integráció visszavonása nem sikerült."
@ -3559,11 +3559,11 @@ msgstr "Jobb lenne, ha frissítenéd a szoftvert.\n"
msgid "Newer 3mf version"
msgstr "Újabb 3mf verzió"
#, c-format, boost-format
#, fuzzy, c-format, boost-format
msgid ""
"The 3mf's version %s is newer than %s's version %s, Suggest to upgrade your "
"software.\n"
msgstr ""
msgstr "\n"
msgid "The 3mf is not compatible, load geometry data only!"
msgstr ""
@ -3843,9 +3843,9 @@ msgid ""
"on Bambu Studio(windows) or CAD softwares."
msgstr ""
#, c-format, boost-format
#, fuzzy, c-format, boost-format
msgid "Plate %d: %s does not support filament %s (%s).\n"
msgstr ""
msgstr "\n"
msgid "Switching the language requires application restart.\n"
msgstr "A nyelvváltáshoz az alkalmazás újraindítása szükséges.\n"
@ -4335,10 +4335,6 @@ msgid ""
"currently selected physical printer. It is recommend to re-slice by "
"selecting the same printer type.\n"
msgstr ""
"The printer type used to generate G-code is not the same type as the "
"currently selected physical printer. It is recommend to re-slice by "
"selecting the same printer type.\n"
"\n"
#, c-format, boost-format
msgid "The %s filament is too soft to be used with the AMS"
@ -4433,6 +4429,30 @@ msgid ""
"model without prime tower. Do you want to enable prime tower?"
msgstr ""
msgid ""
"We have added an experimental style \"Tree Slim\" that features smaller "
"support volume but weaker strength.\n"
"We recommand using it with: 0 interface layers, 0 top distance, 2 walls."
msgstr ""
msgid ""
"Change these settings automatically? \n"
"Yes - Change these settings automatically\n"
"No - Do not change these settings for me"
msgstr ""
msgid ""
"For \"Tree Strong\" and \"Tree Hybrid\" styles, we recommand the following "
"settings: at least 2 interface layers, at least 0.1 top z distance or using "
"support materials on interface."
msgstr ""
msgid ""
"When using support material for the support interface, We recommand the "
"following settings:\n"
"0 top distance, 0 interface spacing, concentric pattern."
msgstr ""
msgid ""
"When recording timelapse without toolhead, it is recommended to add a "
"\"Timelapse Wipe Tower\" \n"
@ -5194,6 +5214,17 @@ msgstr ""
msgid "version %s update information :"
msgstr ""
msgid "Network plug-in update"
msgstr ""
msgid ""
"Click OK to update the Network plug-in when Bambu Studio launches next time."
msgstr ""
#, c-format, boost-format
msgid "A new Network plug-in(%s) available, Do you want to install it?"
msgstr ""
msgid "New version of Bambu Studio"
msgstr "A Bambu Studio új verziója"
@ -5509,7 +5540,7 @@ msgid "%1% is too tall, and collisions will be caused."
msgstr "%1% túl magas, a nyomtatás során előfordulhatnak ütközések."
msgid " is too close to others, there may be collisions when printing.\n"
msgstr " is too close to others, there may be collisions when printing.\n"
msgstr ""
msgid ""
" is too close to exclusion area, there may be collisions when printing.\n"
@ -5614,9 +5645,9 @@ msgstr ""
msgid "Layer height cannot exceed nozzle diameter"
msgstr "A rétegmagasság nem lehet nagyobb a fúvóka átmérőjénél."
#, c-format, boost-format
#, fuzzy, c-format, boost-format
msgid "Plate %d: %s does not support filament %s\n"
msgstr ""
msgstr "\n"
msgid "Generating skirt & brim"
msgstr "Szoknya & perem generálása"
@ -7148,11 +7179,9 @@ msgstr "Engedélyezi a támasz generálását."
msgid ""
"normal(auto) and tree(auto) is used to generate support automatically. If "
"normal or tree is selected, only support enforcers are generated"
"normal(manual) or tree(manual) is selected, only support enforcers are "
"generated"
msgstr ""
"A normál (auto), hibrid (auto) és fa (auto) támaszok automatikus "
"generálására szolgál. Ha normál vagy fa van kiválasztva, akkor csak a támasz "
"kényszerítők kerülnek legenerálásra."
msgid "normal(auto)"
msgstr "normál (auto)"
@ -7160,9 +7189,6 @@ msgstr "normál (auto)"
msgid "tree(auto)"
msgstr "fa (auto)"
msgid "hybrid(auto)"
msgstr "hibrid (auto)"
msgid "normal(manual)"
msgstr ""
@ -7210,9 +7236,12 @@ msgstr ""
msgid "The z gap between the bottom support interface and object"
msgstr ""
msgid "Support base"
msgstr ""
msgid ""
"Filament to print support and raft. \"Default\" means no specific filament "
"for support and current filament is used"
"Filament to print support base and raft. \"Default\" means no specific "
"filament for support and current filament is used"
msgstr ""
msgid "Line width of support"
@ -7267,6 +7296,9 @@ msgstr "A támasz mintázata."
msgid "Rectilinear grid"
msgstr "Vonalrács"
msgid "Hollow"
msgstr ""
msgid "Interface pattern"
msgstr "Érintkező felület mintázata"
@ -7297,9 +7329,27 @@ msgstr "Támaszok sebessége"
msgid "Style"
msgstr "Stílus"
msgid ""
"Style and shape of the support. For normal support, projecting the supports "
"into a regular grid will create more stable supports (default), while snug "
"support towers will save material and reduce object scarring.\n"
"For tree support, tight style will merge branches more aggressively and save "
"a lot of material (default), while hybrid style will create similar "
"structure to normal support under large flat overhangs."
msgstr ""
msgid "Snug"
msgstr "Szoros"
msgid "Tree Slim"
msgstr ""
msgid "Tree Strong"
msgstr ""
msgid "Tree Hybrid"
msgstr ""
msgid "Independent support layer height"
msgstr "Független támasz rétegmagassága"
@ -7960,63 +8010,6 @@ msgid ""
"density to improve the strength of the model?"
msgstr ""
#~ msgid "Choose one or more files (3mf/step/stl/obj/amf):"
#~ msgstr "Válassz ki egy vagy több fájlt (3mf/step/stl/obj/amf):"
#~ msgid "Finish"
#~ msgstr "Kész"
#~ msgid "Import 3MF/STL/STEP/OBJ/AMF"
#~ msgstr "3MF/STL/STEP/OBJ/AMF importálása"
#~ msgid "Part Cooling"
#~ msgstr "Tárgyhűtés"
#~ msgid "Aux Cooling"
#~ msgstr "Segédhűtés"
#~ msgid ""
#~ "Filament to print support and skirt. 0 means no specific filament for "
#~ "support and current filament is used"
#~ msgstr ""
#~ "Filament a támasz és perem nyomtatásához. A 0 azt jelenti, hogy nincs "
#~ "erre külön kijelölt filament és a jelenleg használt kerül felhasználásra"
#~ msgid ""
#~ "Filament to print support interface. 0 means no specific filament for "
#~ "support interface and current filament is used"
#~ msgstr ""
#~ "Filament a támasz érintkező felületének nyomtatásához. A 0 azt jelenti, "
#~ "hogy nincs erre külön kijelölt filament és a jelenleg használt kerül "
#~ "felhasználásra"
#~ msgid "Repair"
#~ msgstr "Javítás"
#~ msgid "Repair the model's meshes if it is non-manifold mesh"
#~ msgstr "Megjavítja a modell hálóit, ha azok hibásak"
#~ msgid "Heat the nozzle to target temperature"
#~ msgstr "Fúvóka felmelegítése a kívánt hőmérsékletre"
#~ msgid ""
#~ "Successfully sent. Will automatically jump to the device page in %s s"
#~ msgstr ""
#~ "Sikeresen elküldve. Az eszköz oldala automatikusan megjelenik %s mp belül"
#~ msgid "Monitoring Recording"
#~ msgstr "Felvétel monitorozása"
#~ msgid "Tree support with infill"
#~ msgstr "Fa támasz kitöltéssel"
#~ msgid ""
#~ "This setting specifies whether to add infill inside large hollows of tree "
#~ "support"
#~ msgstr ""
#~ "Ez a beállítás határozza meg, hogy a fa támasz nagyobb üregeiben legyen-e "
#~ "kitöltés."
#~ msgid ""
#~ "\n"
#~ "%1% is too close to exclusion area, there will be collisions when "
@ -8060,6 +8053,9 @@ msgstr ""
#~ "ellenkező esetben az aktuális projektben lévő összes objektumot "
#~ "orientálja."
#~ msgid "Aux Cooling"
#~ msgstr "Segédhűtés"
#~ msgid "Avoid crossing wall when travel"
#~ msgstr "Falak elkerülése mozgáskor"
@ -8072,6 +8068,9 @@ msgstr ""
#~ "hőmérséklete.\n"
#~ "Ez a fúvóka eltömődését és nyomtatási hibákat okozhat"
#~ msgid "Choose one or more files (3mf/step/stl/obj/amf):"
#~ msgstr "Válassz ki egy vagy több fájlt (3mf/step/stl/obj/amf):"
#~ msgid "Clear all"
#~ msgstr "Összes törlése"
@ -8182,9 +8181,27 @@ msgstr ""
#~ msgid "Filament N XX"
#~ msgstr "Filament N XX"
#~ msgid ""
#~ "Filament to print support and skirt. 0 means no specific filament for "
#~ "support and current filament is used"
#~ msgstr ""
#~ "Filament a támasz és perem nyomtatásához. A 0 azt jelenti, hogy nincs "
#~ "erre külön kijelölt filament és a jelenleg használt kerül felhasználásra"
#~ msgid ""
#~ "Filament to print support interface. 0 means no specific filament for "
#~ "support interface and current filament is used"
#~ msgstr ""
#~ "Filament a támasz érintkező felületének nyomtatásához. A 0 azt jelenti, "
#~ "hogy nincs erre külön kijelölt filament és a jelenleg használt kerül "
#~ "felhasználásra"
#~ msgid "Filaments Selection"
#~ msgstr "Filamentek kiválasztása"
#~ msgid "Finish"
#~ msgstr "Kész"
#~ msgid "Finished"
#~ msgstr "Kész"
@ -8223,6 +8240,9 @@ msgstr ""
#~ "Fúvóka felfűtése a\n"
#~ "célhőmérsékletre"
#~ msgid "Heat the nozzle to target temperature"
#~ msgstr "Fúvóka felmelegítése a kívánt hőmérsékletre"
#~ msgid "Height:"
#~ msgstr "Magasság:"
@ -8234,6 +8254,9 @@ msgstr ""
#~ "automatikus elrendezéshez van használva az ütközések elkerülése "
#~ "érdekében, amikor a nyomtatás tárgyanként történik."
#~ msgid "Import 3MF/STL/STEP/OBJ/AMF"
#~ msgstr "3MF/STL/STEP/OBJ/AMF importálása"
#~ msgid "In the calibration of extrusion flow"
#~ msgstr "Az anyagáramlás kalibrálásában"
@ -8275,6 +8298,9 @@ msgstr ""
#~ msgid "Monitoring"
#~ msgstr "Monitorozás"
#~ msgid "Monitoring Recording"
#~ msgstr "Felvétel monitorozása"
#~ msgid "Open"
#~ msgstr "Open"
@ -8287,6 +8313,9 @@ msgstr ""
#~ msgid "Output file"
#~ msgstr "Kimeneti fájl"
#~ msgid "Part Cooling"
#~ msgstr "Tárgyhűtés"
#~ msgid "Pause(heated bed temperature error)"
#~ msgstr "Szünet (tárgyasztal hőmérséklet hiba)"
@ -8370,6 +8399,12 @@ msgstr ""
#~ msgid "Reload items"
#~ msgstr "Tárgyak újbóli betöltése"
#~ msgid "Repair"
#~ msgstr "Javítás"
#~ msgid "Repair the model's meshes if it is non-manifold mesh"
#~ msgstr "Megjavítja a modell hálóit, ha azok hibásak"
#~ msgid "Report"
#~ msgstr "Jelentés"
@ -8403,11 +8438,25 @@ msgstr ""
#~ msgid "Spiral mode"
#~ msgstr "Spirál/Váza mód"
#~ msgid ""
#~ "Spiral mode only works when wall loops is 1, \n"
#~ "support is disabled, top shell layers is 0 and sparse infill density is "
#~ "0\n"
#~ msgstr ""
#~ "A spirál mód csak akkor működik, ha a falak száma 1,\n"
#~ "a támaszok ki vannak kapcsolva, a felső rétegek száma 0 és a hiányos "
#~ "kitöltés sűrűsége 0\n"
#~ msgid "Successfully sent.Will automatically jump to the device page in %s s"
#~ msgstr ""
#~ "Sikeresen elküldve. Automatikus átváltás a készülék oldalára %s mp-en "
#~ "belül"
#~ msgid ""
#~ "Successfully sent. Will automatically jump to the device page in %s s"
#~ msgstr ""
#~ "Sikeresen elküldve. Az eszköz oldala automatikusan megjelenik %s mp belül"
#~ msgid ""
#~ "Support layer uses layer height independent with object layer. This is to "
#~ "support custom support gap,but may cause extra filament switches if "
@ -8459,6 +8508,13 @@ msgstr ""
#~ "nyomtatási idő csökkentése és némi filament megtakarításának érdekében. "
#~ "Az objektum színei ennek eredményeképpen keveredni fognak."
#~ msgid ""
#~ "This setting specifies whether to add infill inside large hollows of tree "
#~ "support"
#~ msgstr ""
#~ "Ez a beállítás határozza meg, hogy a fa támasz nagyobb üregeiben legyen-e "
#~ "kitöltés."
#~ msgid ""
#~ "This setting stands for how much volume of filament can be melted and "
#~ "extruded per second. Printing speed is limited by max volumetric speed, "
@ -8477,6 +8533,9 @@ msgstr ""
#~ msgid "Translation"
#~ msgstr "Fordítás"
#~ msgid "Tree support with infill"
#~ msgstr "Fa támasz kitöltéssel"
#~ msgid "Unable to create zip file"
#~ msgstr "Nem sikerült létrehozni a zip fájlt"
@ -8514,9 +8573,20 @@ msgstr ""
#~ " túl közel van a tiltott területhez, a nyomtatás során előfordulhatnak "
#~ "ütközések.\n"
#~ msgid "hybrid(auto)"
#~ msgstr "hibrid (auto)"
#~ msgid "normal"
#~ msgstr "normál"
#~ msgid ""
#~ "normal(auto) and tree(auto) is used to generate support automatically. If "
#~ "normal or tree is selected, only support enforcers are generated"
#~ msgstr ""
#~ "A normál (auto), hibrid (auto) és fa (auto) támaszok automatikus "
#~ "generálására szolgál. Ha normál vagy fa van kiválasztva, akkor csak a "
#~ "támasz kényszerítők kerülnek legenerálásra."
#~ msgid "the 3mf is not compatible, load geometry data only!"
#~ msgstr "A 3mf nem kompatibilis, csak geometriai adatok kerülnek betöltésre!"

8471
bbl/i18n/it/BambuStudio_it.po Normal file
View file

File diff suppressed because it is too large Load diff

228
bbl/i18n/nl/BambuStudio_nl.po
View file

@ -2,16 +2,13 @@ msgid ""
msgstr ""
"Project-Id-Version: Bambu Studio\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-12-13 20:02+0800\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
"POT-Creation-Date: 2022-12-24 13:01+0800\n"
"Language: nl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Localazy (https://localazy.com)\n"
"Plural-Forms: nplurals=2; plural=(n==1) ? 0 : 1;\n"
"X-Generator: Poedit 3.1\n"
msgid "Supports Painting"
msgstr "Onderteuning (Support) tekenen"
@ -1393,6 +1390,9 @@ msgstr ""
msgid "An SD card needs to be inserted before printing via LAN."
msgstr ""
msgid "Failed to send the print job. Please try again."
msgstr ""
msgid "Send to Printer failed. Please try again."
msgstr ""
@ -1898,12 +1898,9 @@ msgstr ""
"De waarde wordt teruggezet naar 0."
msgid ""
"Spiral mode only works when wall loops is 1, \n"
"support is disabled, top shell layers is 0 and sparse infill density is 0\n"
"Spiral mode only works when wall loops is 1, support is disabled, top shell "
"layers is 0, sparse infill density is 0 and timelapse type is traditional"
msgstr ""
"Spiraal modus werkt alleen indien indien er 1 wall gekozen is, \n"
"support uitgeschakeld is, er 0 top layers gekozen zijn en de vulling "
"dichtheid 0 is\n"
msgid ""
"Change these settings automatically? \n"
@ -2891,11 +2888,6 @@ msgid ""
"2. The Filament presets\n"
"3. The Printer presets\n"
msgstr ""
"Do you want to synchronize your personal data from Bambu Cloud? \n"
"It contains the following information:\n"
"1. The Process presets\n"
"2. The Filament presets\n"
"3. The Printer presets\n"
msgid "Synchronization"
msgstr "Synchronisatie"
@ -3259,6 +3251,12 @@ msgstr "Integratie is mislukt."
msgid "Undo integration was successful."
msgstr "Het ongedaan maken van de integratie is gelukt."
msgid "New network plug-in available."
msgstr ""
msgid "Details"
msgstr ""
msgid "Undo integration failed."
msgstr "Het ongedaan maken van de integratie is mislukt."
@ -3565,11 +3563,11 @@ msgstr "U dient de software te upgraden.\n"
msgid "Newer 3mf version"
msgstr "Nieuwere versie 3mf"
#, c-format, boost-format
#, fuzzy, c-format, boost-format
msgid ""
"The 3mf's version %s is newer than %s's version %s, Suggest to upgrade your "
"software.\n"
msgstr ""
msgstr "\n"
msgid "The 3mf is not compatible, load geometry data only!"
msgstr ""
@ -3851,9 +3849,9 @@ msgid ""
"on Bambu Studio(windows) or CAD softwares."
msgstr ""
#, c-format, boost-format
#, fuzzy, c-format, boost-format
msgid "Plate %d: %s does not support filament %s (%s).\n"
msgstr ""
msgstr "\n"
msgid "Switching the language requires application restart.\n"
msgstr ""
@ -4447,6 +4445,30 @@ msgid ""
"model without prime tower. Do you want to enable prime tower?"
msgstr ""
msgid ""
"We have added an experimental style \"Tree Slim\" that features smaller "
"support volume but weaker strength.\n"
"We recommand using it with: 0 interface layers, 0 top distance, 2 walls."
msgstr ""
msgid ""
"Change these settings automatically? \n"
"Yes - Change these settings automatically\n"
"No - Do not change these settings for me"
msgstr ""
msgid ""
"For \"Tree Strong\" and \"Tree Hybrid\" styles, we recommand the following "
"settings: at least 2 interface layers, at least 0.1 top z distance or using "
"support materials on interface."
msgstr ""
msgid ""
"When using support material for the support interface, We recommand the "
"following settings:\n"
"0 top distance, 0 interface spacing, concentric pattern."
msgstr ""
msgid ""
"When recording timelapse without toolhead, it is recommended to add a "
"\"Timelapse Wipe Tower\" \n"
@ -5215,6 +5237,17 @@ msgstr ""
msgid "version %s update information :"
msgstr ""
msgid "Network plug-in update"
msgstr ""
msgid ""
"Click OK to update the Network plug-in when Bambu Studio launches next time."
msgstr ""
#, c-format, boost-format
msgid "A new Network plug-in(%s) available, Do you want to install it?"
msgstr ""
msgid "New version of Bambu Studio"
msgstr "Nieuwe versie van Bambu Studio"
@ -5635,9 +5668,9 @@ msgstr ""
msgid "Layer height cannot exceed nozzle diameter"
msgstr "De laaghoogte kan niet groter zijn dan de diameter van de nozzle"
#, c-format, boost-format
#, fuzzy, c-format, boost-format
msgid "Plate %d: %s does not support filament %s\n"
msgstr ""
msgstr "\n"
msgid "Generating skirt & brim"
msgstr "Skirt en brim worden gegenereerd"
@ -7180,11 +7213,9 @@ msgstr "Dit maakt het genereren van support mogelijk."
msgid ""
"normal(auto) and tree(auto) is used to generate support automatically. If "
"normal or tree is selected, only support enforcers are generated"
"normal(manual) or tree(manual) is selected, only support enforcers are "
"generated"
msgstr ""
"normal (auto), hybride (auto) en tree (auto) worden gebruikt om automatisch "
"support te genereren. Als normaal of tree is geselecteerd, worden alleen "
"vereiste support gegenereerd."
msgid "normal(auto)"
msgstr "Normaal (automatisch)"
@ -7192,9 +7223,6 @@ msgstr "Normaal (automatisch)"
msgid "tree(auto)"
msgstr "tree(auto)"
msgid "hybrid(auto)"
msgstr "Hybride (automatisch)"
msgid "normal(manual)"
msgstr ""
@ -7242,9 +7270,12 @@ msgstr ""
msgid "The z gap between the bottom support interface and object"
msgstr ""
msgid "Support base"
msgstr ""
msgid ""
"Filament to print support and raft. \"Default\" means no specific filament "
"for support and current filament is used"
"Filament to print support base and raft. \"Default\" means no specific "
"filament for support and current filament is used"
msgstr ""
msgid "Line width of support"
@ -7300,6 +7331,9 @@ msgstr "Dit is het lijnpatroon voor support."
msgid "Rectilinear grid"
msgstr "Rechtlijnig raster"
msgid "Hollow"
msgstr ""
msgid "Interface pattern"
msgstr "Interfacepatroon"
@ -7330,9 +7364,27 @@ msgstr "Dit is de snelheid voor het printen van support."
msgid "Style"
msgstr "Stijl"
msgid ""
"Style and shape of the support. For normal support, projecting the supports "
"into a regular grid will create more stable supports (default), while snug "
"support towers will save material and reduce object scarring.\n"
"For tree support, tight style will merge branches more aggressively and save "
"a lot of material (default), while hybrid style will create similar "
"structure to normal support under large flat overhangs."
msgstr ""
msgid "Snug"
msgstr "Nauwsluitend"
msgid "Tree Slim"
msgstr ""
msgid "Tree Strong"
msgstr ""
msgid "Tree Hybrid"
msgstr ""
msgid "Independent support layer height"
msgstr "Onafhankelijke support laaghoogte"
@ -7998,54 +8050,6 @@ msgid ""
"density to improve the strength of the model?"
msgstr ""
#~ msgid "Choose one or more files (3mf/step/stl/obj/amf):"
#~ msgstr "Kies een of meer bestanden (3mf/step/stl/obj/amf):"
#~ msgid "Finish"
#~ msgstr "Klaar"
#~ msgid "Import 3MF/STL/STEP/OBJ/AMF"
#~ msgstr "Importeer 3MF/STL/STEP/OBJ/AMF"
#~ msgid "Part Cooling"
#~ msgstr "Koeling van de printkop"
#~ msgid "Aux Cooling"
#~ msgstr "Extra koeling"
#~ msgid ""
#~ "Filament to print support and skirt. 0 means no specific filament for "
#~ "support and current filament is used"
#~ msgstr ""
#~ "Filament om randen (skirt) en support te printen. Indien u kiest voor 0 "
#~ "dan is er geen specifiek filament en wordt het huidige filament gebruikt"
#~ msgid ""
#~ "Filament to print support interface. 0 means no specific filament for "
#~ "support interface and current filament is used"
#~ msgstr ""
#~ "Filament om support te printen. Indien u kiest voor 0 dan is er geen "
#~ "specifiek filament en wordt het huidige filament gebruikt"
#~ msgid "Repair"
#~ msgstr "Repareren"
#~ msgid "Repair the model's meshes if it is non-manifold mesh"
#~ msgstr "Repareer de meshes van het model als ze niet-manifold zijn."
#~ msgid "Monitoring Recording"
#~ msgstr "Monitoring en opname"
#~ msgid "Tree support with infill"
#~ msgstr "Tree support met vulling"
#~ msgid ""
#~ "This setting specifies whether to add infill inside large hollows of tree "
#~ "support"
#~ msgstr ""
#~ "Deze instelling geeft aan of er opvulling moet worden toegevoegd in grote "
#~ "holtes van de tree support."
#~ msgid ""
#~ "\n"
#~ "%1% is too close to exclusion area, there will be collisions when "
@ -8088,6 +8092,9 @@ msgstr ""
#~ "deze georiënteert. Anders worden alle objecten op de huidige project "
#~ "georiënteert."
#~ msgid "Aux Cooling"
#~ msgstr "Extra koeling"
#~ msgid "Avoid crossing wall when travel"
#~ msgstr "Vermijd wanden tijdens het verplaatsen"
@ -8100,6 +8107,9 @@ msgstr ""
#~ "filament. Hierdoor kan de nozzle verstopt raken en kan het printen "
#~ "mislukken"
#~ msgid "Choose one or more files (3mf/step/stl/obj/amf):"
#~ msgstr "Kies een of meer bestanden (3mf/step/stl/obj/amf):"
#~ msgid "Clear all"
#~ msgstr "Alles wissen"
@ -8210,9 +8220,26 @@ msgstr ""
#~ msgid "Filament N XX"
#~ msgstr "Filament N XX"
#~ msgid ""
#~ "Filament to print support and skirt. 0 means no specific filament for "
#~ "support and current filament is used"
#~ msgstr ""
#~ "Filament om randen (skirt) en support te printen. Indien u kiest voor 0 "
#~ "dan is er geen specifiek filament en wordt het huidige filament gebruikt"
#~ msgid ""
#~ "Filament to print support interface. 0 means no specific filament for "
#~ "support interface and current filament is used"
#~ msgstr ""
#~ "Filament om support te printen. Indien u kiest voor 0 dan is er geen "
#~ "specifiek filament en wordt het huidige filament gebruikt"
#~ msgid "Filaments Selection"
#~ msgstr "Filaments selectie"
#~ msgid "Finish"
#~ msgstr "Klaar"
#~ msgid "Finished"
#~ msgstr "Voltooid"
@ -8258,6 +8285,9 @@ msgstr ""
#~ "voor automatisch rangschikken om botsingen te voorkomen bij object voor "
#~ "object printen."
#~ msgid "Import 3MF/STL/STEP/OBJ/AMF"
#~ msgstr "Importeer 3MF/STL/STEP/OBJ/AMF"
#~ msgid "In the calibration of extrusion flow"
#~ msgstr "Bij de kalibratie van de extrusieflow"
@ -8299,6 +8329,9 @@ msgstr ""
#~ msgid "Monitoring"
#~ msgstr "Monitoren"
#~ msgid "Monitoring Recording"
#~ msgstr "Monitoring en opname"
#~ msgid "Open"
#~ msgstr "Open"
@ -8311,6 +8344,9 @@ msgstr ""
#~ msgid "Output file"
#~ msgstr "Bestand weergeven"
#~ msgid "Part Cooling"
#~ msgstr "Koeling van de printkop"
#~ msgid "Pause(heated bed temperature error)"
#~ msgstr "Pauze (fout in temperatuur printbed)"
@ -8391,6 +8427,12 @@ msgstr ""
#~ msgid "Reload items"
#~ msgstr "Onderdelen opnieuw laden"
#~ msgid "Repair"
#~ msgstr "Repareren"
#~ msgid "Repair the model's meshes if it is non-manifold mesh"
#~ msgstr "Repareer de meshes van het model als ze niet-manifold zijn."
#~ msgid "Report"
#~ msgstr "Rapport"
@ -8424,6 +8466,15 @@ msgstr ""
#~ msgid "Spiral mode"
#~ msgstr "Spiraal modus"
#~ msgid ""
#~ "Spiral mode only works when wall loops is 1, \n"
#~ "support is disabled, top shell layers is 0 and sparse infill density is "
#~ "0\n"
#~ msgstr ""
#~ "Spiraal modus werkt alleen indien indien er 1 wall gekozen is, \n"
#~ "support uitgeschakeld is, er 0 top layers gekozen zijn en de vulling "
#~ "dichtheid 0 is\n"
#~ msgid "Successfully sent.Will automatically jump to the device page in %s s"
#~ msgstr ""
#~ "Succesvol verzonden. Automatisch terug naar de apparaatpagina in %s s"
@ -8478,6 +8529,13 @@ msgstr ""
#~ "om filament te besparen en de print tijd te verkorten. De kleuren van de "
#~ "objecten worden gemengd als resultaat"
#~ msgid ""
#~ "This setting specifies whether to add infill inside large hollows of tree "
#~ "support"
#~ msgstr ""
#~ "Deze instelling geeft aan of er opvulling moet worden toegevoegd in grote "
#~ "holtes van de tree support."
#~ msgid ""
#~ "This setting stands for how much volume of filament can be melted and "
#~ "extruded per second. Printing speed is limited by max volumetric speed, "
@ -8494,6 +8552,9 @@ msgstr ""
#~ msgid "Translation"
#~ msgstr "Vertaling"
#~ msgid "Tree support with infill"
#~ msgstr "Tree support met vulling"
#~ msgid "Unable to create zip file"
#~ msgstr "Kan het zip-bestand niet aanmaken"
@ -8531,9 +8592,20 @@ msgstr ""
#~ " bevindt zich te dichtbij andere objecten, er zullen botsingen optreden "
#~ "tijdens het printen.\n"
#~ msgid "hybrid(auto)"
#~ msgstr "Hybride (automatisch)"
#~ msgid "normal"
#~ msgstr "Normaal"
#~ msgid ""
#~ "normal(auto) and tree(auto) is used to generate support automatically. If "
#~ "normal or tree is selected, only support enforcers are generated"
#~ msgstr ""
#~ "normal (auto), hybride (auto) en tree (auto) worden gebruikt om "
#~ "automatisch support te genereren. Als normaal of tree is geselecteerd, "
#~ "worden alleen vereiste support gegenereerd."
#~ msgid "the 3mf is not compatible, load geometry data only!"
#~ msgstr ""
#~ "Het 3mf bestand is niet compatibel, enkel de geometrische data wordt "

228
bbl/i18n/sv/BambuStudio_sv.po
View file

@ -2,16 +2,13 @@ msgid ""
msgstr ""
"Project-Id-Version: Bambu Studio\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-12-13 20:02+0800\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
"POT-Creation-Date: 2022-12-24 13:01+0800\n"
"Language: sv\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Localazy (https://localazy.com)\n"
"Plural-Forms: nplurals=2; plural=(n==1) ? 0 : 1;\n"
"X-Generator: Poedit 3.1\n"
msgid "Supports Painting"
msgstr "Färgläggning av Support"
@ -1373,6 +1370,9 @@ msgstr ""
msgid "An SD card needs to be inserted before printing via LAN."
msgstr ""
msgid "Failed to send the print job. Please try again."
msgstr ""
msgid "Send to Printer failed. Please try again."
msgstr ""
@ -1868,11 +1868,9 @@ msgstr ""
"Värdet kommer att återställas till 0."
msgid ""
"Spiral mode only works when wall loops is 1, \n"
"support is disabled, top shell layers is 0 and sparse infill density is 0\n"
"Spiral mode only works when wall loops is 1, support is disabled, top shell "
"layers is 0, sparse infill density is 0 and timelapse type is traditional"
msgstr ""
"Spiral läge fungerar bara när vägg antalet är 1,\n"
"support är inaktiverad, top lager är 0 och låg ifyllnads densitet är 0\n"
msgid ""
"Change these settings automatically? \n"
@ -1938,9 +1936,6 @@ msgid ""
"Yes - switch to rectilinear pattern automaticlly\n"
"No - reset density to default non 100% value automaticlly\n"
msgstr ""
"Switch to rectilinear pattern?\n"
"Yes - switch to rectilinear pattern automaticlly\n"
"No - reset density to default non 100% value automaticlly\n"
msgid "Auto bed leveling"
msgstr "Auto justera byggplattan"
@ -3225,6 +3220,12 @@ msgstr "Integrationen misslyckades."
msgid "Undo integration was successful."
msgstr "Återställande av integrationen lyckades."
msgid "New network plug-in available."
msgstr ""
msgid "Details"
msgstr ""
msgid "Undo integration failed."
msgstr "Återställande av integrationen misslyckades."
@ -3521,11 +3522,11 @@ msgstr "Uppdatera mjukvaran.\n"
msgid "Newer 3mf version"
msgstr "Nyare 3mf version"
#, c-format, boost-format
#, fuzzy, c-format, boost-format
msgid ""
"The 3mf's version %s is newer than %s's version %s, Suggest to upgrade your "
"software.\n"
msgstr ""
msgstr "\n"
msgid "The 3mf is not compatible, load geometry data only!"
msgstr ""
@ -3798,9 +3799,9 @@ msgid ""
"on Bambu Studio(windows) or CAD softwares."
msgstr ""
#, c-format, boost-format
#, fuzzy, c-format, boost-format
msgid "Plate %d: %s does not support filament %s (%s).\n"
msgstr ""
msgstr "\n"
msgid "Switching the language requires application restart.\n"
msgstr "Byte av språk krävs för omstart.\n"
@ -4378,6 +4379,30 @@ msgid ""
"model without prime tower. Do you want to enable prime tower?"
msgstr ""
msgid ""
"We have added an experimental style \"Tree Slim\" that features smaller "
"support volume but weaker strength.\n"
"We recommand using it with: 0 interface layers, 0 top distance, 2 walls."
msgstr ""
msgid ""
"Change these settings automatically? \n"
"Yes - Change these settings automatically\n"
"No - Do not change these settings for me"
msgstr ""
msgid ""
"For \"Tree Strong\" and \"Tree Hybrid\" styles, we recommand the following "
"settings: at least 2 interface layers, at least 0.1 top z distance or using "
"support materials on interface."
msgstr ""
msgid ""
"When using support material for the support interface, We recommand the "
"following settings:\n"
"0 top distance, 0 interface spacing, concentric pattern."
msgstr ""
msgid ""
"When recording timelapse without toolhead, it is recommended to add a "
"\"Timelapse Wipe Tower\" \n"
@ -5136,6 +5161,17 @@ msgstr ""
msgid "version %s update information :"
msgstr ""
msgid "Network plug-in update"
msgstr ""
msgid ""
"Click OK to update the Network plug-in when Bambu Studio launches next time."
msgstr ""
#, c-format, boost-format
msgid "A new Network plug-in(%s) available, Do you want to install it?"
msgstr ""
msgid "New version of Bambu Studio"
msgstr "Ny version av Bambu Studio"
@ -5444,13 +5480,11 @@ msgid "%1% is too tall, and collisions will be caused."
msgstr "%1% är för hög, och kollisioner kommer att uppstå."
msgid " is too close to others, there may be collisions when printing.\n"
msgstr " is too close to others, there may be collisions when printing.\n"
msgstr ""
msgid ""
" is too close to exclusion area, there may be collisions when printing.\n"
msgstr ""
" is too close to exclusion area, there may be collisions when printing.\n"
"\n"
msgid "Prime Tower"
msgstr "Prime Torn"
@ -5543,9 +5577,9 @@ msgstr ""
msgid "Layer height cannot exceed nozzle diameter"
msgstr "Lagerhöjden kan inte överstiga nozzel diametern"
#, c-format, boost-format
#, fuzzy, c-format, boost-format
msgid "Plate %d: %s does not support filament %s\n"
msgstr ""
msgstr "\n"
msgid "Generating skirt & brim"
msgstr "Skapar Skirt & Brim"
@ -7048,11 +7082,9 @@ msgstr "Aktivera support generering."
msgid ""
"normal(auto) and tree(auto) is used to generate support automatically. If "
"normal or tree is selected, only support enforcers are generated"
"normal(manual) or tree(manual) is selected, only support enforcers are "
"generated"
msgstr ""
"normal(auto), hybrid(auto) och tree(auto) används för att skapa support "
"automatiskt. Om normal eller tree är vald, kommer endast tvingande support "
"skapas"
msgid "normal(auto)"
msgstr "normal (auto)"
@ -7060,9 +7092,6 @@ msgstr "normal (auto)"
msgid "tree(auto)"
msgstr "träd(auto)"
msgid "hybrid(auto)"
msgstr "hybrid(auto)"
msgid "normal(manual)"
msgstr ""
@ -7110,9 +7139,12 @@ msgstr ""
msgid "The z gap between the bottom support interface and object"
msgstr ""
msgid "Support base"
msgstr ""
msgid ""
"Filament to print support and raft. \"Default\" means no specific filament "
"for support and current filament is used"
"Filament to print support base and raft. \"Default\" means no specific "
"filament for support and current filament is used"
msgstr ""
msgid "Line width of support"
@ -7166,6 +7198,9 @@ msgstr "Supportens linje mönster"
msgid "Rectilinear grid"
msgstr "Rät linjärt nät"
msgid "Hollow"
msgstr ""
msgid "Interface pattern"
msgstr "Gränssnitts mönster"
@ -7196,9 +7231,27 @@ msgstr "Support hastighet"
msgid "Style"
msgstr "Stil"
msgid ""
"Style and shape of the support. For normal support, projecting the supports "
"into a regular grid will create more stable supports (default), while snug "
"support towers will save material and reduce object scarring.\n"
"For tree support, tight style will merge branches more aggressively and save "
"a lot of material (default), while hybrid style will create similar "
"structure to normal support under large flat overhangs."
msgstr ""
msgid "Snug"
msgstr "Tight"
msgid "Tree Slim"
msgstr ""
msgid "Tree Strong"
msgstr ""
msgid "Tree Hybrid"
msgstr ""
msgid "Independent support layer height"
msgstr "Oberoende support lagerhöjd"
@ -7853,54 +7906,6 @@ msgid ""
"density to improve the strength of the model?"
msgstr ""
#~ msgid "Choose one or more files (3mf/step/stl/obj/amf):"
#~ msgstr "Välj en eller flera filer (3mf/step/stl/obj/amf):"
#~ msgid "Finish"
#~ msgstr "Slutför"
#~ msgid "Import 3MF/STL/STEP/OBJ/AMF"
#~ msgstr "Importera 3MF/STL/STEP/OBJ/AMF"
#~ msgid "Part Cooling"
#~ msgstr "Del Kylning"
#~ msgid "Aux Cooling"
#~ msgstr "Extra Kylning"
#~ msgid ""
#~ "Filament to print support and skirt. 0 means no specific filament for "
#~ "support and current filament is used"
#~ msgstr ""
#~ "Filament för att skriva ut support och skirt med. 0 betyder inget "
#~ "speciellt filament för support och nuvarande filament används"
#~ msgid ""
#~ "Filament to print support interface. 0 means no specific filament for "
#~ "support interface and current filament is used"
#~ msgstr ""
#~ "Support filament för utskrift. 0 betyder att inget specifikt filament för "
#~ "support gränssnitt och nuvarande filament används"
#~ msgid "Repair"
#~ msgstr "Reparera"
#~ msgid "Repair the model's meshes if it is non-manifold mesh"
#~ msgstr "Reparera modellens mesh om den inte är mångfaldig"
#~ msgid "Monitoring Recording"
#~ msgstr "Övervaknings Inspelning"
#~ msgid "Tree support with infill"
#~ msgstr "Tree support med ifyllnad"
#~ msgid ""
#~ "This setting specifies whether to add infill inside large hollows of tree "
#~ "support"
#~ msgstr ""
#~ "Inställningen bestämmer om det ska läggas till ifyllnad i stora hålrum av "
#~ "tree support"
#~ msgid ""
#~ "\n"
#~ "%1% is too close to exclusion area, there will be collisions when "
@ -7938,6 +7943,9 @@ msgstr ""
#~ "Auto placera valda objekt eller alla objekt. Om det finns valda objekt så "
#~ "placeras endast dem. Alternativt så placeras alla objekt i projektet."
#~ msgid "Aux Cooling"
#~ msgstr "Extra Kylning"
#~ msgid "Avoid crossing wall when travel"
#~ msgstr "Undvik väggar vid förflyttning"
@ -7950,6 +7958,9 @@ msgstr ""
#~ "filament.\n"
#~ "Detta kan orsaka att nozzeln blockeras och utskriften misslyckas"
#~ msgid "Choose one or more files (3mf/step/stl/obj/amf):"
#~ msgstr "Välj en eller flera filer (3mf/step/stl/obj/amf):"
#~ msgid "Clear all"
#~ msgstr "Rensa allt"
@ -8059,9 +8070,26 @@ msgstr ""
#~ msgid "Filament N XX"
#~ msgstr "Filament N XX"
#~ msgid ""
#~ "Filament to print support and skirt. 0 means no specific filament for "
#~ "support and current filament is used"
#~ msgstr ""
#~ "Filament för att skriva ut support och skirt med. 0 betyder inget "
#~ "speciellt filament för support och nuvarande filament används"
#~ msgid ""
#~ "Filament to print support interface. 0 means no specific filament for "
#~ "support interface and current filament is used"
#~ msgstr ""
#~ "Support filament för utskrift. 0 betyder att inget specifikt filament för "
#~ "support gränssnitt och nuvarande filament används"
#~ msgid "Filaments Selection"
#~ msgstr "Filament Val"
#~ msgid "Finish"
#~ msgstr "Slutför"
#~ msgid "Finished"
#~ msgstr "Färdig"
@ -8110,6 +8138,9 @@ msgstr ""
#~ "auto-placering för att undvika kollision när man skriver ut objekt för "
#~ "objekt"
#~ msgid "Import 3MF/STL/STEP/OBJ/AMF"
#~ msgstr "Importera 3MF/STL/STEP/OBJ/AMF"
#~ msgid "In the calibration of extrusion flow"
#~ msgstr "Vid kalibrering av extruderingsflödet"
@ -8151,6 +8182,9 @@ msgstr ""
#~ msgid "Monitoring"
#~ msgstr "Övervakar"
#~ msgid "Monitoring Recording"
#~ msgstr "Övervaknings Inspelning"
#~ msgid "Open"
#~ msgstr "Öppna"
@ -8163,6 +8197,9 @@ msgstr ""
#~ msgid "Output file"
#~ msgstr "Utdatafil"
#~ msgid "Part Cooling"
#~ msgstr "Del Kylning"
#~ msgid "Pause(heated bed temperature error)"
#~ msgstr "Paus (temperaturfel i byggplattan)"
@ -8245,6 +8282,12 @@ msgstr ""
#~ msgid "Reload items"
#~ msgstr "Ladda om objekten"
#~ msgid "Repair"
#~ msgstr "Reparera"
#~ msgid "Repair the model's meshes if it is non-manifold mesh"
#~ msgstr "Reparera modellens mesh om den inte är mångfaldig"
#~ msgid "Report"
#~ msgstr "Rapportera"
@ -8278,6 +8321,14 @@ msgstr ""
#~ msgid "Spiral mode"
#~ msgstr "Spiral läge"
#~ msgid ""
#~ "Spiral mode only works when wall loops is 1, \n"
#~ "support is disabled, top shell layers is 0 and sparse infill density is "
#~ "0\n"
#~ msgstr ""
#~ "Spiral läge fungerar bara när vägg antalet är 1,\n"
#~ "support är inaktiverad, top lager är 0 och låg ifyllnads densitet är 0\n"
#~ msgid "Successfully sent.Will automatically jump to the device page in %s s"
#~ msgstr ""
#~ "Framgångsrikt skickat. Kommer automatiskt att hoppa till enhetssidan om "
@ -8331,6 +8382,13 @@ msgstr ""
#~ "byte för att spara filament och minska utskriftstiden. Objektens färger "
#~ "blandas som ett resultat"
#~ msgid ""
#~ "This setting specifies whether to add infill inside large hollows of tree "
#~ "support"
#~ msgstr ""
#~ "Inställningen bestämmer om det ska läggas till ifyllnad i stora hålrum av "
#~ "tree support"
#~ msgid ""
#~ "This setting stands for how much volume of filament can be melted and "
#~ "extruded per second. Printing speed is limited by max volumetric speed, "
@ -8347,6 +8405,9 @@ msgstr ""
#~ msgid "Translation"
#~ msgstr "Översättning"
#~ msgid "Tree support with infill"
#~ msgstr "Tree support med ifyllnad"
#~ msgid "Unable to create zip file"
#~ msgstr "Det gick inte att skapa zip-fil"
@ -8379,9 +8440,20 @@ msgstr ""
#~ msgid " is too close to others, there will be collisions when printing.\n"
#~ msgstr " för tätt inpå andra, utskriften kolliderar.\n"
#~ msgid "hybrid(auto)"
#~ msgstr "hybrid(auto)"
#~ msgid "normal"
#~ msgstr "normal"
#~ msgid ""
#~ "normal(auto) and tree(auto) is used to generate support automatically. If "
#~ "normal or tree is selected, only support enforcers are generated"
#~ msgstr ""
#~ "normal(auto), hybrid(auto) och tree(auto) används för att skapa support "
#~ "automatiskt. Om normal eller tree är vald, kommer endast tvingande "
#~ "support skapas"
#~ msgid "the 3mf is not compatible, load geometry data only!"
#~ msgstr "3mf ej kompatibel, laddar endast geometrin !"

137
bbl/i18n/zh_cn/BambuStudio_zh_CN.po
View file

@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Slic3rPE\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-12-13 20:02+0800\n"
"PO-Revision-Date: 2022-12-13 20:18+0800\n"
"POT-Creation-Date: 2022-12-24 13:01+0800\n"
"PO-Revision-Date: 2022-12-22 17:47+0800\n"
"Last-Translator: Jiang Yue <maze1024@gmail.com>\n"
"Language-Team: \n"
"Language: zh_CN\n"
@ -15,7 +15,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Poedit 3.0.1\n"
"X-Generator: Poedit 3.1\n"
msgid "Supports Painting"
msgstr "支撑绘制"
@ -708,7 +708,7 @@ msgid "Set filament for selected items"
msgstr "设置所选项的耗材丝"
msgid "Default"
msgstr "默认"
msgstr "缺省"
#, c-format, boost-format
msgid "Filament %d"
@ -1824,10 +1824,11 @@ msgstr ""
"这个数值将被重置为0。"
msgid ""
"Spiral mode only works when wall loops is 1, \n"
"support is disabled, top shell layers is 0 and sparse infill density is 0\n"
"Spiral mode only works when wall loops is 1, support is disabled, top shell "
"layers is 0, sparse infill density is 0 and timelapse type is traditional"
msgstr ""
"旋转模式只能在外墙层数为1，关闭支撑，顶层层数为0，稀疏填充密度为0时有效。\n"
"旋转模式只能在外墙层数为1，关闭支撑，顶层层数为0，稀疏填充密度为0，传统延时摄"
"影时有效"
msgid ""
"Change these settings automatically? \n"
@ -1983,10 +1984,10 @@ msgid "Unknown"
msgstr "未定义"
msgid "Fatal"
msgstr ""
msgstr "致命"
msgid "Serious"
msgstr ""
msgstr "严重"
msgid "Common"
msgstr ""
@ -2479,7 +2480,7 @@ msgid "No"
msgstr "否"
msgid " will be closed before creating a new model. Do you want to continue?"
msgstr "会被关闭以创建新模型。是否继续？"
msgstr "将会被关闭以创建新模型。是否继续？"
msgid "Slice"
msgstr "切片"
@ -3229,6 +3230,12 @@ msgstr "集成失败。"
msgid "Undo integration was successful."
msgstr "集成取消成功。"
msgid "New network plug-in available."
msgstr "新的网络插件可用。"
msgid "Details"
msgstr "详情"
msgid "Undo integration failed."
msgstr "集成取消失败。"
@ -4386,6 +4393,38 @@ msgid ""
msgstr ""
"平滑模式的延时摄影需要擦料塔，否则打印件上可能会有瑕疵。您想打开擦料塔吗？"
msgid ""
"We have added an experimental style \"Tree Slim\" that features smaller "
"support volume but weaker strength.\n"
"We recommand using it with: 0 interface layers, 0 top distance, 2 walls."
msgstr ""
"我们加入一个新的实验性风格\\\"苗条树\\\"，它使用更少的支撑体积，但强度可能较"
"弱。\n"
"\"因此我们推荐以下参数：接触层数为0，顶部Z距离为0，墙层数为2。"
msgid ""
"Change these settings automatically? \n"
"Yes - Change these settings automatically\n"
"No - Do not change these settings for me"
msgstr ""
"自动调整这些设置？\n"
"是 - 自动调整这些设置\n"
"否 - 不用为我调整这些设置"
msgid ""
"For \"Tree Strong\" and \"Tree Hybrid\" styles, we recommand the following "
"settings: at least 2 interface layers, at least 0.1 top z distance or using "
"support materials on interface."
msgstr ""
msgid ""
"When using support material for the support interface, We recommand the "
"following settings:\n"
"0 top distance, 0 interface spacing, concentric pattern."
msgstr ""
"当使用支撑材料作为支撑面，我们推荐以下设置：\n"
"顶部Z距离为0， 支撑面线距为0，接触面图案为同。"
msgid ""
"When recording timelapse without toolhead, it is recommended to add a "
"\"Timelapse Wipe Tower\" \n"
@ -5114,6 +5153,17 @@ msgstr "更新说明"
msgid "version %s update information :"
msgstr "版本 %s 更新信息"
msgid "Network plug-in update"
msgstr "网络插件升级"
msgid ""
"Click OK to update the Network plug-in when Bambu Studio launches next time."
msgstr "点击OK将在Bambu Studio下次启动之后自动升级网络插件"
#, c-format, boost-format
msgid "A new Network plug-in(%s) available, Do you want to install it?"
msgstr "新的网络插件(%s) 可用，您是否需要安装它？"
msgid "New version of Bambu Studio"
msgstr "新版本的Bambu Studio"
@ -7008,10 +7058,11 @@ msgstr "开启支撑生成。"
msgid ""
"normal(auto) and tree(auto) is used to generate support automatically. If "
"normal or tree is selected, only support enforcers are generated"
"normal(manual) or tree(manual) is selected, only support enforcers are "
"generated"
msgstr ""
"普通（自动）和树状（自动）用于自动生成支撑体。如果选择普通或树状，仅会在支撑"
"强制面上生成支撑。"
"普通（自动）和树状（自动）用于自动生成支撑体。如果选择普通（手动）或树状（手"
"动），仅会在支撑强制面上生成支撑。"
msgid "normal(auto)"
msgstr "普通(自动)"
@ -7019,9 +7070,6 @@ msgstr "普通(自动)"
msgid "tree(auto)"
msgstr "树状(自动)"
msgid "hybrid(auto)"
msgstr "混合(自动)"
msgid "normal(manual)"
msgstr "普通(手动)"
@ -7066,10 +7114,14 @@ msgstr "底部Z距离"
msgid "The z gap between the bottom support interface and object"
msgstr "支撑生成于模型表面时，支撑面底部和模型之间的z间隙"
msgid "Support base"
msgstr "支撑主体"
msgid ""
"Filament to print support and raft. \"Default\" means no specific filament "
"for support and current filament is used"
msgstr "打印支撑和筏层的耗材丝。“默认”代表不指定特定的耗材丝，并使用当前耗材"
"Filament to print support base and raft. \"Default\" means no specific "
"filament for support and current filament is used"
msgstr ""
"打印支撑主体和筏层的耗材丝。\"缺省\"代表不指定特定的耗材丝，并使用当前耗材"
msgid "Line width of support"
msgstr "支撑的线宽"
@ -7084,7 +7136,7 @@ msgstr "使用圈形走线覆盖顶部接触面。默认关闭。"
msgid ""
"Filament to print support interface. \"Default\" means no specific filament "
"for support interface and current filament is used"
msgstr "打印支撑接触面的耗材丝。“默认”代表不指定特定的耗材丝，并使用当前耗材"
msgstr "打印支撑接触面的耗材丝。\"缺省\"代表不指定特定的耗材丝，并使用当前耗材"
msgid "Top interface layers"
msgstr "顶部接触面层数"
@ -7119,6 +7171,9 @@ msgstr "支撑走线图案"
msgid "Rectilinear grid"
msgstr "直线网格"
msgid "Hollow"
msgstr "空心"
msgid "Interface pattern"
msgstr "支撑面图案"
@ -7148,9 +7203,27 @@ msgstr "支撑打印速度"
msgid "Style"
msgstr "样式"
msgid ""
"Style and shape of the support. For normal support, projecting the supports "
"into a regular grid will create more stable supports (default), while snug "
"support towers will save material and reduce object scarring.\n"
"For tree support, tight style will merge branches more aggressively and save "
"a lot of material (default), while hybrid style will create similar "
"structure to normal support under large flat overhangs."
msgstr ""
msgid "Snug"
msgstr "紧贴"
msgid "Tree Slim"
msgstr "苗条树"
msgid "Tree Strong"
msgstr "粗壮树"
msgid "Tree Hybrid"
msgstr "混合树"
msgid "Independent support layer height"
msgstr "支撑独立层高"
@ -7874,6 +7947,30 @@ msgstr ""
"提高强度\n"
"你知道吗？你可以使用更多的墙层数和更高的疏散填充密度来提高模型的强度。"
#~ msgid ""
#~ "normal(auto) and tree(auto) is used to generate support automatically. If "
#~ "normal or tree is selected, only support enforcers are generated"
#~ msgstr ""
#~ "普通（自动）和树状（自动）用于自动生成支撑体。如果选择普通或树状，仅会在支"
#~ "撑强制面上生成支撑。"
#~ msgid "hybrid(auto)"
#~ msgstr "混合(自动)"
#~ msgid ""
#~ "Filament to print support and raft. \"Default\" means no specific "
#~ "filament for support and current filament is used"
#~ msgstr ""
#~ "打印支撑和筏层的耗材丝。\"缺省\"代表不指定特定的耗材丝，并使用当前耗材"
#~ msgid ""
#~ "Spiral mode only works when wall loops is 1, \n"
#~ "support is disabled, top shell layers is 0 and sparse infill density is "
#~ "0\n"
#~ msgstr ""
#~ "旋转模式只能在外墙层数为1，关闭支撑，顶层层数为0，稀疏填充密度为0时有"
#~ "效。\n"
#~ msgid ""
#~ "When sparse infill density is low, the internal solid infill or internal "
#~ "bridge may have no archor at the end of line. This cause falling and bad "

BIN
resources/i18n/de/BambuStudio.mo
View file

Binary file not shown.

BIN
resources/i18n/en/BambuStudio.mo
View file

Binary file not shown.

BIN
resources/i18n/es/BambuStudio.mo
View file

Binary file not shown.

BIN
resources/i18n/fr/BambuStudio.mo
View file

Binary file not shown.

BIN
resources/i18n/hu/BambuStudio.mo
View file

Binary file not shown.

BIN
resources/i18n/it/BambuStudio.mo Normal file
View file

Binary file not shown.

BIN
resources/i18n/nl/BambuStudio.mo
View file

Binary file not shown.

BIN
resources/i18n/sv/BambuStudio.mo
View file

Binary file not shown.

BIN
resources/i18n/zh_cn/BambuStudio.mo
View file

Binary file not shown.

BIN
resources/images/BambuStudio_about.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 13 KiB

87
resources/images/BambuStudio_about.svg Normal file
View file

@ -0,0 +1,87 @@
<svg width="562" height="238" viewBox="0 0 562 238" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect x="1" y="1" width="560" height="237" fill="#00AE42"/>
<g opacity="0.2">
<path d="M19.234 8.7434V25.4149L37.159 18.6717V2.00019L19.234 8.7434Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M19.2341 8.7434V25.4149L1 18.6717V2.00019L19.2341 8.7434Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M90.9363 8.7434V25.4149L73.0113 18.6717V2.00019L90.9363 8.7434Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M127.404 8.7434V25.4149L145.329 18.6717V2.00019L127.404 8.7434Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M19.2341 25.538V42.2238L1 35.4806V18.8091L19.2341 25.538Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M19.234 58.7326V75.8463L37.159 68.9302V51.8313L19.234 58.7326Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M55.3944 25.538V42.2238L73.0104 35.4806V18.8091L55.3944 25.538Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M90.9363 42.2787V58.7364L73.0113 52.0939V35.6219L90.9363 42.2787Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M90.9363 96.0424V112.5L73.0113 105.858V89.3856L90.9363 96.0424Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M55.3945 25.6388V42.524L37.1604 35.7089V18.8091L55.3945 25.6388Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M55.3945 42.3652V59.0366L37.1604 52.3078V35.6219L55.3945 42.3652Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M127.404 42.2787V58.7364L145.329 52.0939V35.6219L127.404 42.2787Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M163.251 25.538V42.2238L145.326 35.4806V18.8091L163.251 25.538Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M127.404 75.4718V92.357L145.329 85.5419V68.6422L127.404 75.4718Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M163.251 42.2233V59.337L145.326 52.4209V35.472L163.251 42.2233Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M90.9338 58.7326V75.8463L108.859 68.9302V51.8313L90.9338 58.7326Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M199.413 25.538V42.2238L181.179 35.4806V18.8091L199.413 25.538Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M127.401 25.538V42.2238L108.858 35.4806V18.8091L127.401 25.538Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M199.413 58.7326V75.8463L181.179 68.9302V51.8313L199.413 58.7326Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M163.253 8.65694V25.1147L181.178 18.4721V2.00019L163.253 8.65694Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
</g>
<g opacity="0.2">
<path d="M235.752 8.74321V25.4147L253.677 18.6715V2L235.752 8.74321Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M235.75 8.74321V25.4147L217.516 18.6715V2L235.75 8.74321Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M307.45 8.74321V25.4147L289.525 18.6715V2L307.45 8.74321Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M343.92 8.74321V25.4147L361.845 18.6715V2L343.92 8.74321Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M199.591 42.2785V58.7363L217.516 52.0937V35.6218L199.591 42.2785Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M235.75 25.5378V42.2236L217.516 35.4804V18.8089L235.75 25.5378Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M235.752 58.7325V75.8461L253.677 68.93V51.8311L235.752 58.7325Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M271.91 25.5378V42.2236L289.526 35.4804V18.8089L271.91 25.5378Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M307.45 42.2785V58.7363L289.525 52.0937V35.6218L307.45 42.2785Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M307.45 76.8426V93.3003L289.525 86.6577V70.1858L307.45 76.8426Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M271.908 25.6386V42.5238L253.674 35.7087V18.8089L271.908 25.6386Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M271.908 42.365V59.0365L253.674 52.3076V35.6218L271.908 42.365Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M343.92 42.2785V58.7363L361.845 52.0937V35.6218L343.92 42.2785Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M379.769 25.5378V42.2236L361.844 35.4804V18.8089L379.769 25.5378Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M343.92 75.4716V92.3568L361.845 85.5417V68.642L343.92 75.4716Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M379.769 42.2231V59.3368L361.844 52.4207V35.4719L379.769 42.2231Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M307.452 58.7325V75.8461L325.377 68.93V51.8311L307.452 58.7325Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M415.925 25.5378V42.2236L397.691 35.4804V18.8089L415.925 25.5378Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M379.771 58.7472V75.8461L397.696 68.9447V51.8311L379.771 58.7472Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M379.769 98.3847V115.484L397.694 108.582V91.4686L379.769 98.3847Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M343.917 25.5378V42.2236L325.374 35.4804V18.8089L343.917 25.5378Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M415.925 58.7325V75.8461L397.691 68.93V51.8311L415.925 58.7325Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M455.53 113.522V130.636L437.296 123.72V106.621L455.53 113.522Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M379.771 8.65675V25.1145L397.696 18.4719V2L379.771 8.65675Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
</g>
<g opacity="0.5">
<g opacity="0.2">
<path d="M452.919 8.74321V25.4147L434.685 18.6715V2L452.919 8.74321Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M416.76 42.2785V58.7363L434.685 52.0937V35.6218L416.76 42.2785Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M416.76 75.2345V91.6922L434.685 85.0496V68.5777L416.76 75.2345Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M452.919 25.5378V42.2236L434.685 35.4804V18.8089L452.919 25.5378Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
</g>
</g>
<g opacity="0.2">
<path d="M452.832 8.74321V25.4147L470.757 18.6715V2L452.832 8.74321Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M452.832 8.74321V25.4147L434.598 18.6715V2L452.832 8.74321Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M524.534 8.74321V25.4147L506.609 18.6715V2L524.534 8.74321Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M452.832 25.5378V42.2236L434.598 35.4804V18.8089L452.832 25.5378Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M452.832 58.7325V75.8461L470.757 68.93V51.8311L452.832 58.7325Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M488.992 25.5378V42.2236L506.608 35.4804V18.8089L488.992 25.5378Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M524.534 42.2785V58.7363L506.609 52.0937V35.6218L524.534 42.2785Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M524.534 96.0422V112.5L506.609 105.857V89.3854L524.534 96.0422Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M488.992 25.6386V42.5238L470.758 35.7087V18.8089L488.992 25.6386Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M488.992 42.365V59.0365L470.758 52.3076V35.6218L488.992 42.365Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M524.531 58.7325V75.8461L542.457 68.93V51.8311L524.531 58.7325Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M560.999 25.5378V42.2236L542.456 35.4804V18.8089L560.999 25.5378Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
<path d="M560.999 77.5065V94.1923L542.456 87.4491V70.7776L560.999 77.5065Z" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
</g>
<path d="M248.355 127.203V110.613H243.689V131.077H260.806L259.335 127.203H248.355Z" fill="white"/>
<path d="M280.597 114.678H264.164L265.501 118.212H280.434C280.687 118.212 280.895 118.419 280.895 118.67V120.755H267.566C265.055 120.755 263.02 122.781 263.02 125.279V126.551C263.02 129.05 265.055 131.076 267.566 131.076H285.159V119.188C285.159 116.704 283.123 114.678 280.597 114.678ZM280.88 127.512H267.73C267.477 127.512 267.269 127.305 267.269 127.054V124.732C267.269 124.481 267.477 124.274 267.73 124.274H280.88V127.512Z" fill="white"/>
<path d="M304.669 114.678H293.941V110.583H293.852H289.261V131.076H293.941H304.669C307.18 131.076 309.216 129.05 309.216 126.551V119.218C309.231 116.719 307.195 114.678 304.669 114.678ZM304.64 127.069C304.64 127.32 304.432 127.527 304.179 127.527H293.941V118.286H304.179C304.432 118.286 304.64 118.493 304.64 118.744V127.069Z" fill="white"/>
<path d="M319.319 88.403H296.169V104.801H300.716V92.4543C300.716 92.203 300.924 91.996 301.177 91.996H307.328C307.581 91.996 307.789 92.203 307.789 92.4543V104.801H312.351V92.4543C312.351 92.203 312.559 91.996 312.811 91.996H318.874C319.126 91.996 319.334 92.203 319.334 92.4543V104.801H323.911V92.9275C323.866 90.4287 321.83 88.403 319.319 88.403Z" fill="white"/>
<path d="M367.491 100.779C367.491 101.03 367.283 101.237 367.031 101.237H356.095C355.842 101.237 355.634 101.03 355.634 100.779V88.403H351.34V100.276C351.34 102.775 353.375 104.801 355.887 104.801H367.194C369.705 104.801 371.741 102.775 371.741 100.276V88.403H367.476V100.779H367.491Z" fill="white"/>
<path d="M287.492 88.403H271.058L272.395 91.9368H287.328C287.581 91.9368 287.789 92.1438 287.789 92.3952V94.48H274.461C271.95 94.48 269.914 96.5057 269.914 99.0045V100.276C269.914 102.775 271.95 104.801 274.461 104.801H292.039V92.9127C292.053 90.4139 290.003 88.403 287.492 88.403ZM287.774 101.237H274.624C274.372 101.237 274.164 101.03 274.164 100.779V98.4574C274.164 98.2061 274.372 97.9991 274.624 97.9991H287.774V101.237Z" fill="white"/>
<path d="M342.976 88.4034H332.248V84.3077H332.158H327.567V104.801H332.248H342.976C345.487 104.801 347.522 102.775 347.522 100.276V92.9279C347.537 90.429 345.502 88.4034 342.976 88.4034ZM342.946 100.779C342.946 101.031 342.738 101.238 342.485 101.238H332.248V91.9963H342.485C342.738 91.9963 342.946 92.2033 342.946 92.4547V100.779Z" fill="white"/>
<path d="M266.452 98.0871C266.319 96.5198 265.516 95.1151 264.268 94.0801C264.922 93.1782 265.353 92.084 265.427 90.9012C265.427 90.7829 265.457 89.6887 265.442 89.5409C265.175 86.1401 261.802 83.4639 257.701 83.4639C257.641 83.4639 252.426 83.4639 248.369 83.4639V87.116L243.689 88.9051V104.815H260.539C260.539 104.815 260.821 104.8 260.94 104.8C263.897 104.608 266.259 102.212 266.452 99.2108C266.467 99.063 266.452 98.235 266.452 98.0871ZM248.354 87.1012H258.28C258.577 87.1012 258.86 87.1603 259.112 87.2786C260.048 87.6483 260.717 88.565 260.717 89.6296C260.717 89.6296 260.702 89.9844 260.657 90.1619C260.524 90.9751 259.974 91.6257 259.246 91.9214C258.919 92.0693 258.562 92.158 258.176 92.158H248.354V87.1012ZM258.934 101.237H248.354V95.7805H258.934C260.449 95.7805 261.668 96.993 261.668 98.5011C261.668 100.024 260.449 101.237 258.934 101.237Z" fill="white"/>
<path d="M248.354 83.4486V79.0276L243.689 80.8167V85.2377L248.354 83.4486Z" fill="white"/>
<path d="M212.56 98.4442V131.077H231.222V105.748L212.56 98.4442Z" fill="white"/>
<path d="M212.56 79V95.3236L231.222 102.643V79H212.56Z" fill="white"/>
<path d="M191 111.647V79H209.663V104.328L191 111.647Z" fill="white"/>
<path d="M191 131.076V114.767L209.663 107.448V131.076H191Z" fill="white"/>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 12 KiB

10
resources/images/param_hollow.svg Normal file
View file

@ -0,0 +1,10 @@
<svg width="10" height="10" viewBox="0 0 10 10" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_9167_33521)">
<rect x="0.75" y="0.75" width="8.5" height="8.5" rx="0.25" stroke="#262E30" stroke-width="0.5"/>
</g>
<defs>
<clipPath id="clip0_9167_33521">
<rect width="10" height="10" fill="white"/>
</clipPath>
</defs>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 348 B

78
resources/profiles/BBL.json
View file

@ -1,7 +1,7 @@
{
"name": "Bambulab",
"url": "http://www.bambulab.com/Parameters/vendor/BBL.json",
"version": "01.04.00.16",
"version": "01.04.01.01",
"force_update": "0",
"description": "the initial version of BBL configurations",
"machine_model_list": [
@ -123,6 +123,30 @@
"name":"0.30mm Standard @BBL P1P 0.6 nozzle",
"sub_path":"process/0.30mm Standard @BBL P1P 0.6 nozzle.json"
},
{
"name":"0.08mm Extra Fine @BBL P1P",
"sub_path":"process/0.08mm Extra Fine @BBL P1P.json"
},
{
"name":"0.12mm Fine @BBL P1P",
"sub_path":"process/0.12mm Fine @BBL P1P.json"
},
{
"name":"0.16mm Optimal @BBL P1P",
"sub_path":"process/0.16mm Optimal @BBL P1P.json"
},
{
"name":"0.20mm Strength @BBL P1P",
"sub_path":"process/0.20mm Strength @BBL P1P.json"
},
{
"name":"0.24mm Draft @BBL P1P",
"sub_path":"process/0.24mm Draft @BBL P1P.json"
},
{
"name":"0.28mm Extra Draft @BBL P1P",
"sub_path":"process/0.28mm Extra Draft @BBL P1P.json"
},
{
"name":"0.40mm Standard @BBL P1P 0.8 nozzle",
"sub_path":"process/0.40mm Standard @BBL P1P 0.8 nozzle.json"
@ -505,6 +529,38 @@
"name":"Generic PETG @0.2 nozzle",
"sub_path":"filament/Generic PETG @0.2 nozzle.json"
},
{
"name":"Bambu PLA Metal @BBL X1C 0.2 nozzle",
"sub_path":"filament/Bambu PLA Metal @BBL X1C 0.2 nozzle.json"
},
{
"name":"Bambu PLA Metal @BBL X1",
"sub_path":"filament/Bambu PLA Metal @BBL X1.json"
},
{
"name":"Bambu PLA Metal @BBL X1C",
"sub_path":"filament/Bambu PLA Metal @BBL X1C.json"
},
{
"name":"Bambu PLA-CF @base",
"sub_path":"filament/Bambu PLA-CF @base.json"
},
{
"name":"Bambu PLA-CF @BBL X1C 0.8 nozzle",
"sub_path":"filament/Bambu PLA-CF @BBL X1C 0.8 nozzle.json"
},
{
"name":"Bambu PLA-CF @BBL X1C",
"sub_path":"filament/Bambu PLA-CF @BBL X1C.json"
},
{
"name":"Bambu PAHT-CF @base",
"sub_path":"filament/Bambu PAHT-CF @base.json"
},
{
"name":"Bambu PAHT-CF @BBL X1C",
"sub_path":"filament/Bambu PAHT-CF @BBL X1C.json"
},
{
"name": "Generic PETG @BBL P1P",
"sub_path": "filament/P1P/Generic PETG @BBL P1P.json"
@ -553,9 +609,29 @@
"name":"Generic PETG @BBL P1P 0.2 nozzle",
"sub_path":"filament/P1P/Generic PETG @BBL P1P 0.2 nozzle.json"
},
{
"name":"Bambu PAHT-CF @BBL P1P",
"sub_path":"filament/P1P/Bambu PAHT-CF @BBL P1P.json"
},
{
"name":"Bambu PLA Metal @BBL P1P 0.2 nozzle",
"sub_path":"filament/P1P/Bambu PLA Metal @BBL P1P 0.2 nozzle.json"
},
{
"name":"Bambu PLA Metal @BBL P1P",
"sub_path":"filament/P1P/Bambu PLA Metal @BBL P1P.json"
},
{
"name":"Bambu PLA-CF @BBL P1P",
"sub_path":"filament/P1P/Bambu PLA-CF @BBL P1P.json"
},
{
"name":"Generic PLA-CF @BBL P1P",
"sub_path":"filament/P1P/Generic PLA-CF @BBL P1P.json"
},
{
"name":"Bambu PLA-CF @BBL P1P 0.8 nozzle",
"sub_path":"filament/P1P/Bambu PLA-CF @BBL P1P 0.8 nozzle.json"
}
],
"machine_list": [

4
resources/profiles/BBL/filament/Bambu PA-CF @base.json
View file

@ -6,7 +6,7 @@
"instantiation": "false",
"inherits": "fdm_filament_pa",
"required_nozzle_HRC": [
"55"
"40"
],
"filament_vendor": [
"Bambu Lab"
@ -30,7 +30,7 @@
"PA-CF"
],
"filament_cost": [
"44.99"
"84.99"
],
"nozzle_temperature": [
"280"

16
resources/profiles/BBL/filament/Bambu PAHT-CF @BBL X1C.json Normal file
View file

@ -0,0 +1,16 @@
{
"type": "filament",
"setting_id": "GFSN04",
"name": "Bambu PAHT-CF @BBL X1C",
"from": "system",
"instantiation": "true",
"inherits": "Bambu PAHT-CF @base",
"compatible_printers": [
"Bambu Lab X1 Carbon 0.4 nozzle",
"Bambu Lab X1 Carbon 0.6 nozzle",
"Bambu Lab X1 Carbon 0.8 nozzle",
"Bambu Lab X1 0.4 nozzle",
"Bambu Lab X1 0.6 nozzle",
"Bambu Lab X1 0.8 nozzle"
]
}

56
resources/profiles/BBL/filament/Bambu PAHT-CF @base.json Normal file
View file

@ -0,0 +1,56 @@
{
"type": "filament",
"filament_id": "GFN04",
"name": "Bambu PAHT-CF @base",
"from": "system",
"instantiation": "false",
"inherits": "fdm_filament_pa",
"filament_max_volumetric_speed": [
"8"
],
"fan_max_speed": [
"30"
],
"fan_min_speed": [
"10"
],
"fan_cooling_layer_time": [
"5"
],
"full_fan_speed_layer": [
"2"
],
"required_nozzle_HRC": [
"40"
],
"filament_vendor": [
"Bambu Lab"
],
"filament_density": [
"1.06"
],
"filament_flow_ratio": [
"0.96"
],
"nozzle_temperature_initial_layer": [
"290"
],
"overhang_fan_threshold": [
"0%"
],
"overhang_fan_speed": [
"40"
],
"filament_type": [
"PA-CF"
],
"filament_cost": [
"94.99"
],
"temperature_vitrification": [
"180"
],
"nozzle_temperature": [
"290"
]
}

19
resources/profiles/BBL/filament/Bambu PLA Metal @BBL X1.json Normal file
View file

@ -0,0 +1,19 @@
{
"type": "filament",
"setting_id": "GFSA02_02",
"name": "Bambu PLA Metal @BBL X1",
"from": "system",
"instantiation": "true",
"inherits": "Bambu PLA Metal @base",
"filament_max_volumetric_speed": [
"21"
],
"slow_down_layer_time": [
"8"
],
"compatible_printers": [
"Bambu Lab X1 0.4 nozzle",
"Bambu Lab X1 0.6 nozzle",
"Bambu Lab X1 0.8 nozzle"
]
}

15
resources/profiles/BBL/filament/Bambu PLA Metal @BBL X1C 0.2 nozzle.json Normal file
View file

@ -0,0 +1,15 @@
{
"type": "filament",
"setting_id": "GFSA02_01",
"name": "Bambu PLA Metal @BBL X1C 0.2 nozzle",
"from": "system",
"instantiation": "true",
"inherits": "Bambu PLA Metal @base",
"filament_max_volumetric_speed": [
"2"
],
"compatible_printers": [
"Bambu Lab X1 Carbon 0.2 nozzle",
"Bambu Lab X1 0.2 nozzle"
]
}

5
resources/profiles/BBL/filament/Bambu PLA Metal @BBL X1C.json
View file

@ -6,10 +6,11 @@
"instantiation": "true",
"inherits": "Bambu PLA Metal @base",
"filament_max_volumetric_speed": [
"25"
"21"
],
"compatible_printers": [
"Bambu Lab X1 Carbon 0.4 nozzle",
"Bambu Lab X1 0.4 nozzle"
"Bambu Lab X1 Carbon 0.6 nozzle",
"Bambu Lab X1 Carbon 0.8 nozzle"
]
}

6
resources/profiles/BBL/filament/Bambu PLA Metal @base.json
View file

@ -9,12 +9,12 @@
"Bambu Lab"
],
"filament_cost": [
"25.4"
"29.99"
],
"filament_flow_ratio": [
"0.95"
"0.98"
],
"filament_density": [
"1.24"
"1.25"
]
}

23
resources/profiles/BBL/filament/Bambu PLA-CF @BBL X1C 0.8 nozzle.json Normal file
View file

@ -0,0 +1,23 @@
{
"type": "filament",
"setting_id": "GFSA50_02",
"name": "Bambu PLA-CF @BBL X1C 0.8 nozzle",
"from": "system",
"instantiation": "true",
"inherits": "Bambu PLA-CF @base",
"filament_max_volumetric_speed": [
"18"
],
"nozzle_temperature_initial_layer": [
"230"
],
"nozzle_temperature": [
"230"
],
"compatible_printers": [
"Bambu Lab X1 Carbon 0.6 nozzle",
"Bambu Lab X1 Carbon 0.8 nozzle",
"Bambu Lab X1 0.6 nozzle",
"Bambu Lab X1 0.8 nozzle"
]
}

24
resources/profiles/BBL/filament/Bambu PLA-CF @BBL X1C.json Normal file
View file

@ -0,0 +1,24 @@
{
"type": "filament",
"setting_id": "GFSA50_01",
"name": "Bambu PLA-CF @BBL X1C",
"from": "system",
"instantiation": "true",
"inherits": "Bambu PLA-CF @base",
"filament_max_volumetric_speed": [
"15"
],
"slow_down_layer_time": [
"2"
],
"nozzle_temperature_initial_layer": [
"230"
],
"nozzle_temperature": [
"230"
],
"compatible_printers": [
"Bambu Lab X1 Carbon 0.4 nozzle",
"Bambu Lab X1 0.4 nozzle"
]
}

35
resources/profiles/BBL/filament/Bambu PLA-CF @base.json Normal file
View file

@ -0,0 +1,35 @@
{
"type": "filament",
"filament_id": "GFA50",
"name": "Bambu PLA-CF @base",
"from": "system",
"instantiation": "false",
"inherits": "fdm_filament_pla",
"filament_vendor": [
"Bambu Lab"
],
"filament_cost": [
"34.99"
],
"filament_flow_ratio": [
"0.98"
],
"filament_density": [
"1.22"
],
"required_nozzle_HRC": [
"40"
],
"nozzle_temperature_range_low": [
"210"
],
"nozzle_temperature_range_high": [
"250"
],
"additional_cooling_fan_speed": [
"0"
],
"filament_type": [
"PLA-CF"
]
}

13
resources/profiles/BBL/filament/P1P/Bambu PAHT-CF @BBL P1P.json Normal file
View file

@ -0,0 +1,13 @@
{
"type": "filament",
"setting_id": "GFSN04_10",
"name": "Bambu PAHT-CF @BBL P1P",
"from": "system",
"instantiation": "true",
"inherits": "Bambu PAHT-CF @base",
"compatible_printers": [
"Bambu Lab P1P 0.4 nozzle",
"Bambu Lab P1P 0.6 nozzle",
"Bambu Lab P1P 0.8 nozzle"
]
}

32
resources/profiles/BBL/filament/P1P/Bambu PLA Metal @BBL P1P 0.2 nozzle.json Normal file
View file

@ -0,0 +1,32 @@
{
"type": "filament",
"setting_id": "GFSA02_11",
"name": "Bambu PLA Metal @BBL P1P 0.2 nozzle",
"from": "system",
"instantiation": "true",
"inherits": "Bambu PLA Metal @base",
"filament_max_volumetric_speed": [
"2"
],
"hot_plate_temp" : [
"65"
],
"hot_plate_temp_initial_layer" : [
"65"
],
"textured_plate_temp" : [
"65"
],
"textured_plate_temp_initial_layer" : [
"65"
],
"fan_min_speed": [
"50"
],
"fan_cooling_layer_time": [
"80"
],
"compatible_printers": [
"Bambu Lab P1P 0.2 nozzle"
]
}

37
resources/profiles/BBL/filament/P1P/Bambu PLA Metal @BBL P1P.json Normal file
View file

@ -0,0 +1,37 @@
{
"type": "filament",
"setting_id": "GFSA02_10",
"name": "Bambu PLA Metal @BBL P1P",
"from": "system",
"instantiation": "true",
"inherits": "Bambu PLA Metal @base",
"filament_max_volumetric_speed": [
"21"
],
"slow_down_layer_time": [
"8"
],
"hot_plate_temp" : [
"65"
],
"hot_plate_temp_initial_layer" : [
"65"
],
"textured_plate_temp" : [
"65"
],
"textured_plate_temp_initial_layer" : [
"65"
],
"fan_min_speed": [
"50"
],
"fan_cooling_layer_time": [
"80"
],
"compatible_printers": [
"Bambu Lab P1P 0.4 nozzle",
"Bambu Lab P1P 0.6 nozzle",
"Bambu Lab P1P 0.8 nozzle"
]
}

39
resources/profiles/BBL/filament/P1P/Bambu PLA-CF @BBL P1P 0.8 nozzle.json Normal file
View file

@ -0,0 +1,39 @@
{
"type": "filament",
"setting_id": "GFSA50_11",
"name": "Bambu PLA-CF @BBL P1P 0.8 nozzle",
"from": "system",
"instantiation": "true",
"inherits": "Bambu PLA-CF @base",
"filament_max_volumetric_speed": [
"18"
],
"hot_plate_temp" : [
"65"
],
"hot_plate_temp_initial_layer" : [
"65"
],
"textured_plate_temp" : [
"65"
],
"textured_plate_temp_initial_layer" : [
"65"
],
"fan_min_speed": [
"50"
],
"fan_cooling_layer_time": [
"80"
],
"nozzle_temperature": [
"230"
],
"nozzle_temperature_initial_layer": [
"230"
],
"compatible_printers": [
"Bambu Lab P1P 0.6 nozzle",
"Bambu Lab P1P 0.8 nozzle"
]
}

41
resources/profiles/BBL/filament/P1P/Bambu PLA-CF @BBL P1P.json Normal file
View file

@ -0,0 +1,41 @@
{
"type": "filament",
"setting_id": "GFSA50_10",
"name": "Bambu PLA-CF @BBL P1P",
"from": "system",
"instantiation": "true",
"inherits": "Bambu PLA-CF @base",
"filament_max_volumetric_speed": [
"15"
],
"slow_down_layer_time": [
"2"
],
"hot_plate_temp" : [
"65"
],
"hot_plate_temp_initial_layer" : [
"65"
],
"textured_plate_temp" : [
"65"
],
"textured_plate_temp_initial_layer" : [
"65"
],
"fan_min_speed": [
"50"
],
"fan_cooling_layer_time": [
"80"
],
"nozzle_temperature": [
"230"
],
"nozzle_temperature_initial_layer": [
"230"
],
"compatible_printers": [
"Bambu Lab P1P 0.4 nozzle"
]
}

1
resources/profiles/BBL/machine/Bambu Lab P1P 0.4 nozzle.json
View file

File diff suppressed because one or more lines are too long

11
resources/profiles/BBL/process/0.08mm Extra Fine @BBL P1P.json Normal file
View file

@ -0,0 +1,11 @@
{
"type": "process",
"setting_id": "GP018",
"name": "0.08mm Extra Fine @BBL P1P",
"from": "system",
"instantiation": "true",
"inherits": "fdm_process_bbl_0.08",
"compatible_printers": [
"Bambu Lab P1P 0.4 nozzle"
]
}

11
resources/profiles/BBL/process/0.12mm Fine @BBL P1P.json Normal file
View file

@ -0,0 +1,11 @@
{
"type": "process",
"setting_id": "GP019",
"name": "0.12mm Fine @BBL P1P",
"from": "system",
"instantiation": "true",
"inherits": "fdm_process_bbl_0.12",
"compatible_printers": [
"Bambu Lab P1P 0.4 nozzle"
]
}

11
resources/profiles/BBL/process/0.16mm Optimal @BBL P1P.json Normal file
View file

@ -0,0 +1,11 @@
{
"type": "process",
"setting_id": "GP020",
"name": "0.16mm Optimal @BBL P1P",
"from": "system",
"instantiation": "true",
"inherits": "fdm_process_bbl_0.16",
"compatible_printers": [
"Bambu Lab P1P 0.4 nozzle"
]
}

14
resources/profiles/BBL/process/0.20mm Strength @BBL P1P.json Normal file
View file

@ -0,0 +1,14 @@
{
"type": "process",
"setting_id": "GP021",
"name": "0.20mm Strength @BBL P1P",
"from": "system",
"instantiation": "true",
"inherits": "fdm_process_bbl_0.20",
"outer_wall_speed": "60",
"wall_loops": "6",
"sparse_infill_density": "25%",
"compatible_printers": [
"Bambu Lab P1P 0.4 nozzle"
]
}

11
resources/profiles/BBL/process/0.24mm Draft @BBL P1P.json Normal file
View file

@ -0,0 +1,11 @@
{
"type": "process",
"setting_id": "GP022",
"name": "0.24mm Draft @BBL P1P",
"from": "system",
"instantiation": "true",
"inherits": "fdm_process_bbl_0.24",
"compatible_printers": [
"Bambu Lab P1P 0.4 nozzle"
]
}

11
resources/profiles/BBL/process/0.28mm Extra Draft @BBL P1P.json Normal file
View file

@ -0,0 +1,11 @@
{
"type": "process",
"setting_id": "GP023",
"name": "0.28mm Extra Draft @BBL P1P",
"from": "system",
"instantiation": "true",
"inherits": "fdm_process_bbl_0.28",
"compatible_printers": [
"Bambu Lab P1P 0.4 nozzle"
]
}

3
resources/profiles/BBL/process/fdm_process_bbl_common.json
View file

@ -73,6 +73,7 @@
"enable_support": "0",
"resolution": "0.012",
"support_type": "normal(auto)",
"support_style": "default",
"support_on_build_plate_only": "0",
"support_top_z_distance": "0.2",
"support_bottom_z_distance": "0.2",
@ -92,7 +93,7 @@
"support_object_xy_distance": "0.35",
"tree_support_branch_diameter": "2",
"tree_support_branch_angle": "45",
"tree_support_wall_count": "0",
"tree_support_wall_count": "1",
"detect_thin_wall": "0",
"top_surface_pattern": "monotonicline",
"top_surface_line_width": "0.42",

2
resources/profiles/Creality.json
View file

@ -1,6 +1,6 @@
{
"name": "Creality",
"version": "01.04.00.03",
"version": "01.04.01.00",
"force_update": "0",
"description": "Creality configurations",
"machine_model_list": [

1
resources/profiles/Creality/process/fdm_process_creality_common.json
View file

@ -64,6 +64,7 @@
"enable_support": "0",
"resolution": "0.012",
"support_type": "normal(auto)",
"support_style": "default",
"support_on_build_plate_only": "0",
"support_top_z_distance": "0.2",
"support_filament": "0",

2
resources/profiles/Voron.json
View file

@ -1,6 +1,6 @@
{
"name": "Voron",
"version": "01.04.00.02",
"version": "01.04.01.00",
"force_update": "0",
"description": "Voron configurations",
"machine_model_list": [

1
resources/profiles/Voron/process/fdm_process_voron_common.json
View file

@ -65,6 +65,7 @@
"enable_support": "0",
"resolution": "0.012",
"support_type": "normal(auto)",
"support_style": "default",
"support_on_build_plate_only": "0",
"support_top_z_distance": "0.2",
"support_filament": "0",

5
src/libslic3r/Arrange.cpp
View file

@ -78,6 +78,7 @@ using ItemGroup = std::vector<std::reference_wrapper<Item>>;
// A coefficient used in separating bigger items and smaller items.
const double BIG_ITEM_TRESHOLD = 0.02;
#define VITRIFY_TEMP_DIFF_THRSH 15 // bed temp can be higher than vitrify temp, but not higher than this thresh
// Fill in the placer algorithm configuration with values carefully chosen for
// Slic3r.
@ -423,9 +424,9 @@ protected:
for (int i = 0; i < m_items.size(); i++) {
Item& p = m_items[i];
if (p.is_virt_object) continue;
score += lambda3 * (item.bed_temp - p.vitrify_temp > 0);
score += lambda3 * (item.bed_temp - p.vitrify_temp > VITRIFY_TEMP_DIFF_THRSH);
}
score += lambda3 * (item.bed_temp - item.vitrify_temp > 0);
score += lambda3 * (item.bed_temp - item.vitrify_temp > VITRIFY_TEMP_DIFF_THRSH);
score += lambda4 * hasRowHeightConflict + lambda4 * hasLidHeightConflict;
}
else {

4
src/libslic3r/GCode/CoolingBuffer.cpp
View file

@ -775,7 +775,7 @@ std::string CoolingBuffer::apply_layer_cooldown(
new_gcode += GCodeWriter::set_fan(m_config.gcode_flavor, m_fan_speed);
}
//BBS
if (additional_fan_speed_new != m_additional_fan_speed && m_config.auxiliary_fan.value) {
if (additional_fan_speed_new != m_additional_fan_speed) {
m_additional_fan_speed = additional_fan_speed_new;
if (immediately_apply)
new_gcode += GCodeWriter::set_additional_fan(m_additional_fan_speed);
@ -813,7 +813,7 @@ std::string CoolingBuffer::apply_layer_cooldown(
//BBS: force to write a fan speed command again
if (m_current_fan_speed != -1)
new_gcode += GCodeWriter::set_fan(m_config.gcode_flavor, m_current_fan_speed);
if (m_additional_fan_speed != -1 && m_config.auxiliary_fan.value)
if (m_additional_fan_speed != -1)
new_gcode += GCodeWriter::set_additional_fan(m_additional_fan_speed);
}
else if (line->type & CoolingLine::TYPE_EXTRUDE_END) {

4
src/libslic3r/Layer.hpp
View file

@ -260,8 +260,8 @@ public:
{
ExPolygon *area;
int type;
int dist_to_top;
AreaGroup(ExPolygon *a, int t, int d) : area(a), type(t), dist_to_top(d) {}
coordf_t dist_to_top; // mm dist to top
AreaGroup(ExPolygon *a, int t, coordf_t d) : area(a), type(t), dist_to_top(d) {}
};
std::vector<AreaGroup> area_groups;

6
src/libslic3r/Point.hpp
View file

@ -184,6 +184,12 @@ inline Point operator* (const Point& l, const double& r)
return { coord_t(l.x() * r), coord_t(l.y() * r) };
}
inline std::ostream &operator<<(std::ostream &os, const Point &pt)
{
os << unscale_(pt.x()) << "," << unscale_(pt.y());
return os;
}
inline bool is_approx(const Point &p1, const Point &p2, coord_t epsilon = coord_t(SCALED_EPSILON))
{
Point d = (p2 - p1).cwiseAbs();

2
src/libslic3r/Print.cpp
View file

@ -457,7 +457,7 @@ StringObjectException Print::sequential_print_clearance_valid(const Print &print
convex_hull = offset(convex_hull_no_offset,
// Shrink the extruder_clearance_radius a tiny bit, so that if the object arrangement algorithm placed the objects
// exactly by satisfying the extruder_clearance_radius, this test will not trigger collision.
float(scale_(0.5 * print.config().extruder_clearance_radius.value - EPSILON)),
float(scale_(0.5 * print.config().extruder_clearance_max_radius.value - EPSILON)),
jtRound, scale_(0.1)).front();
// instance.shift is a position of a centered object, while model object may not be centered.
// Convert the shift from the PrintObject's coordinates into ModelObject's coordinates by removing the centering offset.

1
src/libslic3r/Print.hpp
View file

@ -360,6 +360,7 @@ public:
// Get a layer approximately at print_z.
const Layer* get_layer_at_printz(coordf_t print_z, coordf_t epsilon) const;
Layer* get_layer_at_printz(coordf_t print_z, coordf_t epsilon);
int get_layer_idx_get_printz(coordf_t print_z, coordf_t epsilon);
// BBS
const Layer* get_layer_at_bottomz(coordf_t bottom_z, coordf_t epsilon) const;
Layer* get_layer_at_bottomz(coordf_t bottom_z, coordf_t epsilon);

48
src/libslic3r/PrintConfig.cpp
View file

@ -183,13 +183,17 @@ static t_config_enum_values s_keys_map_SupportMaterialPattern {
{ "honeycomb", smpHoneycomb },
{ "lightning", smpLightning },
{ "default", smpDefault},
{ "none", smpNone},
{ "hollow", smpNone},
};
CONFIG_OPTION_ENUM_DEFINE_STATIC_MAPS(SupportMaterialPattern)
static t_config_enum_values s_keys_map_SupportMaterialStyle {
{ "default", smsDefault },
{ "grid", smsGrid },
{ "snug", smsSnug }
{ "snug", smsSnug },
{ "tree_slim", smsTreeSlim },
{ "tree_strong", smsTreeStrong },
{ "tree_hybrid", smsTreeHybrid }
};
CONFIG_OPTION_ENUM_DEFINE_STATIC_MAPS(SupportMaterialStyle)
@ -203,7 +207,6 @@ CONFIG_OPTION_ENUM_DEFINE_STATIC_MAPS(SupportMaterialInterfacePattern)
static t_config_enum_values s_keys_map_SupportType{
{ "normal(auto)", stNormalAuto },
{ "tree(auto)", stTreeAuto },
{ "hybrid(auto)", stHybridAuto },
{ "normal(manual)", stNormal },
{ "tree(manual)", stTree }
};
@ -2543,16 +2546,14 @@ void PrintConfigDef::init_fff_params()
def->label = L("Type");
def->category = L("Support");
def->tooltip = L("normal(auto) and tree(auto) is used to generate support automatically. "
"If normal or tree is selected, only support enforcers are generated");
"If normal(manual) or tree(manual) is selected, only support enforcers are generated");
def->enum_keys_map = &ConfigOptionEnum<SupportType>::get_enum_values();
def->enum_values.push_back("normal(auto)");
def->enum_values.push_back("tree(auto)");
def->enum_values.push_back("hybrid(auto)");
def->enum_values.push_back("normal(manual)");
def->enum_values.push_back("tree(manual)");
def->enum_labels.push_back(L("normal(auto)"));
def->enum_labels.push_back(L("tree(auto)"));
def->enum_labels.push_back(L("hybrid(auto)"));
def->enum_labels.push_back(L("normal(manual)"));
def->enum_labels.push_back(L("tree(manual)"));
def->mode = comSimple;
@ -2591,7 +2592,7 @@ void PrintConfigDef::init_fff_params()
def->label = L("Support critical regions only");
def->category = L("Support");
def->tooltip = L("Only create support for critical regions including sharp tail, cantilever, etc.");
def->mode = comSimple;
def->mode = comAdvanced;
def->set_default_value(new ConfigOptionBool(false));
// BBS: change type to common float.
@ -2639,9 +2640,9 @@ void PrintConfigDef::init_fff_params()
def = this->add("support_filament", coInt);
def->gui_type = ConfigOptionDef::GUIType::i_enum_open;
def->label = L("Support");
def->label = L("Support base");
def->category = L("Support");
def->tooltip = L("Filament to print support and raft. \"Default\" means no specific filament for support and current filament is used");
def->tooltip = L("Filament to print support base and raft. \"Default\" means no specific filament for support and current filament is used");
def->min = 0;
def->mode = comSimple;
def->set_default_value(new ConfigOptionInt(1));
@ -2744,13 +2745,13 @@ void PrintConfigDef::init_fff_params()
def->enum_values.push_back("rectilinear-grid");
def->enum_values.push_back("honeycomb");
def->enum_values.push_back("lightning");
def->enum_values.push_back("none");
def->enum_values.push_back("hollow");
def->enum_labels.push_back(L("Default"));
def->enum_labels.push_back(L("Rectilinear"));
def->enum_labels.push_back(L("Rectilinear grid"));
def->enum_labels.push_back(L("Honeycomb"));
def->enum_labels.push_back(L("Lightning"));
def->enum_labels.push_back(L("None"));
def->enum_labels.push_back(L("Hollow"));
def->mode = comAdvanced;
def->set_default_value(new ConfigOptionEnum<SupportMaterialPattern>(smpRectilinear));
@ -2799,16 +2800,27 @@ void PrintConfigDef::init_fff_params()
def = this->add("support_style", coEnum);
def->label = L("Style");
def->category = L("Support");
//def->tooltip = L("Style and shape of the support towers. Projecting the supports into a regular grid "
// "will create more stable supports, while snug support towers will save material and reduce "
// "object scarring");
def->tooltip = L("Style and shape of the support. For normal support, projecting the supports into a regular grid "
"will create more stable supports (default), while snug support towers will save material and reduce "
"object scarring.\n"
"For tree support, slim style will merge branches more aggressively and save "
"a lot of material (default), while hybrid style will create similar structure to normal support "
"under large flat overhangs.");
def->enum_keys_map = &ConfigOptionEnum<SupportMaterialStyle>::get_enum_values();
def->enum_values.push_back("default");
def->enum_values.push_back("grid");
def->enum_values.push_back("snug");
def->enum_values.push_back("tree_slim");
def->enum_values.push_back("tree_strong");
def->enum_values.push_back("tree_hybrid");
def->enum_labels.push_back(L("Default"));
def->enum_labels.push_back(L("Grid"));
def->enum_labels.push_back(L("Snug"));
def->enum_labels.push_back(L("Tree Slim"));
def->enum_labels.push_back(L("Tree Strong"));
def->enum_labels.push_back(L("Tree Hybrid"));
def->mode = comAdvanced;
def->set_default_value(new ConfigOptionEnum<SupportMaterialStyle>(smsGrid));
def->set_default_value(new ConfigOptionEnum<SupportMaterialStyle>(smsDefault));
def = this->add("independent_support_layer_height", coBool);
def->label = L("Independent support layer height");
@ -2909,7 +2921,7 @@ void PrintConfigDef::init_fff_params()
def = this->add("bed_temperature_difference", coInts);
def->label = L("Bed temperature difference");
def->tooltip = L("Do not recommand bed temperature of other layer to be lower than initial layer for more than this threshold. "
def->tooltip = L("Do not recommend bed temperature of other layer to be lower than initial layer for more than this threshold. "
"Too low bed temperature of other layer may cause the model broken free from build plate");
def->sidetext = L("°C");
def->min = 0;
@ -4026,6 +4038,10 @@ void PrintConfigDef::handle_legacy(t_config_option_key &opt_key, std::string &va
value = "normal(manual)";
} else if (opt_key == "support_type" && value == "tree") {
value = "tree(manual)";
} else if (opt_key == "support_type" && value == "hybrid(auto)") {
value = "tree(auto)";
} else if (opt_key == "support_base_pattern" && value == "none") {
value = "hollow";
} else if (opt_key == "different_settings_to_system") {
std::string copy_value = value;
copy_value.erase(std::remove(copy_value.begin(), copy_value.end(), '\"'), copy_value.end()); // remove '"' in string

16
src/libslic3r/PrintConfig.hpp
View file

@ -99,7 +99,7 @@ enum SupportMaterialPattern {
};
enum SupportMaterialStyle {
smsGrid, smsSnug,
smsDefault, smsGrid, smsSnug, smsTreeSlim, smsTreeStrong, smsTreeHybrid
};
enum SupportMaterialInterfacePattern {
@ -108,7 +108,19 @@ enum SupportMaterialInterfacePattern {
// BBS
enum SupportType {
stNormalAuto, stTreeAuto, stHybridAuto, stNormal, stTree
stNormalAuto, stTreeAuto, stNormal, stTree
};
inline bool is_tree(SupportType stype)
{
return std::set<SupportType>{stTreeAuto, stTree}.count(stype) != 0;
};
inline bool is_tree_slim(SupportType type, SupportMaterialStyle style)
{
return is_tree(type) && (style==smsDefault || style==smsTreeSlim);
};
inline bool is_auto(SupportType stype)
{
return std::set<SupportType>{stNormalAuto, stTreeAuto}.count(stype) != 0;
};
enum SeamPosition {

6
src/libslic3r/PrintObject.cpp
View file

@ -2871,7 +2871,11 @@ const Layer *PrintObject::get_first_layer_bellow_printz(coordf_t print_z, coordf
auto it = Slic3r::lower_bound_by_predicate(m_layers.begin(), m_layers.end(), [limit](const Layer *layer) { return layer->print_z < limit; });
return (it == m_layers.begin()) ? nullptr : *(--it);
}
int PrintObject::get_layer_idx_get_printz(coordf_t print_z, coordf_t epsilon) {
coordf_t limit = print_z + epsilon;
auto it = Slic3r::lower_bound_by_predicate(m_layers.begin(), m_layers.end(), [limit](const Layer *layer) { return layer->print_z < limit; });
return (it == m_layers.begin()) ? -1 : std::distance(m_layers.begin(), it);
}
// BBS
const Layer* PrintObject::get_layer_at_bottomz(coordf_t bottom_z, coordf_t epsilon) const {
coordf_t limit_upper = bottom_z + epsilon;

2
src/libslic3r/Slicing.cpp
View file

@ -110,7 +110,7 @@ SlicingParameters SlicingParameters::create_from_config(
params.min_layer_height = std::min(params.min_layer_height, params.layer_height);
params.max_layer_height = std::max(params.max_layer_height, params.layer_height);
if (! soluble_interface) {
if (! soluble_interface || is_tree_slim(object_config.support_type.value, object_config.support_style.value)) {
params.gap_raft_object = object_config.raft_contact_distance.value;
//BBS
params.gap_object_support = object_config.support_bottom_z_distance.value;

10
src/libslic3r/SupportMaterial.cpp
View file

@ -790,6 +790,7 @@ public:
m_extrusion_width(params.extrusion_width),
m_support_material_closing_radius(params.support_closing_radius)
{
if (m_style != smsSnug) m_style = smsGrid;
switch (m_style) {
case smsGrid:
{
@ -1578,9 +1579,8 @@ static inline Polygons detect_overhangs(
// Offset the support regions back to a full overhang, restrict them to the full overhang.
// This is done to increase size of the supporting columns below, as they are calculated by
// propagating these contact surfaces downwards.
diff_polygons =
expand(diff(intersection(expand(diff_polygons, lower_layer_offset, SUPPORT_SURFACES_OFFSET_PARAMETERS), layerm_polygons), lower_layer_polygons),
xy_expansion, SUPPORT_SURFACES_OFFSET_PARAMETERS);
diff_polygons = diff(intersection(expand(diff_polygons, lower_layer_offset, SUPPORT_SURFACES_OFFSET_PARAMETERS), layerm_polygons), lower_layer_polygons);
if (xy_expansion != 0) { diff_polygons = expand(diff_polygons, xy_expansion, SUPPORT_SURFACES_OFFSET_PARAMETERS); }
}
//FIXME add user defined filtering here based on minimal area or minimum radius or whatever.
@ -2191,7 +2191,7 @@ PrintObjectSupportMaterial::MyLayersPtr PrintObjectSupportMaterial::top_contact_
// BBS: tree support is selected so normal supports need not be generated.
// Note we still need to go through the following steps if support is disabled but raft is enabled.
if (m_object_config->enable_support.value && (m_object_config->support_type.value == stTreeAuto || m_object_config->support_type.value == stTree || m_object_config->support_type.value == stHybridAuto)) {
if (m_object_config->enable_support.value && (m_object_config->support_type.value != stNormalAuto && m_object_config->support_type.value != stNormal)) {
return MyLayersPtr();
}
@ -2889,7 +2889,7 @@ PrintObjectSupportMaterial::MyLayersPtr PrintObjectSupportMaterial::raft_and_int
// Generate intermediate layers.
// The first intermediate layer is the same as the 1st layer if there is no raft,
// or the bottom of the first intermediate layer is aligned with the bottom of the raft contact layer.
// Intermediate layers are always printed with a normal etrusion flow (non-bridging).
// Intermediate layers are always printed with a normal extrusion flow (non-bridging).
size_t idx_layer_object = 0;
size_t idx_extreme_first = 0;
if (! extremes.empty() && std::abs(extremes.front()->extreme_z() - m_slicing_params.raft_interface_top_z) < EPSILON) {

980
src/libslic3r/TreeSupport.cpp
View file

File diff suppressed because it is too large Load diff

39
src/libslic3r/TreeSupport.hpp
View file

@ -121,6 +121,7 @@ private:
ExPolygon m_machine_border;
public:
bool is_slim = false;
/*!
* \brief The required clearance between the model and the tree branches
*/
@ -170,7 +171,7 @@ public:
struct LineHash {
size_t operator()(const Line& line) const {
return (std::hash<coord_t>()(line.a(0)) ^ std::hash<coord_t>()(line.b(1))) * 102 +
(std::hash<coord_t>()(line.a(0)) ^ std::hash<coord_t>()(line.b(1))) * 10222;
(std::hash<coord_t>()(line.a(1)) ^ std::hash<coord_t>()(line.b(0))) * 10222;
}
};
@ -224,7 +225,7 @@ public:
{}
Node(const Point position, const int distance_to_top, const bool skin_direction, const int support_roof_layers_below, const bool to_buildplate, Node* parent,
coordf_t print_z_, coordf_t height_)
coordf_t print_z_, coordf_t height_, coordf_t dist_mm_to_top_=0)
: distance_to_top(distance_to_top)
, position(position)
, skin_direction(skin_direction)
@ -234,10 +235,13 @@ public:
, parent(parent)
, print_z(print_z_)
, height(height_)
, dist_mm_to_top(dist_mm_to_top_)
{
if (parent) {
type = parent->type;
overhang = parent->overhang;
if (dist_mm_to_top==0)
dist_mm_to_top = parent->dist_mm_to_top + parent->height;
parent->child = this;
}
}
@ -255,6 +259,7 @@ public:
* Negative value means it's a virtual node between support and overhang, which doesn't need to be extruded.
*/
int distance_to_top;
coordf_t dist_mm_to_top = 0; // dist to bottom contact in mm
/*!
* \brief The position of this node on the layer.
@ -262,8 +267,11 @@ public:
Point position;
Point movement; // movement towards neighbor center or outline
double radius;
mutable double radius = 0.0;
mutable double max_move_dist = 0.0;
NodeType type = eCircle;
bool is_merged = false; // this node is generated by merging upper nodes
bool is_corner = false;
const ExPolygon* overhang = nullptr; // when type==ePolygon, set this value to get original overhang area
/*!
@ -311,7 +319,7 @@ public:
* can't be on the model and the path to the buildplate isn't clear),
* the entire branch needs to be known.
*/
std::forward_list<Node*> merged_neighbours;
std::list<Node*> merged_neighbours;
coordf_t print_z;
coordf_t height;
@ -328,6 +336,7 @@ public:
Flow support_material_flow;
Flow support_material_interface_flow;
Flow support_material_bottom_interface_flow;
coordf_t support_extrusion_width;
// Is merging of regions allowed? Could the interface & base support regions be printed with the same extruder?
bool can_merge_support_regions;
@ -368,10 +377,16 @@ private:
SlicingParameters m_slicing_params;
// Various precomputed support parameters to be shared with external functions.
SupportParams m_support_params;
size_t m_raft_layers;
size_t m_highest_overhang_layer;
size_t m_raft_layers = 0;
size_t m_highest_overhang_layer = 0;
std::vector<std::vector<MinimumSpanningTree>> m_spanning_trees;
std::vector< std::unordered_map<Line, bool, LineHash>> m_mst_line_x_layer_contour_caches;
coordf_t MAX_BRANCH_RADIUS = 10.0;
coordf_t MIN_BRANCH_RADIUS = 0.5;
float tree_support_branch_diameter_angle = 5.0;
bool is_slim = false;
bool with_infill = false;
/*!
* \brief Draws circles around each node of the tree into the final support.
@ -397,10 +412,18 @@ private:
* dropped down. The nodes are dropped to lower layers inside the same
* vector of layers.
*/
void drop_nodes(std::vector<std::vector<Node*>>& contact_nodes);
void drop_nodes(std::vector<std::vector<Node *>> &contact_nodes);
void smooth_nodes(std::vector<std::vector<Node *>> &contact_nodes);
void adjust_layer_heights(std::vector<std::vector<Node*>>& contact_nodes);
/*! BBS: MusangKing: maximum layer height
* \brief Optimize the generation of tree support by pre-planning the layer_heights
*
*/
std::vector<std::pair<coordf_t, coordf_t>> plan_layer_heights(std::vector<std::vector<Node*>>& contact_nodes);
/*!
* \brief Creates points where support contacts the model.
*
@ -426,6 +449,8 @@ private:
void generate_toolpaths();
Polygons spanning_tree_to_polygon(const std::vector<MinimumSpanningTree>& spanning_trees, Polygons layer_contours, int layer_nr);
Polygons contact_nodes_to_polygon(const std::vector<Node*>& contact_nodes, Polygons layer_contours, int layer_nr, std::vector<double>& radiis, std::vector<bool>& is_interface);
coordf_t calc_branch_radius(coordf_t base_radius, size_t layers_to_top, size_t tip_layers, double diameter_angle_scale_factor);
coordf_t calc_branch_radius(coordf_t base_radius, coordf_t mm_to_top, double diameter_angle_scale_factor);
};
}

17
src/slic3r/GUI/AMSMaterialsSetting.cpp
View file

@ -64,7 +64,7 @@ void AMSMaterialsSetting::create()
m_clrData->SetChooseFull(true);
m_clrData->SetChooseAlpha(false);
m_clr_picker = new Button(this, "", "");
m_clr_picker = new Button(this, wxEmptyString, wxEmptyString, wxBU_AUTODRAW);
m_clr_picker->SetCanFocus(false);
m_clr_picker->SetSize(FromDIP(50), FromDIP(25));
m_clr_picker->SetMinSize(wxSize(FromDIP(50), FromDIP(25)));
@ -364,7 +364,12 @@ void AMSMaterialsSetting::on_clr_picker(wxCommandEvent & event)
show_flag = true;
if (clr_dialog->ShowModal() == wxID_OK) {
m_clrData = &(clr_dialog->GetColourData());
m_clr_picker->SetBackgroundColor(m_clrData->GetColour());
m_clr_picker->SetBackgroundColor(wxColour(
m_clrData->GetColour().Red(),
m_clrData->GetColour().Green(),
m_clrData->GetColour().Blue(),
254
));
}
}
@ -374,13 +379,19 @@ bool AMSMaterialsSetting::Show(bool show)
m_button_confirm->SetMinSize(AMS_MATERIALS_SETTING_BUTTON_SIZE);
m_input_nozzle_max->GetTextCtrl()->SetSize(wxSize(-1, FromDIP(20)));
m_input_nozzle_min->GetTextCtrl()->SetSize(wxSize(-1, FromDIP(20)));
m_clr_picker->SetBackgroundColour(m_clr_picker->GetParent()->GetBackgroundColour());
}
return DPIDialog::Show(show);
}
void AMSMaterialsSetting::Popup(wxString filament, wxString sn, wxString temp_min, wxString temp_max)
{
m_clr_picker->SetBackgroundColor(m_clrData->GetColour());
m_clr_picker->SetBackgroundColor(wxColour(
m_clrData->GetColour().Red(),
m_clrData->GetColour().Green(),
m_clrData->GetColour().Blue(),
254
));
if (!m_is_third) {
m_button_confirm->Hide();

2
src/slic3r/GUI/AMSMaterialsSetting.hpp
View file

@ -83,7 +83,7 @@ protected:
Button * m_button_confirm;
wxStaticText* m_tip_readonly;
Button * m_button_close;
Button * m_clr_picker;
Button * m_clr_picker;
wxColourData * m_clrData;
#ifdef __APPLE__
wxComboBox *m_comboBox_filament_mac;

21
src/slic3r/GUI/AMSSetting.cpp
View file

@ -200,6 +200,11 @@ void AMSSetting::create()
m_panel_img->Layout();
m_sizer_img->Fit(m_panel_img);
m_sizer_remain_block = new wxBoxSizer(wxVERTICAL);
m_sizer_remain_block->Add(m_sizer_remain, 0, wxEXPAND | wxTOP, FromDIP(8));
m_sizer_remain_block->Add(0, 0, 0, wxTOP, 8);
m_sizer_remain_block->Add(m_sizer_remain_tip, 0, wxLEFT, 18);
m_sizer_remain_block->Add(0, 0, 0, wxTOP, 15);
m_sizerl_body->Add(m_sizer_Insert_material, 0, wxEXPAND, 0);
m_sizerl_body->Add(0, 0, 0, wxTOP, 8);
@ -209,10 +214,7 @@ void AMSSetting::create()
m_sizerl_body->Add(0, 0, 0, wxTOP, 8);
m_sizerl_body->Add(m_sizer_starting_tip, 0, wxLEFT, 18);
m_sizerl_body->Add(0, 0, 0, wxTOP, 15);
m_sizerl_body->Add(m_sizer_remain, 0, wxEXPAND | wxTOP, FromDIP(8));
m_sizerl_body->Add(0, 0, 0, wxTOP, 8);
m_sizerl_body->Add(m_sizer_remain_tip, 0, wxLEFT, 18);
m_sizerl_body->Add(0, 0, 0, wxTOP, 15);
m_sizerl_body->Add(m_sizer_remain_block, 0, wxEXPAND, 0);
m_sizerl_body->Add(m_sizer_switch_filament, 0, wxEXPAND | wxTOP, FromDIP(8));
m_sizerl_body->Add(0, 0, 0, wxTOP, 8);
m_sizerl_body->Add(m_sizer_switch_filament_tip, 0, wxLEFT, 18);
@ -231,6 +233,17 @@ void AMSSetting::create()
this->Centre(wxBOTH);
wxGetApp().UpdateDlgDarkUI(this);
Bind(wxEVT_SHOW, [this](auto& e) {
if (this->IsShown()) {
if (ams_support_remain) {
m_sizer_remain_block->Show(true);
}
else {
m_sizer_remain_block->Show(false);
}
}
});
}
void AMSSetting::update_insert_material_read_mode(bool selected)

2
src/slic3r/GUI/AMSSetting.hpp
View file

@ -39,6 +39,7 @@ public:
wxString append_title(wxString text);
wxStaticText *append_text(wxString text);
MachineObject *obj{nullptr};
bool ams_support_remain{false};
int ams_id { 0 };
protected:
@ -72,6 +73,7 @@ protected:
wxBoxSizer *m_sizer_starting_tip_inline;
wxBoxSizer *m_sizer_remain_inline;
wxBoxSizer *m_sizer_switch_filament_inline;
wxBoxSizer *m_sizer_remain_block;
};
}} // namespace Slic3r::GUI

2
src/slic3r/GUI/AboutDialog.cpp
View file

@ -250,7 +250,7 @@ AboutDialog::AboutDialog()
#endif
version_font.SetPointSize(FromDIP(16));
version->SetFont(version_font);
version->SetForegroundColour(wxColour("#FFFFFE"));
version->SetForegroundColour(wxColour("#FFFFFD"));
version->SetBackgroundColour(wxColour("#00AF42"));
vesizer->Add(version, 0, wxALL | wxALIGN_CENTER_HORIZONTAL, FromDIP(5));
vesizer->Add(0, 0, 1, wxEXPAND, FromDIP(5));

7
src/slic3r/GUI/Auxiliary.cpp
View file

@ -456,7 +456,9 @@ void AuFile::on_set_cover()
{
if (wxGetApp().plater()->model().model_info == nullptr) { wxGetApp().plater()->model().model_info = std::make_shared<ModelInfo>(); }
wxGetApp().plater()->model().model_info->cover_file = m_file_name.ToStdString();
fs::path path(into_path(m_file_name));
wxGetApp().plater()->model().model_info->cover_file = path.string();
//wxGetApp().plater()->model().model_info->cover_file = m_file_name.ToStdString();
auto full_path = m_file_path.branch_path();
auto full_root_path = full_path.branch_path();
@ -696,7 +698,8 @@ void AuFolderPanel::update_cover()
if (wxGetApp().plater()->model().model_info != nullptr) {
for (auto i = 0; i < m_aufiles_list.GetCount(); i++) {
AuFiles *aufile = m_aufiles_list[i];
if (wxGetApp().plater()->model().model_info->cover_file == aufile->file->m_file_name) {
if (wxString::FromUTF8(wxGetApp().plater()->model().model_info->cover_file) == aufile->file->m_file_name) {
aufile->file->set_cover(true);
} else {
aufile->file->set_cover(false);

10
src/slic3r/GUI/CameraPopup.cpp
View file

@ -257,17 +257,23 @@ void CameraPopup::check_func_supported()
allow_alter_resolution = (m_obj->is_function_supported(PrinterFunction::FUNC_ALTER_RESOLUTION) && m_obj->has_ipcam);
//check u2 version
DeviceManager* dev = Slic3r::GUI::wxGetApp().getDeviceManager();
if (!dev) return;
MachineObject* obj = dev->get_selected_machine();
if (!obj) return;
//resolution supported
std::vector<std::string> resolution_supported = m_obj->get_resolution_supported();
auto support_count = resolution_supported.size();
for (int i = 0; i < (int)RESOLUTION_OPTIONS_NUM; ++i){
auto curr_res = to_resolution_msg_string(CameraResolution(i));
std::vector <std::string> ::iterator it = std::find(resolution_supported.begin(), resolution_supported.end(), curr_res);
if ((it == resolution_supported.end())||(support_count <= 1))
if ((it == resolution_supported.end())||(support_count <= 1) || !obj->is_support_1080dpi)
m_resolution_options[i] -> Hide();
}
//hide resolution if there is only one choice
if (support_count <= 1) {
if (support_count <= 1 || !obj->is_support_1080dpi) {
m_text_resolution->Hide();
}
}

25
src/slic3r/GUI/ConfigManipulation.cpp
View file

@ -271,6 +271,7 @@ void ConfigManipulation::update_print_fff_config(DynamicPrintConfig* config, con
}
double sparse_infill_density = config->option<ConfigOptionPercent>("sparse_infill_density")->value;
auto timelapse_type = config->opt_enum<TimelapseType>("timelapse_type");
if (config->opt_bool("spiral_mode") &&
! (config->opt_int("wall_loops") == 1 &&
@ -279,12 +280,12 @@ void ConfigManipulation::update_print_fff_config(DynamicPrintConfig* config, con
! config->opt_bool("enable_support") &&
config->opt_int("enforce_support_layers") == 0 &&
config->opt_bool("ensure_vertical_shell_thickness") &&
! config->opt_bool("detect_thin_wall")))
! config->opt_bool("detect_thin_wall") &&
config->opt_enum<TimelapseType>("timelapse_type") == TimelapseType::tlTraditional))
{
wxString msg_text = _(L("Spiral mode only works when wall loops is 1, \n"
"support is disabled, top shell layers is 0 and sparse infill density is 0\n"));
wxString msg_text = _(L("Spiral mode only works when wall loops is 1, support is disabled, top shell layers is 0, sparse infill density is 0 and timelapse type is traditional"));
if (is_global_config)
msg_text += "\n" + _(L("Change these settings automatically? \n"
msg_text += "\n\n" + _(L("Change these settings automatically? \n"
"Yes - Change these settings and enable spiral mode automatically\n"
"No - Give up using spiral mode this time"));
MessageDialog dialog(m_msg_dlg_parent, msg_text, "",
@ -301,7 +302,9 @@ void ConfigManipulation::update_print_fff_config(DynamicPrintConfig* config, con
new_conf.set_key_value("enforce_support_layers", new ConfigOptionInt(0));
new_conf.set_key_value("ensure_vertical_shell_thickness", new ConfigOptionBool(true));
new_conf.set_key_value("detect_thin_wall", new ConfigOptionBool(false));
new_conf.set_key_value("timelapse_type", new ConfigOptionEnum<TimelapseType>(tlTraditional));
sparse_infill_density = 0;
timelapse_type = TimelapseType::tlTraditional;
support = false;
}
else {
@ -310,6 +313,7 @@ void ConfigManipulation::update_print_fff_config(DynamicPrintConfig* config, con
apply(config, &new_conf);
if (cb_value_change) {
cb_value_change("sparse_infill_density", sparse_infill_density);
cb_value_change("timelapse_type", timelapse_type);
if (!support)
cb_value_change("enable_support", false);
}
@ -574,19 +578,16 @@ void ConfigManipulation::toggle_print_fff_options(DynamicPrintConfig *config, co
"support_type", "support_on_build_plate_only", "support_critical_regions_only",
"support_object_xy_distance", "independent_support_layer_height"})
toggle_field(el, have_support_material);
toggle_field("support_threshold_angle", have_support_material && (support_type == stNormalAuto || support_type == stTreeAuto || support_type==stHybridAuto));
toggle_field("support_threshold_angle", have_support_material && is_auto(support_type));
//toggle_field("support_closing_radius", have_support_material && support_style == smsSnug);
bool support_is_tree = config->opt_bool("enable_support") && is_tree(support_type);
for (auto el : {"tree_support_branch_angle", "tree_support_wall_count", "tree_support_branch_distance", "tree_support_branch_diameter"})
toggle_field(el, config->opt_bool("enable_support") && (support_type == stTreeAuto || support_type == stTree || support_type == stHybridAuto));
toggle_field(el, support_is_tree);
// hide tree support settings when normal is selected
bool support_is_tree = std::set<SupportType>{stTreeAuto, stHybridAuto, stTree}.count(support_type) != 0;
toggle_line("tree_support_branch_distance", support_is_tree);
toggle_line("tree_support_branch_diameter", support_is_tree);
toggle_line("tree_support_branch_angle", support_is_tree);
toggle_line("tree_support_wall_count", support_is_tree);
toggle_line("max_bridge_length", support_is_tree);
for (auto el : {"tree_support_branch_angle", "tree_support_wall_count", "tree_support_branch_distance", "tree_support_branch_diameter", "max_bridge_length"})
toggle_line(el, support_is_tree);
// tree support use max_bridge_length instead of bridge_no_support
toggle_line("bridge_no_support", !support_is_tree);

50
src/slic3r/GUI/DeviceManager.cpp
View file

@ -1259,6 +1259,35 @@ bool MachineObject::is_recording()
return camera_recording;
}
void MachineObject::parse_version_func()
{
auto ota_version = module_vers.find("ota");
if (printer_type == "BL-P001" ||
printer_type == "BL-P002") {
if (ota_version != module_vers.end()) {
if (ota_version->second.sw_ver.compare("01.01.01.00") <= 0) {
ams_support_remain = false;
ams_support_auto_switch_filament_flag = false;
is_xcam_buildplate_supported = false;
xcam_support_recovery_step_loss = false;
is_support_send_to_sdcard = false;
is_support_1080dpi = false;
is_support_ai_monitoring = false;
is_support_ams_humidity = false;
} else {
ams_support_remain = true;
ams_support_auto_switch_filament_flag = true;
is_xcam_buildplate_supported = true;
xcam_support_recovery_step_loss = true;
is_support_send_to_sdcard = true;
is_support_1080dpi = true;
is_support_ai_monitoring = true;
is_support_ams_humidity = true;
}
}
}
}
int MachineObject::command_get_version(bool with_retry)
{
BOOST_LOG_TRIVIAL(info) << "command_get_version";
@ -1987,12 +2016,21 @@ bool MachineObject::is_function_supported(PrinterFunction func)
func_name = "FUNC_FIRSTLAYER_INSPECT";
break;
case FUNC_AI_MONITORING:
parse_version_func();
if (!is_support_ai_monitoring)
return false;
func_name = "FUNC_AI_MONITORING";
break;
case FUNC_BUILDPLATE_MARKER_DETECT:
parse_version_func();
if (!is_xcam_buildplate_supported)
return false;
func_name = "FUNC_BUILDPLATE_MARKER_DETECT";
break;
case FUNC_AUTO_RECOVERY_STEP_LOSS:
parse_version_func();
if (!xcam_support_recovery_step_loss)
return false;
func_name = "FUNC_AUTO_RECOVERY_STEP_LOSS";
break;
case FUNC_FLOW_CALIBRATION:
@ -2026,9 +2064,15 @@ bool MachineObject::is_function_supported(PrinterFunction func)
func_name = "FUNC_ALTER_RESOLUTION";
break;
case FUNC_SEND_TO_SDCARD:
parse_version_func();
if (!is_support_send_to_sdcard)
return false;
func_name = "FUNC_SEND_TO_SDCARD";
break;
case FUNC_AUTO_SWITCH_FILAMENT:
parse_version_func();
if (!ams_support_auto_switch_filament_flag)
return false;
func_name = "FUNC_AUTO_SWITCH_FILAMENT";
break;
case FUNC_VIRTUAL_CAMERA:
@ -2615,6 +2659,9 @@ int MachineObject::parse_json(std::string payload)
else {
if (jj["xcam"].contains("buildplate_marker_detector")) {
xcam_buildplate_marker_detector = jj["xcam"]["buildplate_marker_detector"].get<bool>();
is_xcam_buildplate_supported = true;
} else {
is_xcam_buildplate_supported = false;
}
}
}
@ -2874,6 +2921,8 @@ int MachineObject::parse_json(std::string payload)
}
if (tray_it->contains("remain")) {
curr_tray->remain = (*tray_it)["remain"].get<int>();
} else {
curr_tray->remain = -1;
}
try {
if (!ams_id.empty() && !curr_tray->id.empty()) {
@ -3021,6 +3070,7 @@ int MachineObject::parse_json(std::string payload)
ver_info.hw_ver = (*it)["hw_ver"].get<std::string>();
module_vers.emplace(ver_info.name, ver_info);
}
parse_version_func();
bool get_version_result = true;
if (j["info"].contains("result"))
if (j["info"]["result"].get<std::string>() == "fail")

12
src/slic3r/GUI/DeviceManager.hpp
View file

@ -423,8 +423,10 @@ public:
bool ams_insert_flag { false };
bool ams_power_on_flag { false };
bool ams_calibrate_remain_flag { false };
bool ams_support_auto_switch_filament_flag { true };
bool ams_auto_switch_filament_flag { false };
bool ams_support_use_ams { false };
bool ams_support_remain { true };
int ams_humidity;
int ams_user_setting_hold_count = 0;
AmsStatusMain ams_status_main;
@ -579,15 +581,23 @@ public:
bool xcam_ai_monitoring{ false };
int xcam_ai_monitoring_hold_count = 0;
std::string xcam_ai_monitoring_sensitivity;
bool is_xcam_buildplate_supported { true };
bool xcam_buildplate_marker_detector{ false };
int xcam_buildplate_marker_hold_count = 0;
bool xcam_support_recovery_step_loss { true };
bool xcam_auto_recovery_step_loss{ false };
int xcam_auto_recovery_hold_count = 0;
int ams_print_option_count = 0;
/*not support U2*/
bool is_support_1080dpi {false};
bool is_support_ai_monitoring {false};
bool is_support_ams_humidity {false};
/* sdcard */
MachineObject::SdcardState sdcard_state { NO_SDCARD };
MachineObject::SdcardState get_sdcard_state();
bool is_support_send_to_sdcard { true };
/* HMS */
std::vector<HMSItem> hms_list;
@ -622,6 +632,8 @@ public:
MachineObject(NetworkAgent* agent, std::string name, std::string id, std::string ip);
~MachineObject();
void parse_version_func();
/* command commands */
int command_get_version(bool with_retry = true);
int command_request_push_all();

8
src/slic3r/GUI/GLCanvas3D.cpp
View file

@ -1249,7 +1249,7 @@ void GLCanvas3D::on_change_color_mode(bool is_dark, bool reinit) {
m_is_dark = is_dark;
// Bed color
m_bed.on_change_color_mode(is_dark);
// GcodeViewer color
// GcodeViewer color
m_gcode_viewer.on_change_color_mode(is_dark);
// ImGui Style
wxGetApp().imgui()->on_change_color_mode(is_dark);
@ -3827,7 +3827,7 @@ void GLCanvas3D::on_mouse(wxMouseEvent& evt)
while (p->GetParent())
p = p->GetParent();
auto *top_level_wnd = dynamic_cast<wxTopLevelWindow*>(p);
if (top_level_wnd && top_level_wnd->IsActive())
if (top_level_wnd && top_level_wnd->IsActive() && !wxGetApp().get_side_menu_popup_status())
m_canvas->SetFocus();
m_mouse.position = pos.cast<double>();
m_tooltip_enabled = false;
@ -4891,7 +4891,7 @@ void GLCanvas3D::update_sequential_clearance()
// the results are then cached for following displacements
if (m_sequential_print_clearance_first_displacement) {
m_sequential_print_clearance.m_hull_2d_cache.clear();
float shrink_factor = static_cast<float>(scale_(0.5 * fff_print()->config().extruder_clearance_radius.value - EPSILON));
float shrink_factor = static_cast<float>(scale_(0.5 * fff_print()->config().extruder_clearance_max_radius.value - EPSILON));
double mitter_limit = scale_(0.1);
m_sequential_print_clearance.m_hull_2d_cache.reserve(m_model->objects.size());
for (size_t i = 0; i < m_model->objects.size(); ++i) {
@ -5689,7 +5689,7 @@ void GLCanvas3D::_switch_toolbars_icon_filename()
m_assemble_view_toolbar.init(background_data);
m_separator_toolbar.init(background_data);
wxGetApp().plater()->get_collapse_toolbar().init(background_data);
// main toolbar
{
GLToolbarItem* item;

12
src/slic3r/GUI/GLShadersManager.cpp
View file

@ -71,16 +71,16 @@ std::pair<bool, std::string> GLShadersManager::init()
// Since macOS 12 (Monterey), this issue with the opposite direction on Apple's Arm CPU seems to be fixed, and computed
// triangle normals inside fragment shader have the right direction.
if (platform_flavor() == PlatformFlavor::OSXOnArm && wxPlatformInfo::Get().GetOSMajorVersion() < 12) {
//if (GUI::wxGetApp().is_gl_version_greater_or_equal_to(3, 0))
valid &= append_shader("mm_gouraud", {"mm_gouraud_130.vs", "mm_gouraud_130.fs"}, {"FLIP_TRIANGLE_NORMALS"sv});
//if (GUI::wxGetApp().plater() && GUI::wxGetApp().plater()->is_wireframe_enabled())
// valid &= append_shader("mm_gouraud", {"mm_gouraud_wireframe.vs", "mm_gouraud_wireframe.fs"}, {"FLIP_TRIANGLE_NORMALS"sv});
//else
// valid &= append_shader("mm_gouraud", {"mm_gouraud.vs", "mm_gouraud.fs"}, {"FLIP_TRIANGLE_NORMALS"sv});
valid &= append_shader("mm_gouraud", {"mm_gouraud.vs", "mm_gouraud.fs"}, {"FLIP_TRIANGLE_NORMALS"sv});
}
else {
//if (GUI::wxGetApp().is_gl_version_greater_or_equal_to(3, 0))
valid &= append_shader("mm_gouraud", {"mm_gouraud_wireframe.vs", "mm_gouraud_wireframe.fs"});
//if (GUI::wxGetApp().plater() && GUI::wxGetApp().plater()->is_wireframe_enabled())
// valid &= append_shader("mm_gouraud", {"mm_gouraud_wireframe.vs", "mm_gouraud_wireframe.fs"});
//else
// valid &= append_shader("mm_gouraud", {"mm_gouraud.vs", "mm_gouraud.fs"});
valid &= append_shader("mm_gouraud", {"mm_gouraud.vs", "mm_gouraud.fs"});
}
//BBS: add shader for outline

35
src/slic3r/GUI/GUI_App.cpp
View file

@ -1892,6 +1892,9 @@ void GUI_App::init_app_config()
if (! wxGetEnv(wxS("XDG_CONFIG_HOME"), &dir) || dir.empty() )
dir = wxFileName::GetHomeDir() + wxS("/.config");
set_data_dir((dir + "/" + GetAppName()).ToUTF8().data());
boost::filesystem::path data_dir_path(data_dir());
if (!boost::filesystem::exists(data_dir_path))
boost::filesystem::create_directory(data_dir_path);
#endif
} else {
m_datadir_redefined = true;
@ -2492,11 +2495,14 @@ bool GUI_App::on_init_inner()
void GUI_App::copy_network_if_available()
{
if (app_config->get("update_network_plugin") != "true")
return;
std::string network_library, player_library, network_library_dst, player_library_dst;
std::string data_dir_str = data_dir();
boost::filesystem::path data_dir_path(data_dir_str);
auto plugin_folder = data_dir_path / "plugins";
auto cache_folder = data_dir_path / "ota";
std::string changelog_file = cache_folder.string() + "/network_plugins.json";
#if defined(_MSC_VER) || defined(_WIN32)
network_library = cache_folder.string() + "/bambu_networking.dll";
player_library = cache_folder.string() + "/BambuSource.dll";
@ -2545,6 +2551,9 @@ void GUI_App::copy_network_if_available()
fs::remove(player_library);
BOOST_LOG_TRIVIAL(info) << __FUNCTION__<< ": Copying player library from" << player_library << " to " << player_library_dst<<" successfully.";
}
if (boost::filesystem::exists(changelog_file))
fs::remove(changelog_file);
app_config->set("update_network_plugin", "false");
}
bool GUI_App::on_init_network(bool try_backup)
@ -2905,6 +2914,16 @@ void GUI_App::set_label_clr_sys(const wxColour& clr)
*/
}
bool GUI_App::get_side_menu_popup_status()
{
return m_side_popup_status;
}
void GUI_App::set_side_menu_popup_status(bool status)
{
m_side_popup_status = status;
}
bool GUI_App::tabs_as_menu() const
{
return false;
@ -5717,5 +5736,21 @@ void GUI_App::disassociate_files(std::wstring extend)
#endif // __WXMSW__
bool is_support_filament(int extruder_id)
{
auto &filament_presets = Slic3r::GUI::wxGetApp().preset_bundle->filament_presets;
auto &filaments = Slic3r::GUI::wxGetApp().preset_bundle->filaments;
if (extruder_id >= filament_presets.size()) return false;
Slic3r::Preset *filament = filaments.find_preset(filament_presets[extruder_id]);
if (filament == nullptr) return false;
Slic3r::ConfigOptionBools *support_option = dynamic_cast<Slic3r::ConfigOptionBools *>(filament->config.option("filament_is_support"));
if (support_option == nullptr) return false;
return support_option->get_at(0);
};
} // GUI
} //Slic3r

10
src/slic3r/GUI/GUI_App.hpp
View file

@ -7,7 +7,6 @@
#include "ConfigWizard.hpp"
#include "OpenGLManager.hpp"
#include "libslic3r/Preset.hpp"
#include "wxExtensions.hpp"
#include "libslic3r/PresetBundle.hpp"
#include "slic3r/GUI/DeviceManager.hpp"
#include "slic3r/Utils/NetworkAgent.hpp"
@ -53,7 +52,6 @@ class AppConfig;
class PresetBundle;
class PresetUpdater;
class ModelObject;
// class PrintHostJobQueue;
class Model;
class DeviceManager;
class NetworkAgent;
@ -284,6 +282,7 @@ private:
bool enable_sync = false;
bool m_is_dark_mode{ false };
bool m_adding_script_handler { false };
bool m_side_popup_status{false};
public:
std::string get_local_models_path();
bool OnInit() override;
@ -338,6 +337,9 @@ public:
void update_fonts(const MainFrame *main_frame = nullptr);
void set_label_clr_modified(const wxColour& clr);
void set_label_clr_sys(const wxColour& clr);
//update side popup status
bool get_side_menu_popup_status();
void set_side_menu_popup_status(bool status);
const wxColour& get_label_clr_modified(){ return m_color_label_modified; }
const wxColour& get_label_clr_sys() { return m_color_label_sys; }
@ -588,7 +590,9 @@ private:
DECLARE_APP(GUI_App)
wxDECLARE_EVENT(EVT_CONNECT_LAN_MODE_PRINT, wxCommandEvent);
} // GUI
bool is_support_filament(int extruder_id);
} // namespace GUI
} // Slic3r
#endif // slic3r_GUI_App_hpp_

2
src/slic3r/GUI/GUI_Factories.cpp
View file

@ -78,7 +78,7 @@ std::map<std::string, std::vector<SimpleSettingData>> SettingsFactory::OBJECT_C
}},
{ L("Support"), {{"brim_type", "",1},{"brim_width", "",2},{"brim_object_gap", "",3},
{"enable_support", "",4},{"support_type", "",5},{"support_threshold_angle", "",6},{"support_on_build_plate_only", "",7},
{"support_filament", "",8},{"support_interface_filament", "",9},{"support_expansion", "",24},
{"support_filament", "",8},{"support_interface_filament", "",9},{"support_expansion", "",24},{"support_style", "",25},
{"tree_support_branch_angle", "",10}, {"tree_support_wall_count", "",11},//tree support
{"support_top_z_distance", "",13},{"support_bottom_z_distance", "",12},{"support_base_pattern", "",14},{"support_base_pattern_spacing", "",15},
{"support_interface_top_layers", "",16},{"support_interface_bottom_layers", "",17},{"support_interface_spacing", "",18},{"support_bottom_interface_spacing", "",19},

12
src/slic3r/GUI/GUI_ObjectTable.cpp
View file

@ -171,6 +171,16 @@ void GridCellFilamentsEditor::Create(wxWindow* parent,
}
m_control = bitmap_combo;
wxGridCellEditor::Create(parent, id, evtHandler);
/* bitmap_combo->GetDropDown().Bind(wxEVT_COMBOBOX, [this](wxCommandEvent& e) {
const wxString value = Combo()->GetValue();
if (value == m_value)
return false;
m_value = value;
return true;
e.Skip();
});*/
}
void GridCellFilamentsEditor::SetSize(const wxRect& rect)
@ -242,7 +252,7 @@ void GridCellFilamentsEditor::BeginEdit(int row, int col, wxGrid* grid)
// When dropping down the menu, a kill focus event
// happens after this point, so we can't reset the flag yet.
#if !defined(__WXGTK20__)
evtHandler->SetInSetFocus(false);
//evtHandler->SetInSetFocus(false);
#endif
}
}

8
src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp
View file

@ -540,10 +540,7 @@ int GLGizmoFdmSupports::get_selection_support_threshold_angle()
SupportType support_type = obj_cfg.option("support_type") ? obj_cfg.opt_enum<SupportType>("support_type") : glb_cfg.opt_enum<SupportType>("support_type");
int support_threshold_angle = obj_cfg.option("support_threshold_angle") ? obj_cfg.opt_int("support_threshold_angle") : glb_cfg.opt_int("support_threshold_angle");
bool auto_support = enable_support &&
(support_type == SupportType::stHybridAuto ||
support_type == SupportType::stTreeAuto ||
support_type == SupportType::stNormalAuto);
bool auto_support = enable_support && is_auto(support_type);
return auto_support ? support_threshold_angle : 0;
}
@ -725,8 +722,7 @@ void GLGizmoFdmSupports::init_print_instance()
const PrintObjectConfig& config = m_print_instance.print_object->config();
m_angle_threshold_deg = config.support_angle;
m_is_tree_support = config.enable_support.value &&
(config.support_type.value == stTreeAuto || config.support_type.value == stTree || config.support_type.value==stHybridAuto);
m_is_tree_support = config.enable_support.value && is_tree(config.support_type.value);
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ",get support_angle "<< m_angle_threshold_deg<<", is_tree "<<m_is_tree_support;
return;

8
src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp
View file

@ -321,16 +321,16 @@ void GLGizmoMmuSegmentation::show_tooltip_information(float caption_max, float x
std::vector<std::string> tip_items;
switch (m_tool_type) {
case ToolType::BRUSH:
tip_items = {"paint", "erase", "cursor_size", "clipping_of_view", "toggle_wireframe"};
tip_items = {"paint", "erase", "cursor_size", "clipping_of_view"};
break;
case ToolType::BUCKET_FILL:
tip_items = {"paint", "erase", "smart_fill_angle", "clipping_of_view", "toggle_wireframe"};
tip_items = {"paint", "erase", "smart_fill_angle", "clipping_of_view"};
break;
case ToolType::SMART_FILL:
// TODO:
break;
case ToolType::GAP_FILL:
tip_items = {"gap_area", "toggle_wireframe"};
tip_items = {"gap_area"};
break;
default:
break;
@ -357,7 +357,7 @@ void GLGizmoMmuSegmentation::on_render_input_window(float x, float y, float bott
// First calculate width of all the texts that are could possibly be shown. We will decide set the dialog width based on that:
const float space_size = m_imgui->get_style_scaling() * 8;
const float clipping_slider_left = std::max(m_imgui->calc_text_size(m_desc.at("clipping_of_view")).x + m_imgui->scaled(1.5f),
const float clipping_slider_left = std::max(m_imgui->calc_text_size(m_desc.at("clipping_of_view")).x + m_imgui->scaled(1.5f),
m_imgui->calc_text_size(m_desc.at("reset_direction")).x + m_imgui->scaled(1.5f) + ImGui::GetStyle().FramePadding.x * 2);
const float cursor_slider_left = m_imgui->calc_text_size(m_desc.at("cursor_size")).x + m_imgui->scaled(1.5f);
const float smart_fill_slider_left = m_imgui->calc_text_size(m_desc.at("smart_fill_angle")).x + m_imgui->scaled(1.5f);

2
src/slic3r/GUI/Jobs/ArrangeJob.cpp
View file

@ -388,7 +388,7 @@ void ArrangeJob::prepare()
params.clearance_height_to_rod = print.config().extruder_clearance_height_to_rod.value;
params.clearance_height_to_lid = print.config().extruder_clearance_height_to_lid.value;
params.cleareance_radius = print.config().extruder_clearance_radius.value;
params.cleareance_radius = print.config().extruder_clearance_max_radius.value;
params.printable_height = print.config().printable_height.value;
params.allow_rotations = settings.enable_rotation;
params.allow_multi_materials_on_same_plate = settings.allow_multi_materials_on_same_plate;

3
src/slic3r/GUI/MainFrame.cpp
View file

@ -1361,9 +1361,6 @@ wxBoxSizer* MainFrame::create_side_tools()
m_print_option_btn = new SideButton(this, "", "sidebutton_dropdown", 0, FromDIP(14));
update_side_button_style();
m_print_option_btn->Enable();
sizer->Add(FromDIP(15), 0, 0, 0, 0);
m_slice_option_btn->Enable();
m_print_option_btn->Enable();
sizer->Add(m_slice_option_btn, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, FromDIP(1));

1
src/slic3r/GUI/MediaPlayCtrl.cpp
View file

@ -8,6 +8,7 @@
#include "MsgDialog.hpp"
#include "DownloadProgressDialog.hpp"
#include <boost/filesystem/string_file.hpp>
#undef pid_t
#include <boost/process.hpp>
#ifdef __WIN32__

12
src/slic3r/GUI/NotificationManager.hpp
View file

@ -135,6 +135,7 @@ enum class NotificationType
BBLSeqPrintInfo,
//BBL: plugin install hint
BBLPluginInstallHint,
BBLPluginUpdateAvailable,
BBLPreviewOnlyMode,
};
@ -873,6 +874,17 @@ private:
_u8L("Integration failed.") },
NotificationData{NotificationType::UndoDesktopIntegrationSuccess, NotificationLevel::RegularNotificationLevel, 10,
_u8L("Undo integration was successful.") },
NotificationData{NotificationType::BBLPluginUpdateAvailable, NotificationLevel::ImportantNotificationLevel, BBL_NOTICE_MAX_INTERVAL,
_u8L("New network plug-in available."),
_u8L("Details"),
[](wxEvtHandler* evnthndlr) {
//BBS set feishu release page by default
wxCommandEvent* evt = new wxCommandEvent(EVT_UPDATE_PLUGINS_WHEN_LAUNCH);
wxQueueEvent(wxGetApp().plater(), evt);
return true;
}},
NotificationData{NotificationType::UndoDesktopIntegrationFail, NotificationLevel::WarningNotificationLevel, 10,
_u8L("Undo integration failed.") },
NotificationData{NotificationType::ExportOngoing, NotificationLevel::RegularNotificationLevel, 0, _u8L("Exporting.")},

22
src/slic3r/GUI/PartPlate.cpp
View file

@ -1198,6 +1198,28 @@ std::vector<int> PartPlate::get_extruders() const
return plate_extruders;
}
std::vector<int> PartPlate::get_used_extruders()
{
std::vector<int> used_extruders;
// if gcode.3mf file
if (m_model->objects.empty()) {
for (int i = 0; i < slice_filaments_info.size(); i++) {
used_extruders.push_back(slice_filaments_info[i].id + 1);
}
return used_extruders;
}
GCodeProcessorResult* result = get_slice_result();
if (!result)
return used_extruders;
PrintEstimatedStatistics& ps = result->print_statistics;
for (auto it = ps.volumes_per_extruder.begin(); it != ps.volumes_per_extruder.end(); it++) {
used_extruders.push_back(it->first + 1);
}
return used_extruders;
}
Vec3d PartPlate::estimate_wipe_tower_size(const double w, const double wipe_volume) const
{
Vec3d wipe_tower_size;

1
src/slic3r/GUI/PartPlate.hpp
View file

@ -259,6 +259,7 @@ public:
Vec3d get_origin() { return m_origin; }
Vec3d estimate_wipe_tower_size(const double w, const double wipe_volume) const;
std::vector<int> get_extruders() const;
std::vector<int> get_used_extruders();
/* instance related operations*/
//judge whether instance is bound in plate or not

31
src/slic3r/GUI/Plater.cpp
View file

@ -160,6 +160,7 @@ wxDEFINE_EVENT(EVT_PUBLISH_FINISHED, wxCommandEvent);
wxDEFINE_EVENT(EVT_REPAIR_MODEL, wxCommandEvent);
wxDEFINE_EVENT(EVT_FILAMENT_COLOR_CHANGED, wxCommandEvent);
wxDEFINE_EVENT(EVT_INSTALL_PLUGIN_NETWORKING, wxCommandEvent);
wxDEFINE_EVENT(EVT_UPDATE_PLUGINS_WHEN_LAUNCH, wxCommandEvent);
wxDEFINE_EVENT(EVT_INSTALL_PLUGIN_HINT, wxCommandEvent);
wxDEFINE_EVENT(EVT_PREVIEW_ONLY_MODE_HINT, wxCommandEvent);
//BBS: change light/dark mode
@ -1101,7 +1102,7 @@ void Sidebar::update_presets(Preset::Type preset_type)
Tab* print_tab = wxGetApp().get_tab(Preset::TYPE_PRINT);
if (print_tab) {
print_tab->get_combo_box()->update();
}
}
break;
}
case Preset::TYPE_SLA_PRINT:
@ -1116,7 +1117,7 @@ void Sidebar::update_presets(Preset::Type preset_type)
{
update_all_preset_comboboxes();
p->show_preset_comboboxes();
/* update bed shape */
Tab* printer_tab = wxGetApp().get_tab(Preset::TYPE_PRINTER);
if (printer_tab) {
@ -2135,6 +2136,7 @@ private:
void update_after_undo_redo(const UndoRedo::Snapshot& snapshot, bool temp_snapshot_was_taken = false);
void on_action_export_to_sdcard(SimpleEvent&);
void on_action_export_to_sdcard_all(SimpleEvent&);
void update_plugin_when_launch(wxCommandEvent& event);
// path to project folder stored with no extension
boost::filesystem::path m_project_folder;
@ -2229,6 +2231,7 @@ Plater::priv::priv(Plater *q, MainFrame *main_frame)
this->q->Bind(EVT_FILAMENT_COLOR_CHANGED, &priv::on_filament_color_changed, this);
this->q->Bind(EVT_INSTALL_PLUGIN_NETWORKING, &priv::install_network_plugin, this);
this->q->Bind(EVT_INSTALL_PLUGIN_HINT, &priv::show_install_plugin_hint, this);
this->q->Bind(EVT_UPDATE_PLUGINS_WHEN_LAUNCH, &priv::update_plugin_when_launch, this);
this->q->Bind(EVT_PREVIEW_ONLY_MODE_HINT, &priv::show_preview_only_hint, this);
this->q->Bind(EVT_GLCANVAS_COLOR_MODE_CHANGED, &priv::on_change_color_mode, this);
this->q->Bind(wxEVT_SYS_COLOUR_CHANGED, &priv::on_apple_change_color_mode, this);
@ -6212,6 +6215,29 @@ void Plater::priv::install_network_plugin(wxCommandEvent &event)
return;
}
void Plater::priv::update_plugin_when_launch(wxCommandEvent &event)
{
std::string data_dir_str = data_dir();
boost::filesystem::path data_dir_path(data_dir_str);
auto cache_folder = data_dir_path / "ota";
std::string changelog_file = cache_folder.string() + "/network_plugins.json";
UpdatePluginDialog dlg(wxGetApp().mainframe);
dlg.update_info(changelog_file);
auto result = dlg.ShowModal();
auto app_config = wxGetApp().app_config;
if (!app_config) return;
if (result == wxID_OK) {
app_config->set("update_network_plugin", "true");
}
else if (result == wxID_NO) {
app_config->set("update_network_plugin", "false");
}
app_config->save();
}
void Plater::priv::show_install_plugin_hint(wxCommandEvent &event)
{
notification_manager->bbl_show_plugin_install_notification(into_u8(_L("Network Plug-in is not detected. Network related features are unavailable.")));
@ -7376,6 +7402,7 @@ Plater::Plater(wxWindow *parent, MainFrame *main_frame)
, p(new priv(this, main_frame))
{
// Initialization performed in the private c-tor
enable_wireframe(false);
}
bool Plater::Show(bool show)

1
src/slic3r/GUI/Plater.hpp
View file

@ -87,6 +87,7 @@ wxDECLARE_EVENT(EVT_REPAIR_MODEL, wxCommandEvent);
wxDECLARE_EVENT(EVT_FILAMENT_COLOR_CHANGED, wxCommandEvent);
wxDECLARE_EVENT(EVT_INSTALL_PLUGIN_NETWORKING, wxCommandEvent);
wxDECLARE_EVENT(EVT_INSTALL_PLUGIN_HINT, wxCommandEvent);
wxDECLARE_EVENT(EVT_UPDATE_PLUGINS_WHEN_LAUNCH, wxCommandEvent);
wxDECLARE_EVENT(EVT_PREVIEW_ONLY_MODE_HINT, wxCommandEvent);
wxDECLARE_EVENT(EVT_GLCANVAS_COLOR_MODE_CHANGED, SimpleEvent);

238
src/slic3r/GUI/ReleaseNote.cpp
View file

@ -44,7 +44,7 @@ ReleaseNoteDialog::ReleaseNoteDialog(Plater *plater /*= nullptr*/)
m_sizer_body->Add(0, 0, 0, wxLEFT, FromDIP(38));
auto sm = create_scaled_bitmap("BambuStudio", nullptr, 70);
auto sm = create_scaled_bitmap("BambuStudio", nullptr, 70);
auto brand = new wxStaticBitmap(this, wxID_ANY, sm, wxDefaultPosition, wxSize(FromDIP(70), FromDIP(70)));
m_sizer_body->Add(brand, 0, wxALL, 0);
@ -85,8 +85,8 @@ void ReleaseNoteDialog::on_dpi_changed(const wxRect &suggested_rect)
{
}
void ReleaseNoteDialog::update_release_note(wxString release_note, std::string version)
{
void ReleaseNoteDialog::update_release_note(wxString release_note, std::string version)
{
m_text_up_info->SetLabel(wxString::Format(_L("version %s update information :"), version));
wxBoxSizer * sizer_text_release_note = new wxBoxSizer(wxVERTICAL);
auto m_staticText_release_note = new wxStaticText(m_vebview_release_note, wxID_ANY, release_note, wxDefaultPosition, wxDefaultSize, 0);
@ -97,34 +97,175 @@ void ReleaseNoteDialog::update_release_note(wxString release_note, std::string v
m_vebview_release_note->Fit();
}
void UpdateVersionDialog::alter_choice(wxCommandEvent& event)
{
wxGetApp().set_skip_version(m_remind_choice->GetValue());
}
UpdateVersionDialog::UpdateVersionDialog(wxWindow *parent)
: DPIDialog(parent, wxID_ANY, _L("New version of Bambu Studio"), wxDefaultPosition, wxDefaultSize, wxCAPTION | wxCLOSE_BOX)
UpdatePluginDialog::UpdatePluginDialog(wxWindow* parent /*= nullptr*/)
: DPIDialog(static_cast<wxWindow*>(wxGetApp().mainframe), wxID_ANY, _L("Network plug-in update"), wxDefaultPosition, wxDefaultSize, wxCAPTION | wxCLOSE_BOX)
{
std::string icon_path = (boost::format("%1%/images/BambuStudioTitle.ico") % resources_dir()).str();
SetIcon(wxIcon(encode_path(icon_path.c_str()), wxBITMAP_TYPE_ICO));
SetBackgroundColour(*wxWHITE);
wxBoxSizer *m_sizer_main = new wxBoxSizer(wxVERTICAL);
auto m_line_top = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxSize(-1, 1));
wxBoxSizer* m_sizer_main = new wxBoxSizer(wxVERTICAL);
auto m_line_top = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxSize(-1, 1));
m_line_top->SetBackgroundColour(wxColour(166, 169, 170));
m_sizer_main->Add(m_line_top, 0, wxEXPAND, 0);
m_sizer_main->Add(0, 0, 0, wxTOP, FromDIP(30));
wxBoxSizer* m_sizer_body = new wxBoxSizer(wxHORIZONTAL);
auto sm = create_scaled_bitmap("BambuStudio", nullptr, 55);
auto brand = new wxStaticBitmap(this, wxID_ANY, sm, wxDefaultPosition, wxSize(FromDIP(55), FromDIP(55)));
wxBoxSizer* m_sizer_right = new wxBoxSizer(wxVERTICAL);
m_text_up_info = new wxStaticText(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0);
m_text_up_info->SetFont(::Label::Head_13);
m_text_up_info->SetMaxSize(wxSize(FromDIP(260), -1));
m_text_up_info->Wrap(FromDIP(260));
m_text_up_info->SetForegroundColour(wxColour(0x26, 0x2E, 0x30));
operation_tips = new ::Label(this, _L("Click OK to update the Network plug-in when Bambu Studio launches next time."));
operation_tips->SetFont(::Label::Body_12);
operation_tips->SetSize(wxSize(FromDIP(260), -1));
operation_tips->Wrap(FromDIP(260));
operation_tips->SetForegroundColour(*wxBLACK);
m_vebview_release_note = new wxScrolledWindow(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxVSCROLL);
m_vebview_release_note->SetScrollRate(5, 5);
m_vebview_release_note->SetBackgroundColour(wxColour(0xF8, 0xF8, 0xF8));
m_vebview_release_note->SetMinSize(wxSize(FromDIP(260), FromDIP(150)));
m_vebview_release_note->SetMaxSize(wxSize(FromDIP(260), FromDIP(150)));
auto sizer_button = new wxBoxSizer(wxHORIZONTAL);
StateColor btn_bg_green(std::pair<wxColour, int>(wxColour(27, 136, 68), StateColor::Pressed), std::pair<wxColour, int>(wxColour(61, 203, 115), StateColor::Hovered),
std::pair<wxColour, int>(AMS_CONTROL_BRAND_COLOUR, StateColor::Normal));
StateColor btn_bg_white(std::pair<wxColour, int>(wxColour(206, 206, 206), StateColor::Pressed), std::pair<wxColour, int>(wxColour(238, 238, 238), StateColor::Hovered),
std::pair<wxColour, int>(*wxWHITE, StateColor::Normal));
auto m_button_ok = new Button(this, _L("OK"));
m_button_ok->SetBackgroundColor(btn_bg_green);
m_button_ok->SetBorderColor(*wxWHITE);
m_button_ok->SetTextColor(wxColour(0xFFFFFE));
m_button_ok->SetFont(Label::Body_12);
m_button_ok->SetSize(wxSize(FromDIP(58), FromDIP(24)));
m_button_ok->SetMinSize(wxSize(FromDIP(58), FromDIP(24)));
m_button_ok->SetCornerRadius(FromDIP(12));
m_button_ok->Bind(wxEVT_LEFT_DOWN, [this](wxMouseEvent& e) {
EndModal(wxID_OK);
});
auto m_button_cancel = new Button(this, _L("Cancel"));
m_button_cancel->SetBackgroundColor(btn_bg_white);
m_button_cancel->SetBorderColor(wxColour(38, 46, 48));
m_button_cancel->SetFont(Label::Body_12);
m_button_cancel->SetSize(wxSize(FromDIP(58), FromDIP(24)));
m_button_cancel->SetMinSize(wxSize(FromDIP(58), FromDIP(24)));
m_button_cancel->SetCornerRadius(FromDIP(12));
m_button_cancel->Bind(wxEVT_LEFT_DOWN, [this](wxMouseEvent& e) {
EndModal(wxID_NO);
});
sizer_button->AddStretchSpacer();
sizer_button->Add(m_button_ok, 0, wxALL, FromDIP(5));
sizer_button->Add(m_button_cancel, 0, wxALL, FromDIP(5));
m_sizer_right->Add(m_text_up_info, 0, 0, 0);
m_sizer_right->Add(0, 0, 0, wxTOP, FromDIP(5));
m_sizer_right->Add(m_vebview_release_note, 0, wxEXPAND | wxRIGHT, FromDIP(20));
m_sizer_right->Add(0, 0, 0, wxTOP, FromDIP(5));
m_sizer_right->Add(operation_tips, 1, wxEXPAND | wxRIGHT, FromDIP(20));
m_sizer_right->Add(0, 0, 0, wxTOP, FromDIP(5));
m_sizer_right->Add(sizer_button, 0, wxEXPAND | wxRIGHT, FromDIP(20));
m_sizer_body->Add(0, 0, 0, wxLEFT, FromDIP(24));
m_sizer_body->Add(brand, 0, wxALL, 0);
m_sizer_body->Add(0, 0, 0, wxRIGHT, FromDIP(20));
m_sizer_body->Add(m_sizer_right, 1, wxBOTTOM | wxEXPAND, FromDIP(18));
m_sizer_main->Add(m_sizer_body, 0, wxEXPAND, 0);
SetSizer(m_sizer_main);
Layout();
m_sizer_main->Fit(this);
Centre(wxBOTH);
wxGetApp().UpdateDlgDarkUI(this);
}
UpdatePluginDialog::~UpdatePluginDialog() {}
void UpdatePluginDialog::on_dpi_changed(const wxRect& suggested_rect)
{
}
void UpdatePluginDialog::update_info(std::string json_path)
{
std::string version_str, description_str;
wxString version;
wxString description;
try {
boost::nowide::ifstream ifs(json_path);
json j;
ifs >> j;
version_str = j["version"];
description_str = j["description"];
}
catch(nlohmann::detail::parse_error &err) {
BOOST_LOG_TRIVIAL(error) << __FUNCTION__<< ": parse "<<json_path<<" got a nlohmann::detail::parse_error, reason = " << err.what();
return;
}
version = from_u8(version_str);
description = from_u8(description_str);
m_text_up_info->SetLabel(wxString::Format(_L("A new Network plug-in(%s) available, Do you want to install it?"), version));
m_text_up_info->SetMaxSize(wxSize(FromDIP(260), -1));
m_text_up_info->Wrap(FromDIP(260));
wxBoxSizer* sizer_text_release_note = new wxBoxSizer(wxVERTICAL);
auto m_text_label = new ::Label(m_vebview_release_note, description);
m_text_label->SetFont(::Label::Body_13);
m_text_label->SetForegroundColour(*wxBLACK);
m_text_label->SetMaxSize(wxSize(FromDIP(235), -1));
m_text_label->Wrap(FromDIP(235));
sizer_text_release_note->Add(m_text_label, 0, wxALL, 5);
m_vebview_release_note->SetSizer(sizer_text_release_note);
m_vebview_release_note->Layout();
m_vebview_release_note->Fit();
Layout();
Fit();
}
UpdateVersionDialog::UpdateVersionDialog(wxWindow *parent)
: DPIDialog(parent, wxID_ANY, _L("New version of Bambu Studio"), wxDefaultPosition, wxDefaultSize, wxCAPTION | wxCLOSE_BOX | wxRESIZE_BORDER)
{
std::string icon_path = (boost::format("%1%/images/BambuStudioTitle.ico") % resources_dir()).str();
SetIcon(wxIcon(encode_path(icon_path.c_str()), wxBITMAP_TYPE_ICO));
SetBackgroundColour(*wxWHITE);
wxBoxSizer *m_sizer_main = new wxBoxSizer(wxVERTICAL);
auto m_line_top = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxSize(-1, 1));
m_line_top->SetBackgroundColour(wxColour(166, 169, 170));
wxBoxSizer *m_sizer_body = new wxBoxSizer(wxHORIZONTAL);
m_sizer_body->Add(0, 0, 0, wxLEFT, FromDIP(38));
auto sm = create_scaled_bitmap("BambuStudio", nullptr, 70);
auto brand = new wxStaticBitmap(this, wxID_ANY, sm, wxDefaultPosition, wxSize(FromDIP(70), FromDIP(70)));
m_brand = new wxStaticBitmap(this, wxID_ANY, sm, wxDefaultPosition, wxSize(FromDIP(70), FromDIP(70)));
m_sizer_body->Add(brand, 0, wxALL, 0);
m_sizer_body->Add(0, 0, 0, wxRIGHT, FromDIP(25));
wxBoxSizer *m_sizer_right = new wxBoxSizer(wxVERTICAL);
@ -132,14 +273,12 @@ UpdateVersionDialog::UpdateVersionDialog(wxWindow *parent)
m_text_up_info->SetFont(::Label::Head_14);
m_text_up_info->SetForegroundColour(wxColour(0x26, 0x2E, 0x30));
m_text_up_info->Wrap(-1);
m_sizer_right->Add(m_text_up_info, 0, 0, 0);
m_sizer_right->Add(0, 0, 1, wxTOP, FromDIP(15));
m_simplebook_release_note = new wxSimplebook(this);
m_simplebook_release_note->SetSize(wxSize(FromDIP(560), FromDIP(430)));
m_simplebook_release_note->SetMinSize(wxSize(FromDIP(560), FromDIP(430)));
m_simplebook_release_note->SetMaxSize(wxSize(FromDIP(560), FromDIP(430)));
m_simplebook_release_note->SetBackgroundColour(wxColour(0xF8, 0xF8, 0xF8));
m_scrollwindows_release_note = new wxScrolledWindow(m_simplebook_release_note, wxID_ANY, wxDefaultPosition, wxSize(FromDIP(560), FromDIP(430)), wxVSCROLL);
@ -151,7 +290,7 @@ UpdateVersionDialog::UpdateVersionDialog(wxWindow *parent)
m_vebview_release_note->SetBackgroundColour(wxColour(0xF8, 0xF8, 0xF8));
m_vebview_release_note->SetSize(wxSize(FromDIP(560), FromDIP(430)));
m_vebview_release_note->SetMinSize(wxSize(FromDIP(560), FromDIP(430)));
m_vebview_release_note->SetMaxSize(wxSize(FromDIP(560), FromDIP(430)));
//m_vebview_release_note->SetMaxSize(wxSize(FromDIP(560), FromDIP(430)));
fs::path ph(data_dir());
ph /= "resources/tooltip/common/releasenote.html";
@ -174,7 +313,7 @@ UpdateVersionDialog::UpdateVersionDialog(wxWindow *parent)
auto sizer_button = new wxBoxSizer(wxHORIZONTAL);
StateColor btn_bg_green(std::pair<wxColour, int>(wxColour(27, 136, 68), StateColor::Pressed), std::pair<wxColour, int>(wxColour(61, 203, 115), StateColor::Hovered),
std::pair<wxColour, int>(AMS_CONTROL_BRAND_COLOUR, StateColor::Normal));
@ -184,7 +323,7 @@ UpdateVersionDialog::UpdateVersionDialog(wxWindow *parent)
m_button_ok = new Button(this, _L("OK"));
m_button_ok->SetBackgroundColor(btn_bg_green);
m_button_ok->SetBorderColor(*wxWHITE);
m_button_ok->SetTextColor(*wxWHITE);
m_button_ok->SetTextColor(wxColour("#FFFFFE"));
m_button_ok->SetFont(Label::Body_12);
m_button_ok->SetSize(wxSize(FromDIP(58), FromDIP(24)));
m_button_ok->SetMinSize(wxSize(FromDIP(58), FromDIP(24)));
@ -202,26 +341,32 @@ UpdateVersionDialog::UpdateVersionDialog(wxWindow *parent)
m_button_cancel->SetMinSize(wxSize(FromDIP(58), FromDIP(24)));
m_button_cancel->SetCornerRadius(FromDIP(12));
m_button_cancel->Bind(wxEVT_LEFT_DOWN, [this](wxMouseEvent &e) {
EndModal(wxID_NO);
m_button_cancel->Bind(wxEVT_LEFT_DOWN, [this](wxMouseEvent &e) {
EndModal(wxID_NO);
});
m_sizer_main->Add(m_line_top, 0, wxEXPAND | wxBOTTOM, 0);
sizer_button->Add(m_remind_choice, 0, wxALL | wxEXPAND, FromDIP(5));
sizer_button->AddStretchSpacer();
sizer_button->Add(m_button_ok, 0, wxALL, FromDIP(5));
sizer_button->Add(m_button_cancel, 0, wxALL, FromDIP(5));
m_sizer_right->Add(m_simplebook_release_note, 0, wxEXPAND | wxRIGHT, FromDIP(20));
m_sizer_right->Add(m_text_up_info, 0, wxBOTTOM|wxTOP, FromDIP(15));
m_sizer_right->Add(m_simplebook_release_note, 1, wxEXPAND | wxRIGHT, 0);
m_sizer_right->Add(sizer_button, 0, wxEXPAND | wxRIGHT, FromDIP(20));
m_sizer_body->Add(m_brand, 0, wxTOP|wxRIGHT|wxLEFT, FromDIP(15));
m_sizer_body->Add(0, 0, 0, wxRIGHT, 0);
m_sizer_body->Add(m_sizer_right, 1, wxBOTTOM | wxEXPAND, FromDIP(8));
m_sizer_main->Add(m_sizer_body, 0, wxEXPAND, 0);
m_sizer_main->Add(m_sizer_body, 1, wxEXPAND, 0);
m_sizer_main->Add(0, 0, 0, wxBOTTOM, 10);
SetSizer(m_sizer_main);
Layout();
m_sizer_main->Fit(this);
Fit();
SetMinSize(GetSize());
Centre(wxBOTH);
wxGetApp().UpdateDlgDarkUI(this);
@ -229,6 +374,11 @@ UpdateVersionDialog::UpdateVersionDialog(wxWindow *parent)
UpdateVersionDialog::~UpdateVersionDialog() {}
void UpdateVersionDialog::alter_choice(wxCommandEvent& event)
{
wxGetApp().set_skip_version(m_remind_choice->GetValue());
}
wxWebView* UpdateVersionDialog::CreateTipView(wxWindow* parent)
{
wxWebView* tipView = WebView::CreateWebView(parent, "");
@ -312,26 +462,32 @@ std::vector<std::string> UpdateVersionDialog::splitWithStl(std::string str,std::
}
void UpdateVersionDialog::update_version_info(wxString release_note, wxString version)
{
{
//bbs check whether the web display is used
bool use_web_link = false;
std::string url_line = "";
/*auto split_array = splitWithStl(release_note.ToStdString(), "\r\n");
for (auto i = 0; i < split_array.size(); i++) {
std::string url = split_array[i];
if (std::strstr (url.c_str(), "http://") != NULL || std::strstr (url.c_str(), "https://") != NULL) {
use_web_link = true;
url_line = url;
break;
if (split_array.size() >= 3) {
for (auto i = 0; i < split_array.size(); i++) {
std::string url = split_array[i];
if (std::strstr(url.c_str(), "http://") != NULL || std::strstr(url.c_str(), "https://") != NULL) {
use_web_link = true;
url_line = url;
break;
}
}
}
if (use_web_link) {
m_brand->Hide();
m_text_up_info->Hide();
m_simplebook_release_note->SetSelection(1);
m_vebview_release_note->LoadURL(from_u8(url_line));
}
else {*/
m_simplebook_release_note->SetMaxSize(wxSize(FromDIP(560), FromDIP(430)));
m_simplebook_release_note->SetSelection(0);
m_text_up_info->SetLabel(wxString::Format(_L("Click to download new version in default browser: %s"), version));
wxBoxSizer* sizer_text_release_note = new wxBoxSizer(wxVERTICAL);
@ -341,7 +497,11 @@ void UpdateVersionDialog::update_version_info(wxString release_note, wxString ve
m_scrollwindows_release_note->SetSizer(sizer_text_release_note);
m_scrollwindows_release_note->Layout();
m_scrollwindows_release_note->Fit();
//}
SetMinSize(GetSize());
SetMaxSize(GetSize());
//}
Layout();
Fit();
}
SecondaryCheckDialog::SecondaryCheckDialog(wxWindow* parent, wxWindowID id, const wxString& title, enum ButtonStyle btn_style, const wxPoint& pos, const wxSize& size, long style, bool not_show_again_check)

15
src/slic3r/GUI/ReleaseNote.hpp
View file

@ -53,6 +53,20 @@ public:
wxScrolledWindow *m_vebview_release_note {nullptr};
};
class UpdatePluginDialog : public DPIDialog
{
public:
UpdatePluginDialog(wxWindow* parent = nullptr);
~UpdatePluginDialog();
void on_dpi_changed(const wxRect& suggested_rect) override;
void update_info(std::string json_path);
wxStaticText* m_text_up_info{ nullptr };
Label* operation_tips{ nullptr };
wxScrolledWindow* m_vebview_release_note{ nullptr };
};
class UpdateVersionDialog : public DPIDialog
{
public:
@ -70,6 +84,7 @@ public:
void alter_choice(wxCommandEvent& event);
std::vector<std::string> splitWithStl(std::string str, std::string pattern);
wxStaticBitmap* m_brand{nullptr};
wxStaticText * m_text_up_info{nullptr};
wxWebView* m_vebview_release_note{nullptr};
wxSimplebook* m_simplebook_release_note{nullptr};

2
src/slic3r/GUI/SelectMachine.cpp
View file

@ -2927,7 +2927,7 @@ void SelectMachineDialog::set_default()
}
// material info
auto extruders = wxGetApp().plater()->get_partplate_list().get_curr_plate()->get_extruders();
auto extruders = wxGetApp().plater()->get_partplate_list().get_curr_plate()->get_used_extruders();
BitmapCache bmcache;
MaterialHash::iterator iter = m_materialList.begin();

2
src/slic3r/GUI/Selection.cpp
View file

@ -2707,7 +2707,7 @@ void Selection::paste_objects_from_clipboard()
auto start_offset = in_current ? src_object->instances.front()->get_offset() : plate->get_build_volume().center();
auto point_offset = start_offset - start_point;
auto empty_cell = wxGetApp().plater()->canvas3D()->get_nearest_empty_cell({start_point(0), start_point(1)}, {bbox.size()(0)+1, bbox.size()(1)+1});
displacement = {empty_cell.x() + point_offset.x(), empty_cell.y() + point_offset.y(), start_point(2)};
displacement = {empty_cell.x() + point_offset.x(), empty_cell.y() + point_offset.y(), start_offset(2)};
}
for (ModelInstance* inst : dst_object->instances)

12
src/slic3r/GUI/SendToPrinter.cpp
View file

@ -892,6 +892,12 @@ void SendToPrinterDialog::update_show_status()
reset_timeout();
bool is_suppt = obj_->is_function_supported(PrinterFunction::FUNC_SEND_TO_SDCARD);
if (!is_suppt) {
show_status(PrintDialogStatus::PrintStatusNotSupportedSendToSDCard);
return;
}
// reading done
if (obj_->is_in_upgrading()) {
show_status(PrintDialogStatus::PrintStatusInUpgrading);
@ -914,12 +920,6 @@ void SendToPrinterDialog::update_show_status()
show_status(PrintDialogStatus::PrintStatusNotOnTheSameLAN);
return;
}
bool is_suppt = obj_->is_function_supported(PrinterFunction::FUNC_SEND_TO_SDCARD);
if (!is_suppt) {
show_status(PrintDialogStatus::PrintStatusNotSupportedSendToSDCard);
return;
}
show_status(PrintDialogStatus::PrintStatusReadingFinished);
}

4
src/slic3r/GUI/StatusPanel.cpp
View file

@ -1807,6 +1807,7 @@ void StatusPanel::update_ams(MachineObject *obj)
// update obj in sub dlg
if (m_ams_setting_dlg) {
m_ams_setting_dlg->obj = obj;
if (obj && m_ams_setting_dlg->IsShown()) {
m_ams_setting_dlg->update_insert_material_read_mode(obj->ams_insert_flag);
m_ams_setting_dlg->update_starting_read_mode(obj->ams_power_on_flag);
@ -1842,7 +1843,7 @@ void StatusPanel::update_ams(MachineObject *obj)
for (auto ams = obj->amsList.begin(); ams != obj->amsList.end(); ams++) {
AMSinfo info;
info.ams_id = ams->first;
if (ams->second->is_exists && info.parse_ams_info(ams->second, obj->ams_calibrate_remain_flag)) ams_info.push_back(info);
if (ams->second->is_exists && info.parse_ams_info(ams->second, obj->ams_calibrate_remain_flag, obj->is_support_ams_humidity)) ams_info.push_back(info);
}
//if (obj->ams_exist_bits != last_ams_exist_bits || obj->tray_exist_bits != last_tray_exist_bits || obj->tray_is_bbl_bits != last_tray_is_bbl_bits ||
// obj->tray_read_done_bits != last_read_done_bits || obj->ams_version != last_ams_version) {
@ -2445,6 +2446,7 @@ void StatusPanel::on_ams_setting_click(SimpleEvent &event)
try {
int ams_id_int = atoi(ams_id.c_str());
m_ams_setting_dlg->ams_id = ams_id_int;
m_ams_setting_dlg->ams_support_remain = obj->ams_support_remain;
m_ams_setting_dlg->Show();
} catch (...) {
;

61
src/slic3r/GUI/Tab.cpp
View file

@ -1418,6 +1418,65 @@ void Tab::on_value_change(const std::string& opt_key, const boost::any& value)
}
}
// BBS popup a message to ask the user to set optimum parameters for tree support
if (opt_key == "support_type" || opt_key == "support_style") {
if (is_tree_slim(m_config->opt_enum<SupportType>("support_type"), m_config->opt_enum<SupportMaterialStyle>("support_style")) &&
!(m_config->opt_float("support_top_z_distance") == 0 && m_config->opt_int("support_interface_top_layers") == 0 && m_config->opt_int("tree_support_wall_count") == 2)) {
wxString msg_text = _L("We have added an experimental style \"Tree Slim\" that features smaller support volume but weaker strength.\n"
"We recommend using it with: 0 interface layers, 0 top distance, 2 walls.");
msg_text += "\n\n" + _L("Change these settings automatically? \n"
"Yes - Change these settings automatically\n"
"No - Do not change these settings for me");
MessageDialog dialog(wxGetApp().plater(), msg_text, "Suggestion", wxICON_WARNING | wxYES | wxNO);
DynamicPrintConfig new_conf = *m_config;
if (dialog.ShowModal() == wxID_YES) {
new_conf.set_key_value("support_top_z_distance", new ConfigOptionFloat(0));
new_conf.set_key_value("support_interface_top_layers", new ConfigOptionInt(0));
new_conf.set_key_value("tree_support_wall_count", new ConfigOptionInt(2));
m_config_manipulation.apply(m_config, &new_conf);
}
wxGetApp().plater()->update();
} else if ((m_config->opt_enum<SupportType>("support_type")==stTreeAuto && (m_config->opt_enum<SupportMaterialStyle>("support_style")==smsTreeStrong || m_config->opt_enum<SupportMaterialStyle>("support_style") == smsTreeHybrid)) &&
!((m_config->opt_float("support_top_z_distance") >=0.1 || is_support_filament(m_config->opt_int("support_interface_filament") - 1))
&& m_config->opt_int("support_interface_top_layers") >1) ) {
wxString msg_text = _L("For \"Tree Strong\" and \"Tree Hybrid\" styles, we recommend the following settings: at least 2 interface layers, at least 0.1mm top z distance or using support materials on interface.");
msg_text += "\n\n" + _L("Change these settings automatically? \n"
"Yes - Change these settings automatically\n"
"No - Do not change these settings for me");
MessageDialog dialog(wxGetApp().plater(), msg_text, "Suggestion", wxICON_WARNING | wxYES | wxNO);
DynamicPrintConfig new_conf = *m_config;
if (dialog.ShowModal() == wxID_YES) {
if (!is_support_filament(m_config->opt_int("support_interface_filament") - 1) && m_config->opt_float("support_top_z_distance") < 0.1)
new_conf.set_key_value("support_top_z_distance", new ConfigOptionFloat(0.2));
new_conf.set_key_value("support_interface_top_layers", new ConfigOptionInt(2));
m_config_manipulation.apply(m_config, &new_conf);
}
wxGetApp().plater()->update();
}
}
// BBS popup a message to ask the user to set optimum parameters for support interface if support materials are used
if (opt_key == "support_interface_filament") {
int interface_filament_id = m_config->opt_int("support_interface_filament") - 1; // the displayed id is based from 1, while internal id is based from 0
if (is_support_filament(interface_filament_id) && !(m_config->opt_float("support_top_z_distance") == 0 && m_config->opt_float("support_interface_spacing") == 0 &&
m_config->opt_enum<SupportMaterialInterfacePattern>("support_interface_pattern") == SupportMaterialInterfacePattern::smipConcentric)) {
wxString msg_text = _L("When using support material for the support interface, We recommend the following settings:\n"
"0 top z distance, 0 interface spacing, concentric pattern.");
msg_text += "\n\n" + _L("Change these settings automatically? \n"
"Yes - Change these settings automatically\n"
"No - Do not change these settings for me");
MessageDialog dialog(wxGetApp().plater(), msg_text, "Suggestion", wxICON_WARNING | wxYES | wxNO);
DynamicPrintConfig new_conf = *m_config;
if (dialog.ShowModal() == wxID_YES) {
new_conf.set_key_value("support_top_z_distance", new ConfigOptionFloat(0));
new_conf.set_key_value("support_interface_spacing", new ConfigOptionFloat(0));
new_conf.set_key_value("support_interface_pattern", new ConfigOptionEnum<SupportMaterialInterfacePattern>(SupportMaterialInterfacePattern::smipConcentric));
m_config_manipulation.apply(m_config, &new_conf);
}
wxGetApp().plater()->update();
}
}
// BBS
#if 0
if (opt_key == "extruders_count")
@ -1893,6 +1952,7 @@ void TabPrint::build()
optgroup = page->new_optgroup(L("Support"), L"param_support");
optgroup->append_single_option_line("enable_support", "support");
optgroup->append_single_option_line("support_type", "support#support-types");
optgroup->append_single_option_line("support_style", "support#support-styles");
optgroup->append_single_option_line("support_threshold_angle", "support#threshold-angle");
optgroup->append_single_option_line("support_on_build_plate_only");
optgroup->append_single_option_line("support_critical_regions_only");
@ -1908,7 +1968,6 @@ void TabPrint::build()
optgroup->append_single_option_line("support_interface_filament", "support#support-filament");
//optgroup = page->new_optgroup(L("Options for support material and raft"));
//optgroup->append_single_option_line("support_style");
//BBS
optgroup = page->new_optgroup(L("Advanced"), L"param_advanced");

14
src/slic3r/GUI/Widgets/AMSControl.cpp
View file

@ -35,11 +35,18 @@ wxDEFINE_EVENT(EVT_AMS_CLIBRATION_CANCEL, wxCommandEvent);
wxDEFINE_EVENT(EVT_AMS_GUIDE_WIKI, wxCommandEvent);
wxDEFINE_EVENT(EVT_AMS_RETRY, wxCommandEvent);
bool AMSinfo::parse_ams_info(Ams *ams, bool remain_flag)
bool AMSinfo::parse_ams_info(Ams *ams, bool remain_flag, bool humidity_flag)
{
if (!ams) return false;
this->ams_id = ams->id;
this->ams_humidity = ams->humidity;
if (humidity_flag) {
this->ams_humidity = ams->humidity;
}
else {
this->ams_humidity = -1;
}
cans.clear();
for (int i = 0; i < 4; i++) {
auto it = ams->trayList.find(std::to_string(i));
@ -917,7 +924,8 @@ void AMSRoad::doRender(wxDC &dc)
dc.DrawBitmap(ams_humidity_0.bmp(), wxPoint(size.x - ams_humidity_0.GetBmpSize().x - FromDIP(4), size.y - ams_humidity_0.GetBmpSize().y - FromDIP(8)));
}
else {
dc.DrawBitmap(ams_humidity_4.bmp(), wxPoint(size.x - ams_humidity_4.GetBmpSize().x - FromDIP(4), size.y - ams_humidity_4.GetBmpSize().y - FromDIP(8)));
/*dc.DrawBitmap(ams_humidity_4.bmp(), wxPoint(size.x - ams_humidity_4.GetBmpSize().x - FromDIP(4), size.y - ams_humidity_4.GetBmpSize().y - FromDIP(8)));*/
//to do ...
}
}
}

2
src/slic3r/GUI/Widgets/AMSControl.hpp
View file

@ -126,7 +126,7 @@ public:
int curreent_filamentstep;
int ams_humidity = 0;
bool parse_ams_info(Ams *ams, bool remain_flag = false);
bool parse_ams_info(Ams *ams, bool remain_flag = false, bool humidity_flag = false);
};
/*************************************************

4
src/slic3r/GUI/Widgets/SideMenuPopup.cpp
View file

@ -2,6 +2,7 @@
#include "Label.hpp"
#include <wx/dcgraph.h>
#include "../GUI_App.hpp"
@ -17,7 +18,6 @@ SidePopup::SidePopup(wxWindow* parent)
#ifdef __WINDOWS__
SetDoubleBuffered(true);
#endif //__WINDOWS__
}
SidePopup::~SidePopup()
@ -27,6 +27,7 @@ SidePopup::~SidePopup()
void SidePopup::OnDismiss()
{
Slic3r::GUI::wxGetApp().set_side_menu_popup_status(false);
wxPopupTransientWindow::OnDismiss();
}
@ -64,6 +65,7 @@ void SidePopup::Popup(wxWindow* focus)
else
Position(pos, {0, focus->GetSize().y + 12});
}
Slic3r::GUI::wxGetApp().set_side_menu_popup_status(true);
wxPopupTransientWindow::Popup();
}

18
src/slic3r/GUI/WipeTowerDialog.cpp
View file

@ -611,24 +611,6 @@ void WipingPanel::update_warning_texts()
void WipingPanel::calc_flushing_volumes()
{
auto is_support_filament = [](int extruder_id) -> bool {
auto& filament_presets = Slic3r::GUI::wxGetApp().preset_bundle->filament_presets;
auto& filaments = Slic3r::GUI::wxGetApp().preset_bundle->filaments;
if (extruder_id >= filament_presets.size())
return false;
Slic3r::Preset* filament = filaments.find_preset(filament_presets[extruder_id]);
if (filament == nullptr)
return false;
Slic3r::ConfigOptionBools* support_option = dynamic_cast<Slic3r::ConfigOptionBools*>(filament->config.option("filament_is_support"));
if (support_option == nullptr)
return false;
return support_option->get_at(0);
};
for (int from_idx = 0; from_idx < m_colours.size(); from_idx++) {
const wxColour& from = m_colours[from_idx];
bool is_from_support = is_support_filament(from_idx);

Some files were not shown because too many files have changed in this diff Show more