From df9aac045bdd764f0e775acda1834eadce94c4fa Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 4 Mar 2016 15:38:59 +0100 Subject: [PATCH 01/42] Various improvements to desktop file Version number needs to be the version number of the desktop file format. The exec command needs to accept multiple files (capital F). The tryexec needs to accept no files. Added a comment. Contributes to issue CURA-730. --- cura.desktop | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cura.desktop b/cura.desktop index 4ac14e4651..f5fc344c1b 100644 --- a/cura.desktop +++ b/cura.desktop @@ -1,12 +1,12 @@ [Desktop Entry] -Version=15.06.01 +Version=1 Name=Cura Name[de]=Cura GenericName=3D Printing Software GenericName[de]=3D-Druck-Software -Comment= -Exec=/usr/bin/cura_app.py %f -TryExec=/usr/bin/cura_app.py %f +Comment=Cura converts 3D models into paths for a 3D printer. It prepares your print for maximum accuracy, minimum printing time and good reliability with many extra features that make your print come out great. +Exec=/usr/bin/cura_app.py %F +TryExec=/usr/bin/cura_app.py Icon=/usr/share/cura/resources/images/cura-icon.png Terminal=false Type=Application From 9bf12cf7b2c5a2a5e5358f20e94816a3d20c6548 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 4 Mar 2016 16:22:31 +0100 Subject: [PATCH 02/42] =?UTF-8?q?Remove=20double=20profile=20entry=20from?= =?UTF-8?q?=20D=CD=AD=CC=8C=CC=83=CD=AB=CD=8A=CC=A9=CC=99=CC=B9=CD=88?= =?UTF-8?q?=CC=9CI=CD=8C=CC=90=CC=94=CC=A4=CC=9D=CC=BB=CD=8E=CC=96=CC=97?= =?UTF-8?q?=CD=96C=CC=90=CD=A3=CC=85=CD=9B=CC=86=CC=87=CC=85=CC=AAT=CC=84?= =?UTF-8?q?=CD=8C=CC=90=CD=AA=CC=8B=CD=A8=CD=AB=CC=A6=CC=BBI=CC=8F=CC=BF?= =?UTF-8?q?=CD=A5=CC=AD=CC=AC=CC=AA=CD=95=CC=96=CC=99=CC=AA=CC=BBO=CD=97?= =?UTF-8?q?=CD=A7=CD=8B=CD=AE=CC=B1=CD=96=CC=9F=CD=93=CC=9EN=CC=8B=CD=AD?= =?UTF-8?q?=CC=92=CD=9B=CC=A3=CC=B1=CC=A5=CD=8D=CC=A6=CD=8EA=CC=BD=CD=A5?= =?UTF-8?q?=CD=A8=CC=8B=CD=90=CC=80=CC=BB=CC=AF=CC=B3=CC=A9=CD=88=CC=B1?= =?UTF-8?q?=CC=A4=CD=8ER=CD=A9=CD=AE=CD=AE=CC=93=CC=83=CD=AD=CC=A6=CC=AF?= =?UTF-8?q?=CC=A0Y=CC=81=CC=89=CC=84=CC=8F=CD=8C=CD=AD=CC=8F=CD=97=CC=8A?= =?UTF-8?q?=CC=AB=CC=9C=CC=BA=CC=BB=CC=BC=20=CD=90=CD=A5=CC=A3=CC=AA=CC=A0?= =?UTF-8?q?=CC=99=CC=9CO=CC=8B=CD=8B=CC=93=CD=8E=CC=9E=CC=BA=CC=A6=CC=AC?= =?UTF-8?q?=CC=9CF=CC=8D=CD=AC=CC=BD=CC=89=CC=8F=CC=BF=CC=BE=CD=83=CD=92?= =?UTF-8?q?=CC=A9=CC=A3=CD=85=CD=96=CC=A4=CD=87=CD=8D=20=CD=AE=CC=80=CD=AE?= =?UTF-8?q?=CD=AE=CD=91=CC=83=CC=8E=CC=A9=CC=AC=CC=A5=CC=AF=CD=85D=CD=A7?= =?UTF-8?q?=CD=A3=CD=88=CC=AAO=CC=85=CC=8A=CD=85=CC=98=CC=AA=CC=9F=CC=97?= =?UTF-8?q?=CC=B9=CD=93O=CC=8C=CD=88M=CC=8A=CC=85=CD=A4=CD=83=CC=9F=CC=A6?= =?UTF-8?q?=CD=85=CC=AD=CD=99=CD=88=CD=95=CC=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins/LegacyProfileReader/DictionaryOfDoom.json | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/LegacyProfileReader/DictionaryOfDoom.json b/plugins/LegacyProfileReader/DictionaryOfDoom.json index 06c06aa497..e30460f103 100644 --- a/plugins/LegacyProfileReader/DictionaryOfDoom.json +++ b/plugins/LegacyProfileReader/DictionaryOfDoom.json @@ -8,7 +8,6 @@ "layer_height": "layer_height", "layer_height_0": "bottom_thickness", "wall_thickness": "wall_thickness", - "top_bottom_thickness": "solid_layer_thickness", "top_thickness": "0 if (solid_top == \"False\") else solid_layer_thickness", "bottom_thickness": "0 if (solid_bottom == \"False\") else solid_layer_thickness", "infill_sparse_density": "fill_density", From ce9f6077a27b00143254fd961bee7a20a03c2222 Mon Sep 17 00:00:00 2001 From: Thomas Karl Pietrowski Date: Tue, 8 Mar 2016 10:58:37 +0100 Subject: [PATCH 03/42] Renaming cura_app.py into cura on Linux* --- CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 92dcb8c88d..8c19bfe188 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -55,8 +55,11 @@ find_package(PythonInterp 3.4.0 REQUIRED) install(DIRECTORY resources DESTINATION ${CMAKE_INSTALL_DATADIR}/cura) install(DIRECTORY plugins DESTINATION lib/cura) -install(FILES cura_app.py DESTINATION ${CMAKE_INSTALL_BINDIR} PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) if(NOT APPLE AND NOT WIN32) + install(FILES cura_app.py + DESTINATION ${CMAKE_INSTALL_BINDIR} + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE + RENAME cura) install(DIRECTORY cura DESTINATION lib/python${PYTHON_VERSION_MAJOR}/dist-packages FILES_MATCHING PATTERN *.py) install(FILES ${CMAKE_BINARY_DIR}/CuraVersion.py DESTINATION lib/python${PYTHON_VERSION_MAJOR}/dist-packages/cura) install(FILES cura.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications) @@ -64,6 +67,7 @@ if(NOT APPLE AND NOT WIN32) DESTINATION ${CMAKE_INSTALL_DATADIR}/mime/packages/ RENAME cura.xml ) else() + install(FILES cura_app.py DESTINATION ${CMAKE_INSTALL_BINDIR} PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) install(DIRECTORY cura DESTINATION lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages FILES_MATCHING PATTERN *.py) install(FILES ${CMAKE_BINARY_DIR}/CuraVersion.py DESTINATION lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages/cura) endif() From 368718e82b266885836162164f2a9e5d7cb20e6b Mon Sep 17 00:00:00 2001 From: Thomas Karl Pietrowski Date: Tue, 8 Mar 2016 11:03:25 +0100 Subject: [PATCH 04/42] Make all install(*) commands multiline It makes the CMakeLists.txt (at least for me) easier to read. --- CMakeLists.txt | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8c19bfe188..bb6a72bd1d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -47,29 +47,41 @@ if(NOT ${URANIUM_SCRIPTS_DIR} STREQUAL "") add_custom_command(TARGET translations POST_BUILD COMMAND mkdir ARGS -p ${CMAKE_BINARY_DIR}/resources/i18n/${lang}/LC_MESSAGES/ COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} ARGS ${po_file} -o ${mo_file} -f) endforeach() endforeach() - install(DIRECTORY ${CMAKE_BINARY_DIR}/resources DESTINATION ${CMAKE_INSTALL_DATADIR}/cura) + install(DIRECTORY ${CMAKE_BINARY_DIR}/resources + DESTINATION ${CMAKE_INSTALL_DATADIR}/cura) endif() endif() find_package(PythonInterp 3.4.0 REQUIRED) -install(DIRECTORY resources DESTINATION ${CMAKE_INSTALL_DATADIR}/cura) -install(DIRECTORY plugins DESTINATION lib/cura) +install(DIRECTORY resources + DESTINATION ${CMAKE_INSTALL_DATADIR}/cura) +install(DIRECTORY plugins + DESTINATION lib/cura) if(NOT APPLE AND NOT WIN32) install(FILES cura_app.py DESTINATION ${CMAKE_INSTALL_BINDIR} PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE RENAME cura) - install(DIRECTORY cura DESTINATION lib/python${PYTHON_VERSION_MAJOR}/dist-packages FILES_MATCHING PATTERN *.py) - install(FILES ${CMAKE_BINARY_DIR}/CuraVersion.py DESTINATION lib/python${PYTHON_VERSION_MAJOR}/dist-packages/cura) - install(FILES cura.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications) + install(DIRECTORY cura + DESTINATION lib/python${PYTHON_VERSION_MAJOR}/dist-packages + FILES_MATCHING PATTERN *.py) + install(FILES ${CMAKE_BINARY_DIR}/CuraVersion.py + DESTINATION lib/python${PYTHON_VERSION_MAJOR}/dist-packages/cura) + install(FILES cura.desktop + DESTINATION ${CMAKE_INSTALL_DATADIR}/applications) install(FILES cura.sharedmimeinfo DESTINATION ${CMAKE_INSTALL_DATADIR}/mime/packages/ RENAME cura.xml ) else() - install(FILES cura_app.py DESTINATION ${CMAKE_INSTALL_BINDIR} PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) - install(DIRECTORY cura DESTINATION lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages FILES_MATCHING PATTERN *.py) - install(FILES ${CMAKE_BINARY_DIR}/CuraVersion.py DESTINATION lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages/cura) + install(FILES cura_app.py + DESTINATION ${CMAKE_INSTALL_BINDIR} + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) + install(DIRECTORY cura + DESTINATION lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages + FILES_MATCHING PATTERN *.py) + install(FILES ${CMAKE_BINARY_DIR}/CuraVersion.py + DESTINATION lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages/cura) endif() include(CPackConfig.cmake) From 617f591e55eb53f89349a3af7e476b6193f2417f Mon Sep 17 00:00:00 2001 From: Thomas-Karl Pietrowski Date: Tue, 8 Mar 2016 11:08:16 +0100 Subject: [PATCH 05/42] Rename cura_app.py to cura in cura.desktop --- cura.desktop | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cura.desktop b/cura.desktop index f5fc344c1b..8e02fe6d52 100644 --- a/cura.desktop +++ b/cura.desktop @@ -5,8 +5,8 @@ Name[de]=Cura GenericName=3D Printing Software GenericName[de]=3D-Druck-Software Comment=Cura converts 3D models into paths for a 3D printer. It prepares your print for maximum accuracy, minimum printing time and good reliability with many extra features that make your print come out great. -Exec=/usr/bin/cura_app.py %F -TryExec=/usr/bin/cura_app.py +Exec=/usr/bin/cura %F +TryExec=/usr/bin/cura Icon=/usr/share/cura/resources/images/cura-icon.png Terminal=false Type=Application From 3df0b4de66dd60a68e9d2ac65c4a26d26f07127e Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 8 Mar 2016 16:59:16 +0100 Subject: [PATCH 06/42] Fixed removable drive for OSX --- plugins/RemovableDriveOutputDevice/OSXRemovableDrivePlugin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/RemovableDriveOutputDevice/OSXRemovableDrivePlugin.py b/plugins/RemovableDriveOutputDevice/OSXRemovableDrivePlugin.py index e02e0d65b6..9de78a36d1 100644 --- a/plugins/RemovableDriveOutputDevice/OSXRemovableDrivePlugin.py +++ b/plugins/RemovableDriveOutputDevice/OSXRemovableDrivePlugin.py @@ -44,7 +44,7 @@ class OSXRemovableDrivePlugin(RemovableDrivePlugin.RemovableDrivePlugin): return drives def performEjectDevice(self, device): - p = subprocess.Popen(["diskutil", "eject", path], stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + p = subprocess.Popen(["diskutil", "eject", device.getId()], stdin = subprocess.PIPE, stdout = subprocess.PIPE, stderr = subprocess.PIPE) output = p.communicate() return_code = p.wait() From 733215ef3ea71344f9099e48c3e0242ffded00c7 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 9 Mar 2016 10:11:42 +0100 Subject: [PATCH 07/42] Selection is no longer ignored by push free Fixes CURA-1086 --- cura/PlatformPhysics.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/cura/PlatformPhysics.py b/cura/PlatformPhysics.py index df841bd71d..95951f78dd 100644 --- a/cura/PlatformPhysics.py +++ b/cura/PlatformPhysics.py @@ -92,9 +92,7 @@ class PlatformPhysics: job = ConvexHullJob.ConvexHullJob(node) job.start() node.callDecoration("setConvexHullJob", job) - - elif Selection.isSelected(node): - pass + elif Preferences.getInstance().getValue("physics/automatic_push_free"): # Check for collisions between convex hulls for other_node in BreadthFirstIterator(root): From 9731d189be887588f5ec16dcfd0b4b76c77bcc00 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 9 Mar 2016 14:53:10 +0100 Subject: [PATCH 08/42] UM2Go and UMO now have brim as default platform adhesion CURA-1068 --- resources/machines/ultimaker2_go.json | 3 +++ resources/machines/ultimaker_original.json | 3 +++ 2 files changed, 6 insertions(+) diff --git a/resources/machines/ultimaker2_go.json b/resources/machines/ultimaker2_go.json index 5c70be6fd7..04eb502ad8 100644 --- a/resources/machines/ultimaker2_go.json +++ b/resources/machines/ultimaker2_go.json @@ -22,5 +22,8 @@ [[ 60.0, -60.0], [ 33.0, -60.0], [ 35.0, -52.0], [ 60.0, -52.0]] ]}, "machine_platform_offset": { "default": [0.0, 0.0, 0.0] } + }, + "overrides": { + "adhesion_type":{"default": "brim"} } } diff --git a/resources/machines/ultimaker_original.json b/resources/machines/ultimaker_original.json index b7b6055c5f..9fdf7ef9c5 100644 --- a/resources/machines/ultimaker_original.json +++ b/resources/machines/ultimaker_original.json @@ -79,5 +79,8 @@ }, "machine_extruder_drive_upgrade": { "default": false } + }, + "overrides": { + "adhesion_type":{"default": "brim"} } } From 09612f49c8440d120f42260647e6e409f3aba07a Mon Sep 17 00:00:00 2001 From: Thomas-Karl Pietrowski Date: Wed, 9 Mar 2016 15:30:27 +0100 Subject: [PATCH 09/42] =?UTF-8?q?i18n:=20de:=20Correcting=20tooltip=20Just?= =?UTF-8?q?=20found=20another=20translation=20error.=20This=20commit=20cor?= =?UTF-8?q?rects=20"Bereit=20zum=20=C3=9Cber=20USB=20drucken"=20into=20"Be?= =?UTF-8?q?reit=20zum=20Drucken=20=C3=BCber=20USB".=20It=20is=20almost=20r?= =?UTF-8?q?elated=20to=20another=20set=20of=20corrections=20I=20sent=20bef?= =?UTF-8?q?ore,=20but=20didn't=20found=20this=20one=20as=20I=20didn't=20ha?= =?UTF-8?q?d=20my=20printer=20connected.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/i18n/de/cura.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/i18n/de/cura.po b/resources/i18n/de/cura.po index 054d2e44b0..35e5569831 100644 --- a/resources/i18n/de/cura.po +++ b/resources/i18n/de/cura.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: Cura 2.1\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-01-18 11:54+0100\n" -"PO-Revision-Date: 2016-02-07 16:01+0100\n" +"PO-Revision-Date: 2016-03-09 15:28+0100\n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Last-Translator: Thomas Karl Pietrowski \n" "Language-Team: \n" -"X-Generator: Poedit 1.8.4\n" +"X-Generator: Poedit 1.8.7.1\n" #: /home/tamara/2.1/Cura/cura/CrashHandler.py:26 msgctxt "@title:window" @@ -249,7 +249,7 @@ msgstr "Über USB drucken" #: /home/tamara/2.1/Cura/plugins/USBPrinting/PrinterConnection.py:37 msgctxt "@info:tooltip" msgid "Print with USB" -msgstr "Über USB drucken" +msgstr "Drucken über USB" #: /home/tamara/2.1/Cura/plugins/USBPrinting/__init__.py:13 msgctxt "@label" From a91147120621aeb3e346205bb1a0686d97f83ed6 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Tue, 8 Mar 2016 17:45:00 +0100 Subject: [PATCH 10/42] Add weights to standard profiles for sorting Contributes to CURA-1059 Conflicts: resources/profiles/ultimaker2+/abs_0.25_high.curaprofile resources/profiles/ultimaker2+/abs_0.8_fast.curaprofile resources/profiles/ultimaker2+/cpe_0.25_high.curaprofile resources/profiles/ultimaker2+/cpe_0.8_fast.curaprofile resources/profiles/ultimaker2+/pla_0.25_high.curaprofile resources/profiles/ultimaker2+/pla_0.8_fast.curaprofile --- resources/profiles/general/High+Quality.cfg | 1 + resources/profiles/general/Low+Quality.cfg | 1 + resources/profiles/general/Normal+Quality.cfg | 1 + resources/profiles/general/Ulti+Quality.cfg | 1 + resources/profiles/ultimaker2+/abs_0.25_normal.curaprofile | 1 + resources/profiles/ultimaker2+/abs_0.4_fast.curaprofile | 1 + resources/profiles/ultimaker2+/abs_0.4_high.curaprofile | 3 ++- resources/profiles/ultimaker2+/abs_0.4_normal.curaprofile | 1 + resources/profiles/ultimaker2+/abs_0.6_normal.curaprofile | 1 + resources/profiles/ultimaker2+/abs_0.8_normal.curaprofile | 1 + resources/profiles/ultimaker2+/cpe_0.25_normal.curaprofile | 1 + resources/profiles/ultimaker2+/cpe_0.4_fast.curaprofile | 1 + resources/profiles/ultimaker2+/cpe_0.4_high.curaprofile | 1 + resources/profiles/ultimaker2+/cpe_0.4_normal.curaprofile | 1 + resources/profiles/ultimaker2+/cpe_0.6_normal.curaprofile | 1 + resources/profiles/ultimaker2+/cpe_0.8_normal.curaprofile | 1 + resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile | 1 + resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile | 1 + resources/profiles/ultimaker2+/pla_0.4_high.curaprofile | 1 + resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile | 1 + resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile | 1 + resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile | 1 + resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile | 1 + resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile | 1 + resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile | 1 + resources/profiles/ultimaker2_olsson/0.4_high.curaprofile | 1 + resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile | 1 + resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile | 1 + resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile | 1 + resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile | 1 + 30 files changed, 31 insertions(+), 1 deletion(-) diff --git a/resources/profiles/general/High+Quality.cfg b/resources/profiles/general/High+Quality.cfg index 8437ae5b2a..d3545b04cf 100644 --- a/resources/profiles/general/High+Quality.cfg +++ b/resources/profiles/general/High+Quality.cfg @@ -1,6 +1,7 @@ [general] version = 1 name = High Quality +weight = -3 [settings] layer_height = 0.06 diff --git a/resources/profiles/general/Low+Quality.cfg b/resources/profiles/general/Low+Quality.cfg index a0ca2e3047..96c1778826 100644 --- a/resources/profiles/general/Low+Quality.cfg +++ b/resources/profiles/general/Low+Quality.cfg @@ -1,6 +1,7 @@ [general] version = 1 name = Low Quality +weight = -1 [settings] infill_sparse_density = 10 diff --git a/resources/profiles/general/Normal+Quality.cfg b/resources/profiles/general/Normal+Quality.cfg index eff525ef79..695eb77b91 100644 --- a/resources/profiles/general/Normal+Quality.cfg +++ b/resources/profiles/general/Normal+Quality.cfg @@ -1,6 +1,7 @@ [general] version = 1 name = Normal Quality +weight = -2 [settings] speed_wall_0 = 30 diff --git a/resources/profiles/general/Ulti+Quality.cfg b/resources/profiles/general/Ulti+Quality.cfg index 2cf02f106a..d0c17514c6 100644 --- a/resources/profiles/general/Ulti+Quality.cfg +++ b/resources/profiles/general/Ulti+Quality.cfg @@ -1,6 +1,7 @@ [general] version = 1 name = Ulti Quality +weight = -4 [settings] layer_height = 0.04 diff --git a/resources/profiles/ultimaker2+/abs_0.25_normal.curaprofile b/resources/profiles/ultimaker2+/abs_0.25_normal.curaprofile index dad488661a..fb88afba46 100644 --- a/resources/profiles/ultimaker2+/abs_0.25_normal.curaprofile +++ b/resources/profiles/ultimaker2+/abs_0.25_normal.curaprofile @@ -4,6 +4,7 @@ name = Normal Quality machine_type = ultimaker2plus machine_variant = 0.25 mm material = ABS +weight = -2 [settings] layer_height = 0.06 diff --git a/resources/profiles/ultimaker2+/abs_0.4_fast.curaprofile b/resources/profiles/ultimaker2+/abs_0.4_fast.curaprofile index a0098014ff..eff6f48705 100644 --- a/resources/profiles/ultimaker2+/abs_0.4_fast.curaprofile +++ b/resources/profiles/ultimaker2+/abs_0.4_fast.curaprofile @@ -4,6 +4,7 @@ name = Fast Print machine_type = ultimaker2plus machine_variant = 0.4 mm material = ABS +weight = -1 [settings] layer_height = 0.15 diff --git a/resources/profiles/ultimaker2+/abs_0.4_high.curaprofile b/resources/profiles/ultimaker2+/abs_0.4_high.curaprofile index 4fb2b49fe3..a83c61928c 100644 --- a/resources/profiles/ultimaker2+/abs_0.4_high.curaprofile +++ b/resources/profiles/ultimaker2+/abs_0.4_high.curaprofile @@ -4,6 +4,7 @@ name = High Quality machine_type = ultimaker2plus machine_variant = 0.4 mm material = ABS +weight = -3 [settings] layer_height = 0.06 @@ -18,7 +19,7 @@ adhesion_type = brim cool_min_speed = 20 line_width = 0.35 infill_sparse_density = 22 -machine_nozzle_size = 0.35 +machine_nozzle_size = 0.35 speed_wall_0 = 20 cool_min_layer_time = 3 cool_lift_head = True diff --git a/resources/profiles/ultimaker2+/abs_0.4_normal.curaprofile b/resources/profiles/ultimaker2+/abs_0.4_normal.curaprofile index a8d63d07db..e77daeb6da 100644 --- a/resources/profiles/ultimaker2+/abs_0.4_normal.curaprofile +++ b/resources/profiles/ultimaker2+/abs_0.4_normal.curaprofile @@ -4,6 +4,7 @@ name = Normal Quality machine_type = ultimaker2plus machine_variant = 0.4 mm material = ABS +weight = -2 [settings] layer_height_0 = 0.26 diff --git a/resources/profiles/ultimaker2+/abs_0.6_normal.curaprofile b/resources/profiles/ultimaker2+/abs_0.6_normal.curaprofile index a0aa77129b..4bbfb50bf7 100644 --- a/resources/profiles/ultimaker2+/abs_0.6_normal.curaprofile +++ b/resources/profiles/ultimaker2+/abs_0.6_normal.curaprofile @@ -4,6 +4,7 @@ name = Normal Quality machine_type = ultimaker2plus machine_variant = 0.6 mm material = ABS +weight = -2 [settings] layer_height = 0.15 diff --git a/resources/profiles/ultimaker2+/abs_0.8_normal.curaprofile b/resources/profiles/ultimaker2+/abs_0.8_normal.curaprofile index 94e08a790c..96d4079462 100644 --- a/resources/profiles/ultimaker2+/abs_0.8_normal.curaprofile +++ b/resources/profiles/ultimaker2+/abs_0.8_normal.curaprofile @@ -4,6 +4,7 @@ name = Normal Quality machine_type = ultimaker2plus machine_variant = 0.8 mm material = ABS +weight = -2 [settings] layer_height = 0.2 diff --git a/resources/profiles/ultimaker2+/cpe_0.25_normal.curaprofile b/resources/profiles/ultimaker2+/cpe_0.25_normal.curaprofile index f5f5e24d61..14c29ae70c 100644 --- a/resources/profiles/ultimaker2+/cpe_0.25_normal.curaprofile +++ b/resources/profiles/ultimaker2+/cpe_0.25_normal.curaprofile @@ -4,6 +4,7 @@ name = Normal Quality machine_type = ultimaker2plus machine_variant = 0.25 mm material = CPE +weight = -2 [settings] infill_overlap = 17 diff --git a/resources/profiles/ultimaker2+/cpe_0.4_fast.curaprofile b/resources/profiles/ultimaker2+/cpe_0.4_fast.curaprofile index 7880c2584c..53243a7e4f 100644 --- a/resources/profiles/ultimaker2+/cpe_0.4_fast.curaprofile +++ b/resources/profiles/ultimaker2+/cpe_0.4_fast.curaprofile @@ -4,6 +4,7 @@ name = Fast Print machine_type = ultimaker2plus machine_variant = 0.4 mm material = CPE +weight = -1 [settings] infill_overlap = 17 diff --git a/resources/profiles/ultimaker2+/cpe_0.4_high.curaprofile b/resources/profiles/ultimaker2+/cpe_0.4_high.curaprofile index d4aad942ca..a809c4d81e 100644 --- a/resources/profiles/ultimaker2+/cpe_0.4_high.curaprofile +++ b/resources/profiles/ultimaker2+/cpe_0.4_high.curaprofile @@ -4,6 +4,7 @@ name = High Quality machine_type = ultimaker2plus machine_variant = 0.4 mm material = CPE +weight = -3 [settings] layer_height = 0.06 diff --git a/resources/profiles/ultimaker2+/cpe_0.4_normal.curaprofile b/resources/profiles/ultimaker2+/cpe_0.4_normal.curaprofile index ae721733e5..ed51c2cb38 100644 --- a/resources/profiles/ultimaker2+/cpe_0.4_normal.curaprofile +++ b/resources/profiles/ultimaker2+/cpe_0.4_normal.curaprofile @@ -4,6 +4,7 @@ name = Normal Quality machine_type = ultimaker2plus machine_variant = 0.4 mm material = CPE +weight = -2 [settings] layer_height_0 = 0.26 diff --git a/resources/profiles/ultimaker2+/cpe_0.6_normal.curaprofile b/resources/profiles/ultimaker2+/cpe_0.6_normal.curaprofile index 56738c556f..54114888e8 100644 --- a/resources/profiles/ultimaker2+/cpe_0.6_normal.curaprofile +++ b/resources/profiles/ultimaker2+/cpe_0.6_normal.curaprofile @@ -4,6 +4,7 @@ name = Normal Quality machine_type = ultimaker2plus machine_variant = 0.6 mm material = CPE +weight = -2 [settings] infill_overlap = 17 diff --git a/resources/profiles/ultimaker2+/cpe_0.8_normal.curaprofile b/resources/profiles/ultimaker2+/cpe_0.8_normal.curaprofile index 054c5dbe88..d04620e834 100644 --- a/resources/profiles/ultimaker2+/cpe_0.8_normal.curaprofile +++ b/resources/profiles/ultimaker2+/cpe_0.8_normal.curaprofile @@ -4,6 +4,7 @@ name = Normal Quality machine_type = ultimaker2plus machine_variant = 0.8 mm material = CPE +weight = -2 [settings] infill_overlap = 17 diff --git a/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile index da48907c11..25973e4549 100644 --- a/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile @@ -4,6 +4,7 @@ name = Normal Quality machine_type = ultimaker2plus machine_variant = 0.25 mm material = PLA +weight = -2 [settings] machine_nozzle_size = 0.22 diff --git a/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile index 43bc715372..0c47c7cafc 100644 --- a/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile @@ -4,6 +4,7 @@ name = Fast Print machine_type = ultimaker2plus machine_variant = 0.4 mm material = PLA +weight = -1 [settings] machine_nozzle_size = 0.35 diff --git a/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile index d97fba3de9..bd78138a9e 100644 --- a/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile @@ -4,6 +4,7 @@ name = High Quality machine_type = ultimaker2plus machine_variant = 0.4 mm material = PLA +weight = -3 [settings] machine_nozzle_size = 0.35 diff --git a/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile index 6f46ec4c7a..4fb58e0a59 100644 --- a/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile @@ -4,6 +4,7 @@ name = Normal Quality machine_type = ultimaker2plus machine_variant = 0.4 mm material = PLA +weight = -2 [settings] machine_nozzle_size = 0.35 diff --git a/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile index b342b8cde4..4f7971700f 100644 --- a/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile @@ -4,6 +4,7 @@ name = Ulti Quality machine_type = ultimaker2plus machine_variant = 0.4 mm material = PLA +weight = -4 [settings] machine_nozzle_size = 0.35 diff --git a/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile index 0a4d760a61..30f9b16f64 100644 --- a/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile @@ -4,6 +4,7 @@ name = Normal Quality machine_type = ultimaker2plus machine_variant = 0.6 mm material = PLA +weight = -2 [settings] machine_nozzle_size = 0.53 diff --git a/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile index b8d88fabfc..e19e59f131 100644 --- a/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile @@ -4,6 +4,7 @@ name = Normal Quality machine_type = ultimaker2plus machine_variant = 0.8 mm material = PLA +weight = -2 [settings] machine_nozzle_size = 0.7 diff --git a/resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile b/resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile index 11f354a043..3c19b261b7 100644 --- a/resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile @@ -3,6 +3,7 @@ version = 1 name = Normal Quality machine_type = ultimaker2_olsson machine_variant = 0.25 mm +weight = -2 [settings] machine_nozzle_size = 0.22 diff --git a/resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile b/resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile index 2c4a2b2146..ec614d4d3b 100644 --- a/resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile @@ -3,6 +3,7 @@ version = 1 name = Fast Print machine_type = ultimaker2_olsson machine_variant = 0.4 mm +weight = -1 [settings] machine_nozzle_size = 0.35 diff --git a/resources/profiles/ultimaker2_olsson/0.4_high.curaprofile b/resources/profiles/ultimaker2_olsson/0.4_high.curaprofile index 3c3d8325c9..de9266774c 100644 --- a/resources/profiles/ultimaker2_olsson/0.4_high.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.4_high.curaprofile @@ -3,6 +3,7 @@ version = 1 name = High Quality machine_type = ultimaker2_olsson machine_variant = 0.4 mm +weight = -3 [settings] machine_nozzle_size = 0.35 diff --git a/resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile b/resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile index 53a716b0ff..f7420409f8 100644 --- a/resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile @@ -3,6 +3,7 @@ version = 1 name = Normal Quality machine_type = ultimaker2_olsson machine_variant = 0.4 mm +weight = -2 [settings] machine_nozzle_size = 0.35 diff --git a/resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile b/resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile index c51d49b80d..8ea28cc303 100644 --- a/resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile @@ -3,6 +3,7 @@ version = 1 name = Ulti Quality machine_type = ultimaker2_olsson machine_variant = 0.4 mm +weight = -4 [settings] machine_nozzle_size = 0.35 diff --git a/resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile b/resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile index 055ebd13fe..b9331438ea 100644 --- a/resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile @@ -3,6 +3,7 @@ version = 1 name = Normal Quality machine_type = ultimaker2_olsson machine_variant = 0.6 mm +weight = -2 [settings] machine_nozzle_size = 0.53 diff --git a/resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile b/resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile index d346d3105b..0fe5296135 100644 --- a/resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile @@ -3,6 +3,7 @@ version = 1 name = Normal Quality machine_type = ultimaker2_olsson machine_variant = 0.8 mm +weight = -2 [settings] machine_nozzle_size = 0.7 From ffbc3e8da3af578dfe1647b9b2827896e82121a5 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 9 Mar 2016 16:09:12 +0100 Subject: [PATCH 11/42] Added min size to printjob name CURA-1107 --- resources/qml/JobSpecs.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/qml/JobSpecs.qml b/resources/qml/JobSpecs.qml index 041ad160e2..1670e9f9d1 100644 --- a/resources/qml/JobSpecs.qml +++ b/resources/qml/JobSpecs.qml @@ -124,7 +124,7 @@ Rectangle { anchors.right: printJobPencilIcon.left anchors.rightMargin: UM.Theme.getSize("default_margin").width/2 height: UM.Theme.getSize("jobspecs_line").height - width: __contentWidth + UM.Theme.getSize("default_margin").width + width: Math.max(__contentWidth + UM.Theme.getSize("default_margin").width, 50) maximumLength: 120 property int unremovableSpacing: 5 text: '' From e8c99f6b9f21ba90c6d72a0a08641c9e1348aeab Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 9 Mar 2016 17:12:53 +0100 Subject: [PATCH 12/42] Increased readability CURA-1087 --- resources/qml/JobSpecs.qml | 6 +++--- resources/themes/cura/theme.json | 8 +++++++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/resources/qml/JobSpecs.qml b/resources/qml/JobSpecs.qml index 1670e9f9d1..7f8dc119ea 100644 --- a/resources/qml/JobSpecs.qml +++ b/resources/qml/JobSpecs.qml @@ -161,7 +161,7 @@ Rectangle { anchors.right: parent.right height: UM.Theme.getSize("jobspecs_line").height verticalAlignment: Text.AlignVCenter - font: UM.Theme.getFont("small") + font: UM.Theme.getFont("small_bold") color: UM.Theme.getColor("text_subtext") text: Printer.getSceneBoundingBoxString } @@ -193,7 +193,7 @@ Rectangle { anchors.right: lengthIcon.left anchors.rightMargin: UM.Theme.getSize("default_margin").width anchors.verticalCenter: parent.verticalCenter - font: UM.Theme.getFont("small") + font: UM.Theme.getFont("small_bold") color: UM.Theme.getColor("text_subtext") text: (!base.printDuration || !base.printDuration.valid) ? catalog.i18nc("@label", "00h 00min") : base.printDuration.getDisplayString(UM.DurationFormat.Short) } @@ -213,7 +213,7 @@ Rectangle { id: lengthSpec anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter - font: UM.Theme.getFont("small") + font: UM.Theme.getFont("small_bold") color: UM.Theme.getColor("text_subtext") text: base.printMaterialAmount <= 0 ? catalog.i18nc("@label", "0.0 m") : catalog.i18nc("@label", "%1 m").arg(base.printMaterialAmount) } diff --git a/resources/themes/cura/theme.json b/resources/themes/cura/theme.json index 1332aedca0..ca8390179c 100644 --- a/resources/themes/cura/theme.json +++ b/resources/themes/cura/theme.json @@ -18,6 +18,12 @@ "size": 1.0, "family": "Open Sans" }, + "small_bold": + { + "size": 1.0, + "family": "Open Sans", + "bold": true + }, "very_small": { "size": 0.75, "family": "Open Sans" @@ -67,7 +73,7 @@ "text_hover": [70, 84, 113, 255], "text_pressed": [12, 169, 227, 255], "text_white": [255, 255, 255, 255], - "text_subtext": [127, 127, 127, 255], + "text_subtext": [100, 100, 100, 255], "error": [255, 140, 0, 255], "sidebar_header_bar": [24, 41, 77, 255], From 3690eafb721bd722ecb462d6afc6bda748c04fe4 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 10 Mar 2016 10:46:18 +0100 Subject: [PATCH 13/42] Add filter_by_machine parameter to USBPrinting This was an oversight. When the filter_by_machine feature was added, we didn't think of the USB printing output device. The feature has no meaning here, since USB printing only supports g-code. Just ignore it. --- plugins/USBPrinting/PrinterConnection.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/USBPrinting/PrinterConnection.py b/plugins/USBPrinting/PrinterConnection.py index c19603c945..ffcd6d0d75 100644 --- a/plugins/USBPrinting/PrinterConnection.py +++ b/plugins/USBPrinting/PrinterConnection.py @@ -467,7 +467,7 @@ class PrinterConnection(OutputDevice, QObject, SignalEmitter): self._bed_temperature = temperature self.bedTemperatureChanged.emit() - def requestWrite(self, node, file_name = None): + def requestWrite(self, node, file_name = None, filter_by_machine = False): self.showControlInterface() def _setEndstopState(self, endstop_key, value): From 3a377a616b834c2bea21ac5f09ee7b683c9d7c69 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Thu, 10 Mar 2016 12:08:06 +0100 Subject: [PATCH 14/42] profiles: machine_nozzle_size ==> line_width (CURA-1097) --- resources/profiles/ultimaker2+/abs_0.25_normal.curaprofile | 1 - resources/profiles/ultimaker2+/abs_0.4_fast.curaprofile | 1 - resources/profiles/ultimaker2+/abs_0.4_high.curaprofile | 1 - resources/profiles/ultimaker2+/abs_0.4_normal.curaprofile | 1 - resources/profiles/ultimaker2+/abs_0.6_normal.curaprofile | 1 - resources/profiles/ultimaker2+/abs_0.8_normal.curaprofile | 1 - resources/profiles/ultimaker2+/cpe_0.25_normal.curaprofile | 1 - resources/profiles/ultimaker2+/cpe_0.4_fast.curaprofile | 1 - resources/profiles/ultimaker2+/cpe_0.4_high.curaprofile | 1 - resources/profiles/ultimaker2+/cpe_0.4_normal.curaprofile | 1 - resources/profiles/ultimaker2+/cpe_0.6_normal.curaprofile | 1 - resources/profiles/ultimaker2+/cpe_0.8_normal.curaprofile | 1 - resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile | 2 +- resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile | 2 +- resources/profiles/ultimaker2+/pla_0.4_high.curaprofile | 2 +- resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile | 2 +- resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile | 2 +- resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile | 2 +- resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile | 2 +- resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile | 2 +- resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile | 2 +- resources/profiles/ultimaker2_olsson/0.4_high.curaprofile | 2 +- resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile | 2 +- resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile | 2 +- resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile | 2 +- resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile | 2 +- 26 files changed, 14 insertions(+), 26 deletions(-) diff --git a/resources/profiles/ultimaker2+/abs_0.25_normal.curaprofile b/resources/profiles/ultimaker2+/abs_0.25_normal.curaprofile index fb88afba46..f866a78955 100644 --- a/resources/profiles/ultimaker2+/abs_0.25_normal.curaprofile +++ b/resources/profiles/ultimaker2+/abs_0.25_normal.curaprofile @@ -19,7 +19,6 @@ speed_print = 20 cool_min_speed = 25 line_width = 0.22 infill_sparse_density = 22 -machine_nozzle_size = 0.22 speed_wall_0 = 20 cool_min_layer_time = 2 cool_lift_head = True diff --git a/resources/profiles/ultimaker2+/abs_0.4_fast.curaprofile b/resources/profiles/ultimaker2+/abs_0.4_fast.curaprofile index eff6f48705..63c6986b1e 100644 --- a/resources/profiles/ultimaker2+/abs_0.4_fast.curaprofile +++ b/resources/profiles/ultimaker2+/abs_0.4_fast.curaprofile @@ -19,7 +19,6 @@ cool_min_layer_time = 3 cool_min_speed = 20 line_width = 0.35 infill_sparse_density = 18 -machine_nozzle_size = 0.35 speed_travel = 150 speed_wall_0 = 30 adhesion_type = brim diff --git a/resources/profiles/ultimaker2+/abs_0.4_high.curaprofile b/resources/profiles/ultimaker2+/abs_0.4_high.curaprofile index a83c61928c..1702f31bae 100644 --- a/resources/profiles/ultimaker2+/abs_0.4_high.curaprofile +++ b/resources/profiles/ultimaker2+/abs_0.4_high.curaprofile @@ -19,7 +19,6 @@ adhesion_type = brim cool_min_speed = 20 line_width = 0.35 infill_sparse_density = 22 -machine_nozzle_size = 0.35 speed_wall_0 = 20 cool_min_layer_time = 3 cool_lift_head = True diff --git a/resources/profiles/ultimaker2+/abs_0.4_normal.curaprofile b/resources/profiles/ultimaker2+/abs_0.4_normal.curaprofile index e77daeb6da..fbe21d3d03 100644 --- a/resources/profiles/ultimaker2+/abs_0.4_normal.curaprofile +++ b/resources/profiles/ultimaker2+/abs_0.4_normal.curaprofile @@ -16,7 +16,6 @@ speed_topbottom = 20 cool_min_layer_time = 3 cool_min_speed = 20 line_width = 0.35 -machine_nozzle_size = 0.35 speed_wall_0 = 20 adhesion_type = brim cool_lift_head = True diff --git a/resources/profiles/ultimaker2+/abs_0.6_normal.curaprofile b/resources/profiles/ultimaker2+/abs_0.6_normal.curaprofile index 4bbfb50bf7..577c9fa2cd 100644 --- a/resources/profiles/ultimaker2+/abs_0.6_normal.curaprofile +++ b/resources/profiles/ultimaker2+/abs_0.6_normal.curaprofile @@ -18,7 +18,6 @@ speed_topbottom = 20 adhesion_type = brim cool_min_speed = 20 line_width = 0.53 -machine_nozzle_size = 0.53 speed_wall_0 = 20 cool_min_layer_time = 3 cool_lift_head = True diff --git a/resources/profiles/ultimaker2+/abs_0.8_normal.curaprofile b/resources/profiles/ultimaker2+/abs_0.8_normal.curaprofile index 96d4079462..c080959bac 100644 --- a/resources/profiles/ultimaker2+/abs_0.8_normal.curaprofile +++ b/resources/profiles/ultimaker2+/abs_0.8_normal.curaprofile @@ -18,7 +18,6 @@ speed_topbottom = 20 adhesion_type = brim cool_min_speed = 15 line_width = 0.7 -machine_nozzle_size = 0.7 speed_wall_0 = 20 cool_min_layer_time = 3 cool_lift_head = True diff --git a/resources/profiles/ultimaker2+/cpe_0.25_normal.curaprofile b/resources/profiles/ultimaker2+/cpe_0.25_normal.curaprofile index 14c29ae70c..caa93fd12d 100644 --- a/resources/profiles/ultimaker2+/cpe_0.25_normal.curaprofile +++ b/resources/profiles/ultimaker2+/cpe_0.25_normal.curaprofile @@ -19,7 +19,6 @@ cool_min_layer_time = 2 speed_print = 20 line_width = 0.22 infill_sparse_density = 22 -machine_nozzle_size = 0.22 speed_wall_0 = 20 adhesion_type = brim cool_lift_head = True diff --git a/resources/profiles/ultimaker2+/cpe_0.4_fast.curaprofile b/resources/profiles/ultimaker2+/cpe_0.4_fast.curaprofile index 53243a7e4f..3888f94f2d 100644 --- a/resources/profiles/ultimaker2+/cpe_0.4_fast.curaprofile +++ b/resources/profiles/ultimaker2+/cpe_0.4_fast.curaprofile @@ -20,7 +20,6 @@ speed_topbottom = 20 speed_travel = 150 line_width = 0.35 infill_sparse_density = 18 -machine_nozzle_size = 0.35 speed_wall_0 = 30 adhesion_type = brim cool_lift_head = True diff --git a/resources/profiles/ultimaker2+/cpe_0.4_high.curaprofile b/resources/profiles/ultimaker2+/cpe_0.4_high.curaprofile index a809c4d81e..b198012a62 100644 --- a/resources/profiles/ultimaker2+/cpe_0.4_high.curaprofile +++ b/resources/profiles/ultimaker2+/cpe_0.4_high.curaprofile @@ -18,7 +18,6 @@ speed_topbottom = 20 adhesion_type = brim line_width = 0.35 infill_sparse_density = 22 -machine_nozzle_size = 0.35 speed_wall_0 = 20 cool_min_layer_time = 3 cool_lift_head = True diff --git a/resources/profiles/ultimaker2+/cpe_0.4_normal.curaprofile b/resources/profiles/ultimaker2+/cpe_0.4_normal.curaprofile index ed51c2cb38..d220adde83 100644 --- a/resources/profiles/ultimaker2+/cpe_0.4_normal.curaprofile +++ b/resources/profiles/ultimaker2+/cpe_0.4_normal.curaprofile @@ -15,7 +15,6 @@ speed_infill = 45 speed_topbottom = 20 cool_min_layer_time = 3 line_width = 0.35 -machine_nozzle_size = 0.35 speed_wall_0 = 20 adhesion_type = brim cool_lift_head = True diff --git a/resources/profiles/ultimaker2+/cpe_0.6_normal.curaprofile b/resources/profiles/ultimaker2+/cpe_0.6_normal.curaprofile index 54114888e8..bb395b3715 100644 --- a/resources/profiles/ultimaker2+/cpe_0.6_normal.curaprofile +++ b/resources/profiles/ultimaker2+/cpe_0.6_normal.curaprofile @@ -18,7 +18,6 @@ speed_topbottom = 20 cool_min_layer_time = 3 speed_print = 20 line_width = 0.53 -machine_nozzle_size = 0.53 speed_wall_0 = 20 adhesion_type = brim cool_lift_head = True diff --git a/resources/profiles/ultimaker2+/cpe_0.8_normal.curaprofile b/resources/profiles/ultimaker2+/cpe_0.8_normal.curaprofile index d04620e834..583b2a65b9 100644 --- a/resources/profiles/ultimaker2+/cpe_0.8_normal.curaprofile +++ b/resources/profiles/ultimaker2+/cpe_0.8_normal.curaprofile @@ -18,7 +18,6 @@ speed_topbottom = 20 cool_min_layer_time = 3 speed_print = 20 line_width = 0.7 -machine_nozzle_size = 0.7 speed_wall_0 = 20 adhesion_type = brim cool_lift_head = True diff --git a/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile index 25973e4549..cd8596f06b 100644 --- a/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile @@ -7,7 +7,7 @@ material = PLA weight = -2 [settings] -machine_nozzle_size = 0.22 +line_width = 0.22 layer_height = 0.06 layer_height_0 = 0.15 shell_thickness = 0.88 diff --git a/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile index 0c47c7cafc..5c150970de 100644 --- a/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile @@ -7,7 +7,7 @@ material = PLA weight = -1 [settings] -machine_nozzle_size = 0.35 +line_width = 0.35 layer_height = 0.15 layer_height_0 = 0.26 shell_thickness = 0.7 diff --git a/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile index bd78138a9e..23fa31e20c 100644 --- a/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile @@ -7,7 +7,7 @@ material = PLA weight = -3 [settings] -machine_nozzle_size = 0.35 +line_width = 0.35 layer_height = 0.06 layer_height_0 = 0.26 shell_thickness = 1.05 diff --git a/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile index 4fb58e0a59..68884bb7cb 100644 --- a/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile @@ -7,7 +7,7 @@ material = PLA weight = -2 [settings] -machine_nozzle_size = 0.35 +line_width = 0.35 layer_height = 0.1 layer_height_0 = 0.26 shell_thickness = 1.05 diff --git a/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile index 4f7971700f..74b4bc0194 100644 --- a/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile @@ -7,7 +7,7 @@ material = PLA weight = -4 [settings] -machine_nozzle_size = 0.35 +line_width = 0.35 layer_height = 0.04 layer_height_0 = 0.26 shell_thickness = 1.4 diff --git a/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile index 30f9b16f64..f8c54e36c4 100644 --- a/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile @@ -7,7 +7,7 @@ material = PLA weight = -2 [settings] -machine_nozzle_size = 0.53 +line_width = 0.53 layer_height = 0.15 layer_height_0 = 0.4 shell_thickness = 1.59 diff --git a/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile index e19e59f131..84017bc1f3 100644 --- a/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile @@ -7,7 +7,7 @@ material = PLA weight = -2 [settings] -machine_nozzle_size = 0.7 +line_width = 0.7 layer_height = 0.2 layer_height_0 = 0.5 shell_thickness = 2.1 diff --git a/resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile b/resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile index 3c19b261b7..a26b2b8ff1 100644 --- a/resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile @@ -6,7 +6,7 @@ machine_variant = 0.25 mm weight = -2 [settings] -machine_nozzle_size = 0.22 +line_width = 0.22 layer_height = 0.06 layer_height_0 = 0.15 shell_thickness = 0.88 diff --git a/resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile b/resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile index ec614d4d3b..10cbcfd81c 100644 --- a/resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile @@ -6,7 +6,7 @@ machine_variant = 0.4 mm weight = -1 [settings] -machine_nozzle_size = 0.35 +line_width = 0.35 layer_height = 0.15 layer_height_0 = 0.26 shell_thickness = 0.7 diff --git a/resources/profiles/ultimaker2_olsson/0.4_high.curaprofile b/resources/profiles/ultimaker2_olsson/0.4_high.curaprofile index de9266774c..cf9bead793 100644 --- a/resources/profiles/ultimaker2_olsson/0.4_high.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.4_high.curaprofile @@ -6,7 +6,7 @@ machine_variant = 0.4 mm weight = -3 [settings] -machine_nozzle_size = 0.35 +line_width = 0.35 layer_height = 0.06 layer_height_0 = 0.26 shell_thickness = 1.05 diff --git a/resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile b/resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile index f7420409f8..8e0d93fb6a 100644 --- a/resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile @@ -6,7 +6,7 @@ machine_variant = 0.4 mm weight = -2 [settings] -machine_nozzle_size = 0.35 +line_width = 0.35 layer_height = 0.1 layer_height_0 = 0.26 shell_thickness = 1.05 diff --git a/resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile b/resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile index 8ea28cc303..4f30644b3b 100644 --- a/resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile @@ -6,7 +6,7 @@ machine_variant = 0.4 mm weight = -4 [settings] -machine_nozzle_size = 0.35 +line_width = 0.35 layer_height = 0.04 layer_height_0 = 0.26 shell_thickness = 1.4 diff --git a/resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile b/resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile index b9331438ea..b07dcf0847 100644 --- a/resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile @@ -6,7 +6,7 @@ machine_variant = 0.6 mm weight = -2 [settings] -machine_nozzle_size = 0.53 +line_width = 0.53 layer_height = 0.15 layer_height_0 = 0.4 shell_thickness = 1.59 diff --git a/resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile b/resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile index 0fe5296135..54f7c960b5 100644 --- a/resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile @@ -6,7 +6,7 @@ machine_variant = 0.8 mm weight = -2 [settings] -machine_nozzle_size = 0.7 +line_width = 0.7 layer_height = 0.2 layer_height_0 = 0.5 shell_thickness = 2.1 From 3b6aedd58530afde89de8039d08020cc33edf1ff Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Thu, 10 Mar 2016 12:43:07 +0100 Subject: [PATCH 15/42] JSON: disabled top_bottom_thickness, shell_thickness and remove_overlapping_wall_parts_0_enabled (CURA-1099) --- resources/machines/fdmprinter.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json index da4a6cead0..ddcd2c61fc 100644 --- a/resources/machines/fdmprinter.json +++ b/resources/machines/fdmprinter.json @@ -350,6 +350,7 @@ "min_value_warning": "0.2", "max_value_warning": "5", "visible": false, + "enabled": false, "children": { "wall_thickness": { "label": "Wall Thickness", @@ -391,6 +392,7 @@ "min_value_warning": "0.6", "type": "float", "visible": true, + "enabled": false, "children": { "top_thickness": { "label": "Top Thickness", @@ -444,6 +446,7 @@ "type": "boolean", "default": false, "visible": false, + "enabled": false, "children": { "remove_overlapping_walls_0_enabled": { "label": "Remove Overlapping Outer Wall Parts", @@ -451,7 +454,8 @@ "type": "boolean", "default": false, "visible": false, - "inherit": true + "inherit": true, + "enabled": false, }, "remove_overlapping_walls_x_enabled": { "label": "Remove Overlapping Other Wall Parts", From 9f29af82b5492fb784f12f4e074151222e907b20 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 10 Mar 2016 14:07:03 +0100 Subject: [PATCH 16/42] Fixed issues caused by 3b6aedd58530afde89de8039d08020cc33edf1ff --- resources/machines/fdmprinter.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json index ddcd2c61fc..bfb5554dc9 100644 --- a/resources/machines/fdmprinter.json +++ b/resources/machines/fdmprinter.json @@ -350,7 +350,7 @@ "min_value_warning": "0.2", "max_value_warning": "5", "visible": false, - "enabled": false, + "enabled": "False", "children": { "wall_thickness": { "label": "Wall Thickness", @@ -392,7 +392,7 @@ "min_value_warning": "0.6", "type": "float", "visible": true, - "enabled": false, + "enabled": "False", "children": { "top_thickness": { "label": "Top Thickness", @@ -446,7 +446,7 @@ "type": "boolean", "default": false, "visible": false, - "enabled": false, + "enabled": "False", "children": { "remove_overlapping_walls_0_enabled": { "label": "Remove Overlapping Outer Wall Parts", @@ -455,7 +455,7 @@ "default": false, "visible": false, "inherit": true, - "enabled": false, + "enabled": "False" }, "remove_overlapping_walls_x_enabled": { "label": "Remove Overlapping Other Wall Parts", From a3eb212d685fe7fc3298aeb07bcc9eaabeb7ac86 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 10 Mar 2016 15:09:15 +0100 Subject: [PATCH 17/42] Platform adhesion is now handled by inherit function Based on suggestion by ghostkeeper CURA-1068 --- resources/machines/fdmprinter.json | 1 + resources/machines/ultimaker2_go.json | 3 --- resources/machines/ultimaker_original.json | 3 --- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json index bfb5554dc9..06f57a05a2 100644 --- a/resources/machines/fdmprinter.json +++ b/resources/machines/fdmprinter.json @@ -1554,6 +1554,7 @@ "raft": "Raft" }, "default": "skirt", + "inherit_function": "\"skirt\" if machine_heated_bed else \"brim\"", "global_only": "True" }, "skirt_line_count": { diff --git a/resources/machines/ultimaker2_go.json b/resources/machines/ultimaker2_go.json index 04eb502ad8..5c70be6fd7 100644 --- a/resources/machines/ultimaker2_go.json +++ b/resources/machines/ultimaker2_go.json @@ -22,8 +22,5 @@ [[ 60.0, -60.0], [ 33.0, -60.0], [ 35.0, -52.0], [ 60.0, -52.0]] ]}, "machine_platform_offset": { "default": [0.0, 0.0, 0.0] } - }, - "overrides": { - "adhesion_type":{"default": "brim"} } } diff --git a/resources/machines/ultimaker_original.json b/resources/machines/ultimaker_original.json index 9fdf7ef9c5..b7b6055c5f 100644 --- a/resources/machines/ultimaker_original.json +++ b/resources/machines/ultimaker_original.json @@ -79,8 +79,5 @@ }, "machine_extruder_drive_upgrade": { "default": false } - }, - "overrides": { - "adhesion_type":{"default": "brim"} } } From e56347501d0a61d52bfe632fbf4453d9ab083d1c Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Thu, 10 Mar 2016 17:13:07 +0100 Subject: [PATCH 18/42] Make setting category headers bold Special request from Martijn --- resources/themes/cura/theme.json | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/themes/cura/theme.json b/resources/themes/cura/theme.json index ca8390179c..31b6fb0f97 100644 --- a/resources/themes/cura/theme.json +++ b/resources/themes/cura/theme.json @@ -49,6 +49,7 @@ }, "setting_category": { "size": 1.15, + "bold": true, "family": "Open Sans" }, "action_button": { From 5fbf4f336e3606f213a03dd77230ec55bed62faf Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 11 Mar 2016 11:54:31 +0100 Subject: [PATCH 19/42] Removed profile settings that already were on default --- resources/profiles/materials/pla.cfg | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/resources/profiles/materials/pla.cfg b/resources/profiles/materials/pla.cfg index 99a06e5e1b..86fc696741 100644 --- a/resources/profiles/materials/pla.cfg +++ b/resources/profiles/materials/pla.cfg @@ -5,8 +5,5 @@ name = PLA [settings] material_bed_temperature = 60 -platform_adhesion = skirt material_flow = 100 -material_print_temperature = 210 -cool_fan_speed = 100 -cool_fan_speed_max = 100 \ No newline at end of file +material_print_temperature = 210 \ No newline at end of file From 34ed642e355b54174df6fd2ae894bc03dc94c9ff Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 11 Mar 2016 12:01:31 +0100 Subject: [PATCH 20/42] Revert "Make setting category headers bold" This reverts commit e56347501d0a61d52bfe632fbf4453d9ab083d1c. No attached issue; Far to late in release cycle for people to circumvent the design process. --- resources/themes/cura/theme.json | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/themes/cura/theme.json b/resources/themes/cura/theme.json index 31b6fb0f97..ca8390179c 100644 --- a/resources/themes/cura/theme.json +++ b/resources/themes/cura/theme.json @@ -49,7 +49,6 @@ }, "setting_category": { "size": 1.15, - "bold": true, "family": "Open Sans" }, "action_button": { From 3b66e887b0439b6f391b89b87cffe4d9b9634b97 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 11 Mar 2016 14:49:21 +0100 Subject: [PATCH 21/42] Added logging --- plugins/RemovableDriveOutputDevice/RemovableDrivePlugin.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plugins/RemovableDriveOutputDevice/RemovableDrivePlugin.py b/plugins/RemovableDriveOutputDevice/RemovableDrivePlugin.py index 1a095e2a68..ee651afc38 100644 --- a/plugins/RemovableDriveOutputDevice/RemovableDrivePlugin.py +++ b/plugins/RemovableDriveOutputDevice/RemovableDrivePlugin.py @@ -9,7 +9,7 @@ from UM.Message import Message from UM.OutputDevice.OutputDevicePlugin import OutputDevicePlugin from . import RemovableDriveOutputDevice - +from UM.Logger import Logger from UM.i18n import i18nCatalog catalog = i18nCatalog("cura") @@ -38,11 +38,14 @@ class RemovableDrivePlugin(OutputDevicePlugin): def ejectDevice(self, device): try: + Logger.log("i", "Attempting to eject the device") result = self.performEjectDevice(device) except Exception as e: + Logger.log("e", "Ejection failed due to: %s" % str(e)) result = False if result: + Logger.log("i", "Succesfully ejected the device") message = Message(catalog.i18nc("@info:status", "Ejected {0}. You can now safely remove the drive.").format(device.getName())) message.show() else: From 898060029256ef461338ef2137b01249e66dadd6 Mon Sep 17 00:00:00 2001 From: daid Date: Fri, 11 Mar 2016 15:13:09 +0100 Subject: [PATCH 22/42] CURA-1104: Fix the incorrect "failed to eject drive" message for windows. The C windows API call was wrong. The lpBytesReturned parameter was set to NULL. While the docmentation at: https://msdn.microsoft.com/en-us/library/windows/desktop/aa363406(v=vs.85).aspx states that it CANNOT be NULL if lpOverlapped is NULL. Overlapped is for async operations. So the easiest way to fix this is to supply a proper pointer. I've also removed unused includes. And supplied the DeviceIoControl with proper ctypes calling information to prevent other python->c problems. --- .../RemovableDrivePlugin.py | 2 +- .../WindowsRemovableDrivePlugin.py | 50 ++++++++++++++----- 2 files changed, 39 insertions(+), 13 deletions(-) diff --git a/plugins/RemovableDriveOutputDevice/RemovableDrivePlugin.py b/plugins/RemovableDriveOutputDevice/RemovableDrivePlugin.py index ee651afc38..4e748230e9 100644 --- a/plugins/RemovableDriveOutputDevice/RemovableDrivePlugin.py +++ b/plugins/RemovableDriveOutputDevice/RemovableDrivePlugin.py @@ -4,9 +4,9 @@ import threading import time -from UM.Signal import Signal from UM.Message import Message from UM.OutputDevice.OutputDevicePlugin import OutputDevicePlugin +from UM.Logger import Logger from . import RemovableDriveOutputDevice from UM.Logger import Logger diff --git a/plugins/RemovableDriveOutputDevice/WindowsRemovableDrivePlugin.py b/plugins/RemovableDriveOutputDevice/WindowsRemovableDrivePlugin.py index b47a37d35c..569352a8af 100644 --- a/plugins/RemovableDriveOutputDevice/WindowsRemovableDrivePlugin.py +++ b/plugins/RemovableDriveOutputDevice/WindowsRemovableDrivePlugin.py @@ -4,16 +4,12 @@ from . import RemovableDrivePlugin -import threading import string from ctypes import windll from ctypes import wintypes import ctypes -import time -import os -import subprocess from UM.i18n import i18nCatalog catalog = i18nCatalog("cura") @@ -32,6 +28,21 @@ IOCTL_STORAGE_EJECT_MEDIA = 2967560 # [CodeStyle: Windows Enum value] OPEN_EXISTING = 3 # [CodeStyle: Windows Enum value] +# Setup the DeviceIoControl function arguments and return type. +# See ctypes documentation for details on how to call C functions from python, and why this is important. +windll.kernel32.DeviceIoControl.argtypes = [ + wintypes.HANDLE, # _In_ HANDLE hDevice + wintypes.DWORD, # _In_ DWORD dwIoControlCode + wintypes.LPVOID, # _In_opt_ LPVOID lpInBuffer + wintypes.DWORD, # _In_ DWORD nInBufferSize + wintypes.LPVOID, # _Out_opt_ LPVOID lpOutBuffer + wintypes.DWORD, # _In_ DWORD nOutBufferSize + ctypes.POINTER(wintypes.DWORD), # _Out_opt_ LPDWORD lpBytesReturned + wintypes.LPVOID # _Inout_opt_ LPOVERLAPPED lpOverlapped +] +windll.kernel32.DeviceIoControl.restype = wintypes.BOOL + + ## Removable drive support for windows class WindowsRemovableDrivePlugin(RemovableDrivePlugin.RemovableDrivePlugin): def checkRemovableDrives(self): @@ -83,16 +94,31 @@ class WindowsRemovableDrivePlugin(RemovableDrivePlugin.RemovableDrivePlugin): handle = windll.kernel32.CreateFileA("\\\\.\\{0}".format(device.getId()[:-1]).encode("ascii"), GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, None, OPEN_EXISTING, 0, None ) if handle == -1: - print(windll.kernel32.GetLastError()) - return + # ctypes.WinError sets up an GetLastError API call for windows as an Python OSError exception. + # So we use this to raise the error to our caller. + raise ctypes.WinError() + + # The DeviceIoControl requires a bytes_returned pointer to be a valid pointer. + # So create a ctypes DWORD to reference. (Without this pointer the DeviceIoControl function will crash with an access violation after doing it's job. + bytes_returned = wintypes.DWORD(0) + + error = None - result = None # Then, try and tell it to eject - if not windll.kernel32.DeviceIoControl(handle, IOCTL_STORAGE_EJECT_MEDIA, None, None, None, None, None, None): - result = False - else: - result = True + return_code = windll.kernel32.DeviceIoControl(handle, IOCTL_STORAGE_EJECT_MEDIA, None, 0, None, 0, ctypes.pointer(bytes_returned), None) + # DeviceIoControl with IOCTL_STORAGE_EJECT_MEDIA return 0 on error. + if return_code == 0: + # ctypes.WinError sets up an GetLastError API call for windows as an Python OSError exception. + # So we use this to raise the error to our caller. + error = ctypes.WinError() + # Do not raise an error here yet, so we can properly close the handle. # Finally, close the handle windll.kernel32.CloseHandle(handle) - return result + + # If an error happened in the DeviceIoControl, raise it now. + if error: + raise error + + # Return success + return True From 54ceafbcd005c03d6e958ec1fdf410055d8cb443 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 11 Mar 2016 17:39:53 +0100 Subject: [PATCH 23/42] Handle the flux capacitive fizbit ambigruously Makes the unambigruous fizbit warp correctly when subjugated to the flux capacitor. The limit of the reciprocative function seems to be computed correctly now. Contributes to no issue. --- .../RemovableDriveOutputDevice/WindowsRemovableDrivePlugin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/RemovableDriveOutputDevice/WindowsRemovableDrivePlugin.py b/plugins/RemovableDriveOutputDevice/WindowsRemovableDrivePlugin.py index 569352a8af..573ef3a845 100644 --- a/plugins/RemovableDriveOutputDevice/WindowsRemovableDrivePlugin.py +++ b/plugins/RemovableDriveOutputDevice/WindowsRemovableDrivePlugin.py @@ -99,7 +99,7 @@ class WindowsRemovableDrivePlugin(RemovableDrivePlugin.RemovableDrivePlugin): raise ctypes.WinError() # The DeviceIoControl requires a bytes_returned pointer to be a valid pointer. - # So create a ctypes DWORD to reference. (Without this pointer the DeviceIoControl function will crash with an access violation after doing it's job. + # So create a ctypes DWORD to reference. (Without this pointer the DeviceIoControl function will crash with an access violation after doing its job. bytes_returned = wintypes.DWORD(0) error = None From 7d86fbd9cc343786f8cc004a20c39d6cf1e171ef Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 14 Mar 2016 11:30:33 +0100 Subject: [PATCH 24/42] Added warning icon CURA-1122 --- resources/themes/cura/icons/warning.svg | 1 + 1 file changed, 1 insertion(+) create mode 100644 resources/themes/cura/icons/warning.svg diff --git a/resources/themes/cura/icons/warning.svg b/resources/themes/cura/icons/warning.svg new file mode 100644 index 0000000000..42836e9f1c --- /dev/null +++ b/resources/themes/cura/icons/warning.svg @@ -0,0 +1 @@ + \ No newline at end of file From 5c6200a0460e2bb93c17274cedff063866a134b4 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 14 Mar 2016 12:00:45 +0100 Subject: [PATCH 25/42] Removed unneeded override from profile CURA-1122 --- resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile | 1 - resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile | 1 - resources/profiles/ultimaker2+/pla_0.4_high.curaprofile | 1 - resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile | 1 - resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile | 1 - resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile | 1 - 6 files changed, 6 deletions(-) diff --git a/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile index cd8596f06b..ae42cea8d9 100644 --- a/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile @@ -18,7 +18,6 @@ infill_wipe_dist = 0.1 retraction_amount = 6 retraction_min_travel = 0.5 retraction_count_max = 30 -retraction_extrusion_window = 6 speed_infill = 30 speed_wall_0 = 20 speed_wall_x = 25 diff --git a/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile index 5c150970de..53882bc066 100644 --- a/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile @@ -18,7 +18,6 @@ infill_wipe_dist = 0.2 retraction_amount = 5.5 retraction_min_travel = 0.5 retraction_count_max = 30 -retraction_extrusion_window = 6 speed_infill = 60 speed_wall_0 = 40 speed_wall_x = 50 diff --git a/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile index 23fa31e20c..9b01eafac6 100644 --- a/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile @@ -18,7 +18,6 @@ infill_wipe_dist = 0.2 retraction_amount = 5.5 retraction_min_travel = 0.5 retraction_count_max = 30 -retraction_extrusion_window = 6 speed_infill = 50 speed_wall_0 = 30 speed_wall_x = 40 diff --git a/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile index 68884bb7cb..40dd7f734e 100644 --- a/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile @@ -18,7 +18,6 @@ infill_wipe_dist = 0.2 retraction_amount = 5.5 retraction_min_travel = 0.5 retraction_count_max = 30 -retraction_extrusion_window = 6 speed_infill = 50 speed_wall_0 = 30 speed_wall_x = 40 diff --git a/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile index f8c54e36c4..2ad0960d5f 100644 --- a/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile @@ -18,7 +18,6 @@ infill_wipe_dist = 0.3 retraction_amount = 6 retraction_min_travel = 0.5 retraction_count_max = 30 -retraction_extrusion_window = 6 speed_infill = 55 speed_wall_0 = 25 speed_wall_x = 40 diff --git a/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile index 84017bc1f3..7ea019917d 100644 --- a/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile @@ -18,7 +18,6 @@ infill_wipe_dist = 0.4 retraction_amount = 6 retraction_min_travel = 0.5 retraction_count_max = 30 -retraction_extrusion_window = 6 speed_infill = 40 speed_wall_0 = 20 speed_wall_x = 30 From b96f3d7733ba34a45fb5a7a439488de7bd3b45e0 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Mon, 14 Mar 2016 12:02:54 +0100 Subject: [PATCH 26/42] JSON: make top_bottom_thickness available after all (CURA-1099) --- resources/machines/fdmprinter.json | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json index 06f57a05a2..ae49124f5c 100644 --- a/resources/machines/fdmprinter.json +++ b/resources/machines/fdmprinter.json @@ -392,7 +392,6 @@ "min_value_warning": "0.6", "type": "float", "visible": true, - "enabled": "False", "children": { "top_thickness": { "label": "Top Thickness", From 34814cd65712c83cfe61fcbd80516b8cc21822d3 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Tue, 15 Mar 2016 11:10:20 +0100 Subject: [PATCH 27/42] JSON: updated conical support minimal width to 5mm: more chance it will stay up straight --- resources/machines/fdmprinter.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json index ae49124f5c..7bde053913 100644 --- a/resources/machines/fdmprinter.json +++ b/resources/machines/fdmprinter.json @@ -1328,7 +1328,7 @@ "label": "Minimal Width", "description": "Minimal width to which conical support reduces the support areas. Small widths can cause the base of the support to not act well as foundation for support above.", "unit": "mm", - "default": 3.0, + "default": 5.0, "min_value": "0", "min_value_warning": "machine_nozzle_size * 3", "max_value_warning": "100.0", From b863d239b01e9d08d94d87d59e2f3752a85ada56 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 15 Mar 2016 12:53:22 +0100 Subject: [PATCH 28/42] Added more logging to engine connection Should make it easier to debug future issues. CURA-1133 --- plugins/CuraEngineBackend/CuraEngineBackend.py | 1 + plugins/CuraEngineBackend/StartSliceJob.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/CuraEngineBackend/CuraEngineBackend.py b/plugins/CuraEngineBackend/CuraEngineBackend.py index 7f7b992404..38c2576704 100644 --- a/plugins/CuraEngineBackend/CuraEngineBackend.py +++ b/plugins/CuraEngineBackend/CuraEngineBackend.py @@ -163,6 +163,7 @@ class CuraEngineBackend(Backend): self._process = None except: # terminating a process that is already terminating causes an exception, silently ignore this. pass + Logger.log("d", "Engine process is killed") def _onStartSliceCompleted(self, job): if job.getError() or job.getResult() != True: diff --git a/plugins/CuraEngineBackend/StartSliceJob.py b/plugins/CuraEngineBackend/StartSliceJob.py index 7c35bca36b..c1d7932302 100644 --- a/plugins/CuraEngineBackend/StartSliceJob.py +++ b/plugins/CuraEngineBackend/StartSliceJob.py @@ -105,7 +105,7 @@ class StartSliceJob(Job): Logger.log("d", "Sending data to engine for slicing.") self._socket.sendMessage(slice_message) - + Logger.log("d", "Sending data to engine is completed") self.setResult(True) def _expandGcodeTokens(self, key, value, settings): From 75b43de546ecd409235fa1f4291855a0961896be Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Tue, 15 Mar 2016 15:27:19 +0100 Subject: [PATCH 29/42] JSON: wall thickness warning values based on line_width instead of harccoded (CURA-1167) --- resources/machines/fdmprinter.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json index 7bde053913..346a0b10db 100644 --- a/resources/machines/fdmprinter.json +++ b/resources/machines/fdmprinter.json @@ -358,8 +358,8 @@ "unit": "mm", "default": 0.8, "min_value": "0", - "min_value_warning": "0.2", - "max_value_warning": "5", + "min_value_warning": "line_width", + "max_value_warning": "5 * line_width", "type": "float", "visible": true, "children": { From 4fb9a6a699cb146a8f942e9c934afbede70a0c95 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 15 Mar 2016 16:15:13 +0100 Subject: [PATCH 30/42] Per object settings now also uses visible depth CURA-1160 --- plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml b/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml index 85d631b82f..c664aeaeef 100644 --- a/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml +++ b/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml @@ -237,7 +237,7 @@ Item { delegate: ToolButton { id: button; - x: model.depth * UM.Theme.getSize("default_margin").width; + x: model.visible_depth * UM.Theme.getSize("default_margin").width; text: model.name; tooltip: model.description; visible: !model.global_only From 7c22fe1eb55a0aaad5b36945ec346df163193a6d Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 15 Mar 2016 16:43:14 +0100 Subject: [PATCH 31/42] Removable drive plugin is now forced to use machine preference for output type Fixes CURA-1165 --- plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py b/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py index f73ba46c85..f854e2711e 100644 --- a/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py +++ b/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py @@ -26,6 +26,7 @@ class RemovableDriveOutputDevice(OutputDevice): self._writing = False 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) if self._writing: raise OutputDeviceError.DeviceBusyError() From 0bf41cf5282cac7ec546fd05392a5fd0c3b9e60d Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 15 Mar 2016 16:48:35 +0100 Subject: [PATCH 32/42] Changed dimensions of UM2 CURA-1166 --- resources/machines/ultimaker2.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/machines/ultimaker2.json b/resources/machines/ultimaker2.json index 16867145cb..fed01312de 100644 --- a/resources/machines/ultimaker2.json +++ b/resources/machines/ultimaker2.json @@ -40,8 +40,8 @@ "machine_settings": { "machine_start_gcode" : { "default": "" }, "machine_end_gcode" : { "default": "" }, - "machine_width": { "default": 230 }, - "machine_depth": { "default": 225 }, + "machine_width": { "default": 223 }, + "machine_depth": { "default": 223 }, "machine_height": { "default": 205 }, "machine_heated_bed": { "default": true }, From 65499bd06c05856c9e6eed802a4636c9f28c3b38 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Tue, 15 Mar 2016 17:48:58 +0100 Subject: [PATCH 33/42] JSON: made parent-child relations logical (CURA-1171) the child should depend foremost on the parent no parent may be used in the engine --- resources/machines/fdmprinter.json | 136 ++++++++++++++--------------- 1 file changed, 67 insertions(+), 69 deletions(-) diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json index 346a0b10db..1d3ded2adf 100644 --- a/resources/machines/fdmprinter.json +++ b/resources/machines/fdmprinter.json @@ -374,14 +374,6 @@ } } }, - "alternate_extra_perimeter": { - "label": "Alternate Extra Wall", - "description": "Make an extra wall at every second layer, so that infill will be caught between an extra wall above and one below. This results in a better cohesion between infill and walls, but might have an impact on the surface quality.", - "type": "boolean", - "default": false, - "visible": false, - "inherit": false - }, "top_bottom_thickness": { "label": "Bottom/Top Thickness", "description": "This controls the thickness of the bottom and top layers. The number of solid layers put down is calculated from the layer thickness and this value. Having this value a multiple of the layer thickness makes sense. Keep it near your wall thickness to make an evenly strong part.", @@ -439,6 +431,15 @@ } } }, + + "alternate_extra_perimeter": { + "label": "Alternate Extra Wall", + "description": "Make an extra wall at every second layer, so that infill will be caught between an extra wall above and one below. This results in a better cohesion between infill and walls, but might have an impact on the surface quality.", + "type": "boolean", + "default": false, + "visible": false, + "inherit": false + }, "remove_overlapping_walls_enabled": { "label": "Remove Overlapping Wall Parts", "description": "Remove parts of a wall which share an overlap which would result in overextrusion in some places. These overlaps occur in thin pieces in a model and sharp corners.", @@ -996,22 +997,20 @@ "default": true, "visible": false, "enabled": "retraction_combing", - "global_only": "True", - "children": { - "travel_avoid_distance": { - "label": "Avoid Distance", - "description": "The distance to stay clear of parts which are avoided during travel.", - "unit": "mm", - "type": "float", - "default": 1.5, - "min_value": "0", - "max_value_warning": "machine_nozzle_tip_outer_diameter * 5", - "visible": false, - "inherit": false, - "enabled": "retraction_combing", - "global_only": "True" - } - } + "global_only": "True" + }, + "travel_avoid_distance": { + "label": "Avoid Distance", + "description": "The distance to stay clear of parts which are avoided during travel.", + "unit": "mm", + "type": "float", + "default": 1.5, + "min_value": "0", + "max_value_warning": "machine_nozzle_tip_outer_diameter * 5", + "visible": false, + "inherit": false, + "enabled": "retraction_combing and travel_avoid_other_parts", + "global_only": "True" }, "coasting_enable": { "label": "Enable Coasting", @@ -1071,43 +1070,44 @@ "description": "Enable the cooling fan during the print. The extra cooling from the cooling fan helps parts with small cross sections that print each layer quickly.", "type": "boolean", "default": true, + "global_only": "True" + }, + "cool_fan_speed": { + "label": "Fan Speed", + "description": "Fan speed used for the print cooling fan on the printer head.", + "unit": "%", + "type": "float", + "min_value": "0", + "max_value": "100", + "default": 100, + "visible": false, + "inherit_function": "100.0 if parent_value else 0.0", + "enabled": "cool_fan_enabled", "global_only": "True", "children": { - "cool_fan_speed": { - "label": "Fan Speed", - "description": "Fan speed used for the print cooling fan on the printer head.", + "cool_fan_speed_min": { + "label": "Minimum Fan Speed", + "description": "Normally the fan runs at the minimum fan speed. If the layer is slowed down due to minimum layer time, the fan speed adjusts between minimum and maximum fan speed.", "unit": "%", "type": "float", "min_value": "0", "max_value": "100", "default": 100, "visible": false, - "inherit_function": "100.0 if parent_value else 0.0", - "global_only": "True", - "children": { - "cool_fan_speed_min": { - "label": "Minimum Fan Speed", - "description": "Normally the fan runs at the minimum fan speed. If the layer is slowed down due to minimum layer time, the fan speed adjusts between minimum and maximum fan speed.", - "unit": "%", - "type": "float", - "min_value": "0", - "max_value": "100", - "default": 100, - "visible": false, - "global_only": "True" - }, - "cool_fan_speed_max": { - "label": "Maximum Fan Speed", - "description": "Normally the fan runs at the minimum fan speed. If the layer is slowed down due to minimum layer time, the fan speed adjusts between minimum and maximum fan speed.", - "unit": "%", - "type": "float", - "min_value": "0", - "max_value": "100", - "default": 100, - "visible": false, - "global_only": "True" - } - } + "enabled": "cool_fan_enabled", + "global_only": "True" + }, + "cool_fan_speed_max": { + "label": "Maximum Fan Speed", + "description": "Normally the fan runs at the minimum fan speed. If the layer is slowed down due to minimum layer time, the fan speed adjusts between minimum and maximum fan speed.", + "unit": "%", + "type": "float", + "min_value": "0", + "max_value": "100", + "default": 100, + "visible": false, + "enabled": "cool_fan_enabled", + "global_only": "True" } } }, @@ -1457,22 +1457,20 @@ "min_value": "0", "max_value_warning": "10", "visible": false, - "enabled": "support_enable and support_use_towers", - "children": { - "support_minimal_diameter": { - "label": "Minimum Diameter", - "description": "Minimum diameter in the X/Y directions of a small area which is to be supported by a specialized support tower.", - "unit": "mm", - "type": "float", - "default": 3.0, - "min_value": "0", - "max_value_warning": "10", - "max_value": "support_tower_diameter", - "inherit": true, - "visible": false, - "enabled": "support_enable and support_use_towers" - } - } + "enabled": "support_enable and support_use_towers" + }, + "support_minimal_diameter": { + "label": "Minimum Diameter", + "description": "Minimum diameter in the X/Y directions of a small area which is to be supported by a specialized support tower.", + "unit": "mm", + "type": "float", + "default": 3.0, + "min_value": "0", + "max_value_warning": "10", + "max_value": "support_tower_diameter", + "inherit": true, + "visible": false, + "enabled": "support_enable and support_use_towers" }, "support_tower_roof_angle": { "label": "Tower Roof Angle", From 802623443a603750b623b0dfe51b22560194d0ea Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Tue, 15 Mar 2016 17:51:52 +0100 Subject: [PATCH 34/42] JSON: fix for inherit function of fan speed (CURA-1171) --- resources/machines/fdmprinter.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json index 1d3ded2adf..e7f538beae 100644 --- a/resources/machines/fdmprinter.json +++ b/resources/machines/fdmprinter.json @@ -1081,7 +1081,7 @@ "max_value": "100", "default": 100, "visible": false, - "inherit_function": "100.0 if parent_value else 0.0", + "inherit_function": "100.0 if cool_fan_enabled else 0.0", "enabled": "cool_fan_enabled", "global_only": "True", "children": { From ff25e382ee0b269393b88fd0f408977a5ad4b63f Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Tue, 15 Mar 2016 17:56:30 +0100 Subject: [PATCH 35/42] Add a notice icon This icon is used in lieu of the warning icon for CURA-1122 --- resources/themes/cura/icons/notice.svg | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 resources/themes/cura/icons/notice.svg diff --git a/resources/themes/cura/icons/notice.svg b/resources/themes/cura/icons/notice.svg new file mode 100644 index 0000000000..92790ad8ac --- /dev/null +++ b/resources/themes/cura/icons/notice.svg @@ -0,0 +1,17 @@ + + + + + + From b7065628a3f0fe2d8c6ad3a4942226d243bd28b8 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Wed, 16 Mar 2016 09:55:19 +0100 Subject: [PATCH 36/42] JSON: temporarily made temp graph and cooldown speed modifier disabled (CURA-1157) --- resources/machines/fdmprinter.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json index e7f538beae..367b2c9aa0 100644 --- a/resources/machines/fdmprinter.json +++ b/resources/machines/fdmprinter.json @@ -657,7 +657,8 @@ "unit": "", "type": "string", "default": "[[3.5,200],[7.0,240]]", - "enabled": "material_flow_dependent_temperature", + "enabled": "False", + "enabled_before_removal": "material_flow_dependent_temperature", "global_only": true }, "material_extrusion_cool_down_speed": { @@ -669,7 +670,8 @@ "min_value": "0", "max_value_warning": "10.0", "global_only": "True", - "enabled": "material_flow_dependent_temperature or machine_extruder_count > 1", + "enabled": "False", + "enabled_before_removal": "material_flow_dependent_temperature or machine_extruder_count > 1", "visible": false }, "material_bed_temperature": { From 9a6615213cac5f740258954a3e4bedee82baba8b Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 16 Mar 2016 15:18:11 +0100 Subject: [PATCH 37/42] Bed should no longer be damaged when leveling CURA-1102 --- plugins/USBPrinting/PrinterConnection.py | 18 ++++++++++++++++-- resources/qml/WizardPages/Bedleveling.qml | 20 ++++++++++++++++---- 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/plugins/USBPrinting/PrinterConnection.py b/plugins/USBPrinting/PrinterConnection.py index ffcd6d0d75..907cebc012 100644 --- a/plugins/USBPrinting/PrinterConnection.py +++ b/plugins/USBPrinting/PrinterConnection.py @@ -368,14 +368,28 @@ class PrinterConnection(OutputDevice, QObject, SignalEmitter): Logger.log("d", "Setting bed temperature to %s", temperature) self._sendCommand("M140 S%s" % temperature) + @pyqtSlot() + def setMoveToRelative(self): + self._sendCommand("G91") + + @pyqtSlot() + def setMoveToAbsolute(self): + self._sendCommand("G90") + @pyqtSlot("long", "long","long") def moveHead(self, x, y, z): Logger.log("d","Moving head to %s, %s , %s", x, y, z) - self._sendCommand("G0 X%s Y%s Z%s"%(x,y,z)) + self._sendCommand("G0 X%s Y%s Z%s F3000"%(x,y,z)) + + @pyqtSlot("long", "long","long") + def moveHeadRelative(self, x, y, z): + self.setMoveToRelative() + self.moveHead(x,y,z) + self.setMoveToAbsolute() @pyqtSlot() def homeHead(self): - self._sendCommand("G28") + self._sendCommand("G28") ## Directly send the command, withouth checking connection state (eg; printing). # \param cmd string with g-code diff --git a/resources/qml/WizardPages/Bedleveling.qml b/resources/qml/WizardPages/Bedleveling.qml index 105ee81f75..e601cd8436 100644 --- a/resources/qml/WizardPages/Bedleveling.qml +++ b/resources/qml/WizardPages/Bedleveling.qml @@ -19,7 +19,11 @@ Item property int platform_height: UM.MachineManager.getSettingValue("machine_depth") anchors.fill: parent; property variant printer_connection: UM.USBPrinterManager.connectedPrinterList.getItem(0).printer - Component.onCompleted: printer_connection.homeHead() + Component.onCompleted: + { + printer_connection. + printer_connection.homeHead() + } UM.I18nCatalog { id: catalog; name:"cura"} property variant wizard: null; @@ -79,15 +83,23 @@ Item { if(wizardPage.leveling_state == 0) { - printer_connection.moveHead(platform_width, 0 ,0) + printer_connection.moveHeadRelative(0, 0, 3) + printer_connection.homeHead() + printer_connection.moveHeadRelative(0, 0, 3) + printer_connection.moveHeadRelative(platform_width - 10, 0, 0) + printer_connection.moveHeadRelative(0, 0, -3) } if(wizardPage.leveling_state == 1) { - printer_connection.moveHead(platform_width/2, platform_height, 0) + printer_connection.moveHeadRelative(0, 0, 3) + printer_connection.moveHeadRelative(-platform_width/2, platform_height - 10, 0) + printer_connection.moveHeadRelative(0, 0, -3) } if(wizardPage.leveling_state == 2) { - printer_connection.moveHead(0, 0, 0) + printer_connection.moveHeadRelative(0, 0, 3) + printer_connection.moveHeadRelative(-platform_width/2 + 10, -(platform_height + 10), 0) + printer_connection.moveHeadRelative(0, 0, -3) } wizardPage.leveling_state++ if (wizardPage.leveling_state >= 3){ From 90293a4a5cdc24344d08330938e0e7467c5044ff Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 16 Mar 2016 16:33:36 +0100 Subject: [PATCH 38/42] Removed stray broken code CURA-1102 --- resources/qml/WizardPages/Bedleveling.qml | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/qml/WizardPages/Bedleveling.qml b/resources/qml/WizardPages/Bedleveling.qml index e601cd8436..076a2398fc 100644 --- a/resources/qml/WizardPages/Bedleveling.qml +++ b/resources/qml/WizardPages/Bedleveling.qml @@ -21,7 +21,6 @@ Item property variant printer_connection: UM.USBPrinterManager.connectedPrinterList.getItem(0).printer Component.onCompleted: { - printer_connection. printer_connection.homeHead() } UM.I18nCatalog { id: catalog; name:"cura"} From aafb9812454a88db70a8765f81224c9461b2aff0 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 17 Mar 2016 10:18:46 +0100 Subject: [PATCH 39/42] Setting empty jobname is now possible again I hope this fixes CURA-707, but it can only be tested through means of a build. --- resources/qml/JobSpecs.qml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/resources/qml/JobSpecs.qml b/resources/qml/JobSpecs.qml index 7f8dc119ea..f27b046355 100644 --- a/resources/qml/JobSpecs.qml +++ b/resources/qml/JobSpecs.qml @@ -130,10 +130,7 @@ Rectangle { text: '' horizontalAlignment: TextInput.AlignRight onTextChanged: { - if(text != ''){ - //Prevent that jobname is set to an empty string - Printer.setJobName(text) - } + Printer.setJobName(text) } onEditingFinished: { if (printJobTextfield.text != ''){ From 4507560e309e3ae23e6faa9ec145546fb3805909 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 17 Mar 2016 11:53:11 +0100 Subject: [PATCH 40/42] Codestyle: Whitespace around operators A space on both sides around binary operators. A space after the comma. Contributes to issue CURA-1102. --- plugins/USBPrinting/PrinterConnection.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/USBPrinting/PrinterConnection.py b/plugins/USBPrinting/PrinterConnection.py index 907cebc012..951996f699 100644 --- a/plugins/USBPrinting/PrinterConnection.py +++ b/plugins/USBPrinting/PrinterConnection.py @@ -379,7 +379,7 @@ class PrinterConnection(OutputDevice, QObject, SignalEmitter): @pyqtSlot("long", "long","long") def moveHead(self, x, y, z): Logger.log("d","Moving head to %s, %s , %s", x, y, z) - self._sendCommand("G0 X%s Y%s Z%s F3000"%(x,y,z)) + self._sendCommand("G0 X%s Y%s Z%s F3000" % (x, y, z)) @pyqtSlot("long", "long","long") def moveHeadRelative(self, x, y, z): From 89256b54236a35248752b68d4d33a2c50bcc21fe Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 17 Mar 2016 14:44:09 +0100 Subject: [PATCH 41/42] Added explicit home bed before rest of bed leveling CURA-1102 --- plugins/USBPrinting/PrinterConnection.py | 4 ++++ resources/qml/WizardPages/Bedleveling.qml | 1 + 2 files changed, 5 insertions(+) diff --git a/plugins/USBPrinting/PrinterConnection.py b/plugins/USBPrinting/PrinterConnection.py index 907cebc012..00df335828 100644 --- a/plugins/USBPrinting/PrinterConnection.py +++ b/plugins/USBPrinting/PrinterConnection.py @@ -391,6 +391,10 @@ class PrinterConnection(OutputDevice, QObject, SignalEmitter): def homeHead(self): self._sendCommand("G28") + @pyqtSlot() + def homeBed(self): + self._sendCommand("G28 Z") + ## Directly send the command, withouth checking connection state (eg; printing). # \param cmd string with g-code def _sendCommand(self, cmd): diff --git a/resources/qml/WizardPages/Bedleveling.qml b/resources/qml/WizardPages/Bedleveling.qml index 076a2398fc..40735f8b0a 100644 --- a/resources/qml/WizardPages/Bedleveling.qml +++ b/resources/qml/WizardPages/Bedleveling.qml @@ -21,6 +21,7 @@ Item property variant printer_connection: UM.USBPrinterManager.connectedPrinterList.getItem(0).printer Component.onCompleted: { + printer_connection.homeBed() printer_connection.homeHead() } UM.I18nCatalog { id: catalog; name:"cura"} From 479c6c3319151c79725472874880ba2c5f6612ae Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 17 Mar 2016 14:57:44 +0100 Subject: [PATCH 42/42] Added extra relative move to prevent nozzle scraping CURA-1102 --- resources/qml/WizardPages/Bedleveling.qml | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/qml/WizardPages/Bedleveling.qml b/resources/qml/WizardPages/Bedleveling.qml index 40735f8b0a..1721f0fd4a 100644 --- a/resources/qml/WizardPages/Bedleveling.qml +++ b/resources/qml/WizardPages/Bedleveling.qml @@ -22,6 +22,7 @@ Item Component.onCompleted: { printer_connection.homeBed() + printer_connection.moveHeadRelative(0, 0, 3) printer_connection.homeHead() } UM.I18nCatalog { id: catalog; name:"cura"}