From b38bb5a0076832d1766bc14c16f5b63da90c5d0c Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Mon, 10 Oct 2016 11:02:43 +0200 Subject: [PATCH 1/8] fix: nylon has standby temp 175 (CURA-2567) --- resources/materials/ultimaker_nylon_black.xml.fdm_material | 2 +- .../materials/ultimaker_nylon_transparent.xml.fdm_material | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/materials/ultimaker_nylon_black.xml.fdm_material b/resources/materials/ultimaker_nylon_black.xml.fdm_material index 2d013ab408..4eed0b025c 100644 --- a/resources/materials/ultimaker_nylon_black.xml.fdm_material +++ b/resources/materials/ultimaker_nylon_black.xml.fdm_material @@ -20,6 +20,6 @@ Generic Nylon profile. Serves as an example file, data in this file is not corre 250 60 - 100 + 175 diff --git a/resources/materials/ultimaker_nylon_transparent.xml.fdm_material b/resources/materials/ultimaker_nylon_transparent.xml.fdm_material index 639f5188d4..7d80a0568c 100644 --- a/resources/materials/ultimaker_nylon_transparent.xml.fdm_material +++ b/resources/materials/ultimaker_nylon_transparent.xml.fdm_material @@ -20,6 +20,6 @@ Generic Nylon profile. Serves as an example file, data in this file is not corre 250 60 - 100 + 175 From 879ab529f229664b500cc7eb176df70d8a76a6c0 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Mon, 10 Oct 2016 17:48:00 +0200 Subject: [PATCH 2/8] Fix deleting grouped object using the context-menu CURA-2573 --- cura/CuraApplication.py | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index fa22227a43..b7092c4eaa 100644 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -646,8 +646,6 @@ class CuraApplication(QtApplication): op.addOperation(RemoveSceneNodeOperation(group_node)) op.push() - pass - ## Remove an object from the scene. # Note that this only removes an object if it is selected. @pyqtSlot("quint64") @@ -661,17 +659,17 @@ class CuraApplication(QtApplication): node = Selection.getSelectedObject(0) if node: - group_node = None - if node.getParent(): - group_node = node.getParent() - op = RemoveSceneNodeOperation(node) + op = GroupedOperation() + op.addOperation(RemoveSceneNodeOperation(node)) + + group_node = node.getParent() + if group_node: + # Note that at this point the node has not yet been deleted + if len(group_node.getChildren()) <= 2 and group_node.callDecoration("isGroup"): + op.addOperation(SetParentOperation(group_node.getChildren()[0], group_node.getParent())) + op.addOperation(RemoveSceneNodeOperation(group_node)) op.push() - if group_node: - if len(group_node.getChildren()) == 1 and group_node.callDecoration("isGroup"): - op.addOperation(SetParentOperation(group_node.getChildren()[0], group_node.getParent())) - op = RemoveSceneNodeOperation(group_node) - op.push() ## Create a number of copies of existing object. @pyqtSlot("quint64", int) From 0af42587b08b0f7aca332878d6e4a1712dd47c00 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Mon, 10 Oct 2016 18:42:55 +0200 Subject: [PATCH 3/8] Fix jobname when opening multiple files at once --- resources/qml/Cura.qml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml index 6556f7e56a..59e4848851 100644 --- a/resources/qml/Cura.qml +++ b/resources/qml/Cura.qml @@ -666,10 +666,13 @@ UM.MainWindow for(var i in fileUrls) { UM.MeshFileHandler.readLocalFile(fileUrls[i]) - } - var meshName = backgroundItem.getMeshName(fileUrl.toString()) - backgroundItem.hasMesh(decodeURIComponent(meshName)) + if (i == fileUrls.length - 1) + { + var meshName = backgroundItem.getMeshName(fileUrls.toString()) + backgroundItem.hasMesh(decodeURIComponent(meshName)) + } + } } } From 3b38d52c7589b87c34a3a24a79410edf4b8f60d4 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Tue, 11 Oct 2016 11:22:16 +0200 Subject: [PATCH 4/8] fix: changelog bugfixes formatting (CURA-2000) --- plugins/ChangeLogPlugin/ChangeLog.txt | 49 ++++++++++++++------------- 1 file changed, 26 insertions(+), 23 deletions(-) diff --git a/plugins/ChangeLogPlugin/ChangeLog.txt b/plugins/ChangeLogPlugin/ChangeLog.txt index b5f7b35457..e853933827 100644 --- a/plugins/ChangeLogPlugin/ChangeLog.txt +++ b/plugins/ChangeLogPlugin/ChangeLog.txt @@ -59,40 +59,43 @@ Set the travel speed of the initial layer(s) to reduce risk of extruder pulling *Support Interface It is now possible to print a support bottom as well as a support roof. Support bottoms are placed where the support rests on the model. -*Bug fixes & minor changes -Deleting grouped objects works as intended again. -Duplicating groups works as intended again. -Bridging works as intended again. +*Bug fixes +Deleting grouped objects +Duplicating groups +Bridging +Drag and drop on the first run on Windows +Unretraction speeds +Bottom layer in Spiralize mode +Overlap Compensation +Retractions on Raft +Retractions now occur after each object printed in one-at-a-time mode. Rafts are no longer printed outside of build area. -Messages are now displayed 30 seconds instead of 10, making it less likely that certain messages are missed. -Drag and drop on the first run on windows works again. -You are now notified if you try to save to a locked SD card. -Combing is applied in more cases and results in better paths. -Infill thickness now supports Grid infill also for even multiples of the layer height. -Unretraction speeds are correct again. -Spiralize mode doesn’t spiralize the bottom layer any more. Spiralize now spiralizes each part in a layer. -Support is no longer removed by unprintable thin parts of the model. -Support is now generated on each layer it’s supposed to. -Support doesn't go outside overhang areas any more. Line distance is now the actual line distance. Enabling raft doesn’t influence at which height the model is sliced any more. Brim is now always printed just once. -Overlap Compensation works as intended again. -A raft now produces a reasonable amount of retractions. -No more string plume on top of one-at-a-time printed objects. -Engine log is now included in the application log. Support roofs now only occur just below overhang. -Brim is now also generated under the support. -Compensate overlapping wall parts now also works for inner walls. -Bed Level and Checkup procedures for UMO+ can now be done without re-adding machine. + +*Minor changes +Messages are now displayed 30 seconds instead of 10, making it less likely that certain messages are missed. +You are now notified if you try to save to a locked SD card. +Engine log is now included in the application log. Undo and Redo now work correctly with multiple operations. The last used folder is now remembered (instead of defaulting to home folder) -You can now adjust the speed at which the bed is lowered each layer. -Settings shared between skirt and brim now also activate when brim is selected. Made it possible to add multiple Per Model Settings at once. +Bed Level and Checkup procedures for UMO+ can now be done without re-adding machine. +Combing is applied in more cases and results in better paths. +Infill thickness now supports Grid infill also for even multiples of the layer height. +Support is no longer removed by unprintable thin parts of the model. +Support is now generated on each layer it’s supposed to. +Support doesn't go outside overhang areas any more. Support doesn't remove brim around the object any more. +Brim is now also generated under the support. Draft shield and Ooze shield get their own brim or raft. +Settings shared between skirt and brim now also activate when brim is selected. +Compensate overlapping wall parts now also works for inner walls. +You can now adjust the speed at which the bed is lowered each layer. + [2.1.3] From 311ebdc3ba75d311e528bfa188d474594b7ac6c1 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Tue, 11 Oct 2016 11:35:20 +0200 Subject: [PATCH 5/8] fix: changelog clarity improvements suggested by nickthetait (CURA-2000) --- plugins/ChangeLogPlugin/ChangeLog.txt | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/plugins/ChangeLogPlugin/ChangeLog.txt b/plugins/ChangeLogPlugin/ChangeLog.txt index e853933827..8452399346 100644 --- a/plugins/ChangeLogPlugin/ChangeLog.txt +++ b/plugins/ChangeLogPlugin/ChangeLog.txt @@ -7,7 +7,7 @@ The first thing you will notice is the speed. STL loading is now 10 to 20 times Machines with multiple extruders are now supported. If you’ve got the Ultimaker Original with the dual extrusion upgrade kit, we’ve got you covered. *Custom Machine Support -The new custom machine plug-in allows you to change machine settings with ease. That means it’s now much easier to use Cura with custom machines. +It’s now much easier to use Cura with custom machines. You can edit the machine settings when you load a new custom machine. *Improved Position Tool Place objects precisely where you want them by manually entering the values for the position. @@ -35,14 +35,17 @@ Cura now estimates print weight as well as length. Configurations from older installations of Cura 2.1 are automatically imported into the newest installation. *Slicing features -*Infill Improvements -We've introduced two new infill types: Tetrahedral and Cubic. They change along with the Z-axis for more uniform strength in all directions. Also, now you can change the density of the infill based on the distance from the top layers. Your objects print faster, use less material, and maintain the same strength. +*Infill Types +We've introduced two new infill types: Tetrahedral and Cubic. They change along with the Z-axis for more uniform strength in all directions. There are now 7 infill types to choose from. + +*Gradual Infill +Now you can change the density of the infill based on the distance from the top layers. Your objects print faster, use less material, while top surfaces have the same quality. *Set Acceleration and Jerk by Feature You can now set Jerk and Acceleration by feature-type (infill, walls, top/bottom, etc), for more precision. *Outer Wall Offset -Apply an offset to where the outer wall is printed for better surface quality when the outer wall line width is smaller than the nozzle size. +If your outer wall line width is smaller than your nozzle size, move the nozzle a bit inward when printing the outer wall, to improve surface quality. *Enhanced Combing The “No Skin” option allows you to comb over infill only to avoid scars on top surfaces. @@ -57,7 +60,7 @@ The Skin Overlap setting allows you to overlap the skin lines with the walls for Set the travel speed of the initial layer(s) to reduce risk of extruder pulling the print from the bed. *Support Interface -It is now possible to print a support bottom as well as a support roof. Support bottoms are placed where the support rests on the model. +It is now possible to print a support bottom as well as a support roof. Support bottoms are placed where the support rests on the model. Printing the support interface with PVA leads to improved surface quality. *Bug fixes Deleting grouped objects @@ -70,7 +73,7 @@ Overlap Compensation Retractions on Raft Retractions now occur after each object printed in one-at-a-time mode. Rafts are no longer printed outside of build area. -Spiralize now spiralizes each part in a layer. +Spiralize no longer only spiralizes the first printed segment only. Line distance is now the actual line distance. Enabling raft doesn’t influence at which height the model is sliced any more. Brim is now always printed just once. @@ -81,7 +84,8 @@ Messages are now displayed 30 seconds instead of 10, making it less likely that You are now notified if you try to save to a locked SD card. Engine log is now included in the application log. Undo and Redo now work correctly with multiple operations. -The last used folder is now remembered (instead of defaulting to home folder) +The last used folder is now remembered (instead of defaulting to home folder). +Import X3D files. Made it possible to add multiple Per Model Settings at once. Bed Level and Checkup procedures for UMO+ can now be done without re-adding machine. Combing is applied in more cases and results in better paths. @@ -96,7 +100,6 @@ Settings shared between skirt and brim now also activate when brim is selected. Compensate overlapping wall parts now also works for inner walls. You can now adjust the speed at which the bed is lowered each layer. - [2.1.3] *Material Profiles From 0c604ca002e9635237257b225d35b1e5b3ef3c62 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 11 Oct 2016 13:34:02 +0200 Subject: [PATCH 6/8] Update translation of PostProcessingPlugin These were missed previous time because I had my extract script set-up wrong. Contributes to issue CURA-570. --- resources/i18n/de/cura.po | 39 +++++++++++++++++++++++++++++++++++++++ resources/i18n/es/cura.po | 39 +++++++++++++++++++++++++++++++++++++++ resources/i18n/fi/cura.po | 39 +++++++++++++++++++++++++++++++++++++++ resources/i18n/fr/cura.po | 39 +++++++++++++++++++++++++++++++++++++++ resources/i18n/it/cura.po | 39 +++++++++++++++++++++++++++++++++++++++ resources/i18n/nl/cura.po | 39 +++++++++++++++++++++++++++++++++++++++ resources/i18n/tr/cura.po | 39 +++++++++++++++++++++++++++++++++++++++ 7 files changed, 273 insertions(+) diff --git a/resources/i18n/de/cura.po b/resources/i18n/de/cura.po index 5865f8ebed..7dd480bf81 100644 --- a/resources/i18n/de/cura.po +++ b/resources/i18n/de/cura.po @@ -2294,3 +2294,42 @@ msgid "" "\n" "Click to open the profile manager." msgstr "Einige Einstellungswerte unterscheiden sich von den im Profil gespeicherten Werten.\n\nKlicken Sie, um den Profilmanager zu öffnen." + +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.py:24 +msgid "Modify G-Code" +msgstr "G-Code ändern" + +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/__init__.py:12 +msgctxt "@label" +msgid "Post Processing" +msgstr "Nachbearbeitung" + +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/__init__.py:16 +msgctxt "Description of plugin" +msgid "Extension that allows for user created scripts for post processing" +msgstr "Erweiterung, die eine Nachbearbeitung von Skripten ermöglicht, die von Benutzern erstellt wurden." + +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:18 +msgctxt "@title:window" +msgid "Post Processing Plugin" +msgstr "Plugin Nachbearbeitung" + +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:49 +msgctxt "@label" +msgid "Post Processing Scripts" +msgstr "Skripts Nachbearbeitung" + +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:218 +msgctxt "@action" +msgid "Add a script" +msgstr "Ein Skript hinzufügen" + +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:264 +msgctxt "@label" +msgid "Settings" +msgstr "Einstellungen" + +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:456 +msgctxt "@info:tooltip" +msgid "Change active post-processing scripts" +msgstr "Aktive Skripts Nachbearbeitung ändern" diff --git a/resources/i18n/es/cura.po b/resources/i18n/es/cura.po index 8bee1f3c52..ef82e6be05 100644 --- a/resources/i18n/es/cura.po +++ b/resources/i18n/es/cura.po @@ -2294,3 +2294,42 @@ msgid "" "\n" "Click to open the profile manager." msgstr "Algunos valores son distintos de los valores almacenados en el perfil.\n\nHaga clic para abrir el administrador de perfiles." + +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.py:24 +msgid "Modify G-Code" +msgstr "Modificar GCode" + +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/__init__.py:12 +msgctxt "@label" +msgid "Post Processing" +msgstr "Posprocesamiento" + +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/__init__.py:16 +msgctxt "Description of plugin" +msgid "Extension that allows for user created scripts for post processing" +msgstr "Extensión que permite el posprocesamiento de las secuencias de comandos creadas por los usuarios." + +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:18 +msgctxt "@title:window" +msgid "Post Processing Plugin" +msgstr "Complemento de posprocesamiento" + +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:49 +msgctxt "@label" +msgid "Post Processing Scripts" +msgstr "Secuencias de comandos de posprocesamiento" + +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:218 +msgctxt "@action" +msgid "Add a script" +msgstr "Añadir secuencia de comando" + +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:264 +msgctxt "@label" +msgid "Settings" +msgstr "Ajustes" + +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:456 +msgctxt "@info:tooltip" +msgid "Change active post-processing scripts" +msgstr "Cambia las secuencias de comandos de posprocesamiento." diff --git a/resources/i18n/fi/cura.po b/resources/i18n/fi/cura.po index 04b196c6ce..c96b976be0 100644 --- a/resources/i18n/fi/cura.po +++ b/resources/i18n/fi/cura.po @@ -2294,3 +2294,42 @@ msgid "" "\n" "Click to open the profile manager." msgstr "Jotkut asetusten arvot eroavat profiiliin tallennetuista arvoista.\n\nAvaa profiilin hallinta napsauttamalla." + +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.py:24 +msgid "Modify G-Code" +msgstr "Muokkaa GCode-arvoa" + +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/__init__.py:12 +msgctxt "@label" +msgid "Post Processing" +msgstr "Jälkikäsittely" + +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/__init__.py:16 +msgctxt "Description of plugin" +msgid "Extension that allows for user created scripts for post processing" +msgstr "Lisäosa, jonka avulla käyttäjät voivat luoda komentosarjoja jälkikäsittelyä varten" + +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:18 +msgctxt "@title:window" +msgid "Post Processing Plugin" +msgstr "Jälkikäsittelylisäosa" + +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:49 +msgctxt "@label" +msgid "Post Processing Scripts" +msgstr "Jälkikäsittelykomentosarjat" + +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:218 +msgctxt "@action" +msgid "Add a script" +msgstr "Lisää komentosarja" + +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:264 +msgctxt "@label" +msgid "Settings" +msgstr "Asetukset" + +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:456 +msgctxt "@info:tooltip" +msgid "Change active post-processing scripts" +msgstr "Muuta aktiivisia jälkikäsittelykomentosarjoja" diff --git a/resources/i18n/fr/cura.po b/resources/i18n/fr/cura.po index c895cd41f5..ea3ed63c31 100644 --- a/resources/i18n/fr/cura.po +++ b/resources/i18n/fr/cura.po @@ -2294,3 +2294,42 @@ msgid "" "\n" "Click to open the profile manager." msgstr "Certaines valeurs de paramètre sont différentes des valeurs enregistrées dans le profil.\n\nCliquez pour ouvrir le gestionnaire de profils." + +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.py:24 +msgid "Modify G-Code" +msgstr "Modifier le G-Code" + +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/__init__.py:12 +msgctxt "@label" +msgid "Post Processing" +msgstr "Post-traitement" + +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/__init__.py:16 +msgctxt "Description of plugin" +msgid "Extension that allows for user created scripts for post processing" +msgstr "Extension qui permet le post-traitement des scripts créés par l'utilisateur" + +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:18 +msgctxt "@title:window" +msgid "Post Processing Plugin" +msgstr "Plug-in de post-traitement" + +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:49 +msgctxt "@label" +msgid "Post Processing Scripts" +msgstr "Scripts de post-traitement" + +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:218 +msgctxt "@action" +msgid "Add a script" +msgstr "Ajouter un script" + +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:264 +msgctxt "@label" +msgid "Settings" +msgstr "Paramètres" + +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:456 +msgctxt "@info:tooltip" +msgid "Change active post-processing scripts" +msgstr "Modifier les scripts de post-traitement actifs" diff --git a/resources/i18n/it/cura.po b/resources/i18n/it/cura.po index 2483c09260..92ecd581cd 100644 --- a/resources/i18n/it/cura.po +++ b/resources/i18n/it/cura.po @@ -2294,3 +2294,42 @@ msgid "" "\n" "Click to open the profile manager." msgstr "Alcuni valori di impostazione sono diversi dai valori memorizzati nel profilo.\n\nFare clic per aprire la gestione profili." + +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.py:24 +msgid "Modify G-Code" +msgstr "Modifica il codice G" + +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/__init__.py:12 +msgctxt "@label" +msgid "Post Processing" +msgstr "Post-elaborazione" + +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/__init__.py:16 +msgctxt "Description of plugin" +msgid "Extension that allows for user created scripts for post processing" +msgstr "Estensione che consente la post-elaborazione degli script creati da utente" + +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:18 +msgctxt "@title:window" +msgid "Post Processing Plugin" +msgstr "Plug-in di post-elaborazione" + +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:49 +msgctxt "@label" +msgid "Post Processing Scripts" +msgstr "Script di post-elaborazione" + +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:218 +msgctxt "@action" +msgid "Add a script" +msgstr "Aggiungi uno script" + +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:264 +msgctxt "@label" +msgid "Settings" +msgstr "Impostazioni" + +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:456 +msgctxt "@info:tooltip" +msgid "Change active post-processing scripts" +msgstr "Modifica script di post-elaborazione attivi" diff --git a/resources/i18n/nl/cura.po b/resources/i18n/nl/cura.po index 3dd69d0a0d..ee566a61ad 100644 --- a/resources/i18n/nl/cura.po +++ b/resources/i18n/nl/cura.po @@ -2294,3 +2294,42 @@ msgid "" "\n" "Click to open the profile manager." msgstr "Sommige instellingswaarden zijn anders dan de waarden die in het profiel zijn opgeslagen.\n\nKlik om het profielbeheer te openen." + +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.py:24 +msgid "Modify G-Code" +msgstr "G-code wijzigen" + +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/__init__.py:12 +msgctxt "@label" +msgid "Post Processing" +msgstr "Nabewerken" + +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/__init__.py:16 +msgctxt "Description of plugin" +msgid "Extension that allows for user created scripts for post processing" +msgstr "Uitbreiding waarmee door de gebruiker gemaakte scripts voor nabewerking kunnen worden gebruikt" + +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:18 +msgctxt "@title:window" +msgid "Post Processing Plugin" +msgstr "Invoegtoepassing voor nabewerking" + +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:49 +msgctxt "@label" +msgid "Post Processing Scripts" +msgstr "Scripts voor nabewerking" + +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:218 +msgctxt "@action" +msgid "Add a script" +msgstr "Een script toevoegen" + +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:264 +msgctxt "@label" +msgid "Settings" +msgstr "Instellingen" + +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:456 +msgctxt "@info:tooltip" +msgid "Change active post-processing scripts" +msgstr "Actieve scripts voor nabewerking wijzigen" diff --git a/resources/i18n/tr/cura.po b/resources/i18n/tr/cura.po index 940ffb3e5e..511ed43c47 100644 --- a/resources/i18n/tr/cura.po +++ b/resources/i18n/tr/cura.po @@ -2294,3 +2294,42 @@ msgid "" "\n" "Click to open the profile manager." msgstr "Bazı ayar değerleri profilinizde saklanan değerlerden farklıdır.\n\nProfil yöneticisini açmak için tıklayın." + +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.py:24 +msgid "Modify G-Code" +msgstr "GCode Değiştir" + +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/__init__.py:12 +msgctxt "@label" +msgid "Post Processing" +msgstr "Son İşleme" + +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/__init__.py:16 +msgctxt "Description of plugin" +msgid "Extension that allows for user created scripts for post processing" +msgstr "Kullanıcının oluşturduğu komut dosyalarına son işleme için izin veren uzantı" + +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:18 +msgctxt "@title:window" +msgid "Post Processing Plugin" +msgstr "Son İşleme Uzantısı" + +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:49 +msgctxt "@label" +msgid "Post Processing Scripts" +msgstr "Son İşleme Dosyaları" + +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:218 +msgctxt "@action" +msgid "Add a script" +msgstr "Dosya ekle" + +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:264 +msgctxt "@label" +msgid "Settings" +msgstr "Ayarlar" + +#: /home/ruben/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:456 +msgctxt "@info:tooltip" +msgid "Change active post-processing scripts" +msgstr "Etkin son işleme dosyalarını değiştir" From d04e6a664417108141ae9fae319c037588d468a1 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Tue, 11 Oct 2016 13:34:48 +0200 Subject: [PATCH 7/8] Use buffered writing for writing gcode to removable drives GCode files are still written line by line, but python is instructed to use buffering. This greatly decreases the total time required to write large(ish) files to USB drives, while having minimal impact on memory use. CURA-2544 --- .../RemovableDriveOutputDevice.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py b/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py index efb7929327..b7d31e68f8 100644 --- a/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py +++ b/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py @@ -23,6 +23,7 @@ class RemovableDriveOutputDevice(OutputDevice): self.setPriority(1) self._writing = False + self._stream = None def requestWrite(self, node, file_name = None, filter_by_machine = False): filter_by_machine = True # This plugin is indended to be used by machine (regardless of what it was told to do) @@ -65,8 +66,8 @@ class RemovableDriveOutputDevice(OutputDevice): try: Logger.log("d", "Writing to %s", file_name) - stream = open(file_name, "wt") - job = WriteMeshJob(writer, stream, node, MeshWriter.OutputMode.TextMode) + self._stream = open(file_name, "wt", buffering = 1) + job = WriteMeshJob(writer, self._stream, node, MeshWriter.OutputMode.TextMode) job.setFileName(file_name) job.progress.connect(self._onProgress) job.finished.connect(self._onFinished) @@ -92,6 +93,10 @@ class RemovableDriveOutputDevice(OutputDevice): self.writeProgress.emit(self, progress) def _onFinished(self, job): + if self._stream: + self._stream.close() + self._stream = None + if hasattr(job, "_message"): job._message.hide() job._message = None From 15a870c050b3d45151d30147608f868811114481 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Tue, 11 Oct 2016 13:39:44 +0200 Subject: [PATCH 8/8] Add some documentation CURA-2544 --- .../RemovableDriveOutputDevice/RemovableDriveOutputDevice.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py b/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py index b7d31e68f8..8b6dce8292 100644 --- a/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py +++ b/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py @@ -66,6 +66,7 @@ class RemovableDriveOutputDevice(OutputDevice): try: Logger.log("d", "Writing to %s", file_name) + # Using buffering greatly reduces the write time for many lines of gcode self._stream = open(file_name, "wt", buffering = 1) job = WriteMeshJob(writer, self._stream, node, MeshWriter.OutputMode.TextMode) job.setFileName(file_name) @@ -94,6 +95,7 @@ class RemovableDriveOutputDevice(OutputDevice): def _onFinished(self, job): if self._stream: + # Explicitly closing the stream flushes the write-buffer self._stream.close() self._stream = None