From c6c7ca5d2fbe935468a8418f8e8d5fbecd960661 Mon Sep 17 00:00:00 2001 From: Thomas-Karl Pietrowski Date: Sat, 23 Jan 2016 20:34:25 +0100 Subject: [PATCH 1/5] Adding support for additional object files: * 3MF files * OBJ files --- cura.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura.desktop b/cura.desktop index edd482eed5..d0cb4398a1 100644 --- a/cura.desktop +++ b/cura.desktop @@ -8,6 +8,6 @@ TryExec=/usr/bin/cura_app.py Icon=/usr/share/cura/resources/images/cura-icon.png Terminal=false Type=Application -MimeType=application/sla;image/bmp;image/gif;image/jpeg;image/png +MimeType=application/sla;application/vnd.ms-3mfdocument;application/prs.wavefront-obj;image/bmp;image/gif;image/jpeg;image/png Categories=Graphics; Keywords=3D;Printing; From a88191d4c51e7e9186dcf6bb3c008490083caf55 Mon Sep 17 00:00:00 2001 From: Thomas-Karl Pietrowski Date: Mon, 25 Jan 2016 18:47:00 +0100 Subject: [PATCH 2/5] Adding cura.sharedmimeinfo * Originally taken from my own packaging of Cura on launchpad: ppa:thopiekar/cura - https://launchpad.net/~thopiekar/+archive/ubuntu/cura * It adds mime-types, which are supported by Cura, to the mime-database, so filemanagers can recognize these files. * This sharemimeinfo includes currently 3MF, STL and OBJ. --- cura.sharedmimeinfo | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 cura.sharedmimeinfo diff --git a/cura.sharedmimeinfo b/cura.sharedmimeinfo new file mode 100644 index 0000000000..9629aef5df --- /dev/null +++ b/cura.sharedmimeinfo @@ -0,0 +1,22 @@ + + + + 3D Manufacturing Format Document + + + + + + Computer-aided design and manufacturing format + + + + + + + Wavefront 3D Object file + + + + + \ No newline at end of file From 350466c73e0def6ff41d8b4c2be81ec57e7859e4 Mon Sep 17 00:00:00 2001 From: Thomas-Karl Pietrowski Date: Mon, 25 Jan 2016 19:34:33 +0100 Subject: [PATCH 3/5] Adding instructions to CMakeLists.txt to install cura.sharedmimeinfo as cura.xml into ${CMAKE_INSTALL_DATADIR}/mime/packages/ --- CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9384c58ff4..995f85e871 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -60,6 +60,9 @@ if(NOT APPLE AND NOT WIN32) 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(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) From 7c652ed069402f052a0fa5721d451b5aaba53994 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Tue, 26 Jan 2016 15:55:00 +0100 Subject: [PATCH 4/5] JSON: refactor: moved draft shield options to Cooling category --- resources/machines/fdmprinter.json | 82 +++++++++++++++--------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json index 1b0d2a7979..885331a686 100644 --- a/resources/machines/fdmprinter.json +++ b/resources/machines/fdmprinter.json @@ -1109,6 +1109,47 @@ "type": "boolean", "default": false, "visible": false + }, + "draft_shield_enabled": { + "label": "Enable Draft Shield", + "description": "Enable exterior draft shield. This will create a wall around the object which traps (hot) air and shields against gusts of wind. Especially useful for materials which warp easily.", + "type": "boolean", + "default": false + }, + "draft_shield_dist": { + "label": "Draft Shield X/Y Distance", + "description": "Distance of the draft shield from the print, in the X/Y directions.", + "unit": "mm", + "type": "float", + "min_value": "0", + "max_value_warning": "100", + "default": 10, + "visible": false, + "enabled": "draft_shield_enabled" + }, + "draft_shield_height_limitation": { + "label": "Draft Shield Limitation", + "description": "Whether or not to limit the height of the draft shield.", + "type": "enum", + "options": { + "full": "Full", + "limited": "Limited" + }, + "default": "full", + "visible": false, + "enabled": "draft_shield_enabled" + }, + "draft_shield_height": { + "label": "Draft Shield Height", + "description": "Height limitation on the draft shield. Above this height no draft shield will be printed.", + "unit": "mm", + "type": "float", + "min_value": "0", + "max_value_warning": "30", + "default": 0, + "inherit_function": "9999 if draft_shield_height_limitation == 'full' and draft_shield_enabled else 0.0", + "visible": false, + "enabled": "draft_shield_height_limitation == \"limited\"" } } }, @@ -1698,47 +1739,6 @@ "enabled": "adhesion_type == \"raft\"" } } - }, - "draft_shield_enabled": { - "label": "Enable Draft Shield", - "description": "Enable exterior draft shield. This will create a wall around the object which traps (hot) air and shields against gusts of wind. Especially useful for materials which warp easily.", - "type": "boolean", - "default": false - }, - "draft_shield_dist": { - "label": "Draft Shield X/Y Distance", - "description": "Distance of the draft shield from the print, in the X/Y directions.", - "unit": "mm", - "type": "float", - "min_value": "0", - "max_value_warning": "100", - "default": 10, - "visible": false, - "enabled": "draft_shield_enabled" - }, - "draft_shield_height_limitation": { - "label": "Draft Shield Limitation", - "description": "Whether or not to limit the height of the draft shield.", - "type": "enum", - "options": { - "full": "Full", - "limited": "Limited" - }, - "default": "full", - "visible": false, - "enabled": "draft_shield_enabled" - }, - "draft_shield_height": { - "label": "Draft Shield Height", - "description": "Height limitation on the draft shield. Above this height no draft shield will be printed.", - "unit": "mm", - "type": "float", - "min_value": "0", - "max_value_warning": "30", - "default": 0, - "inherit_function": "9999 if draft_shield_height_limitation == 'full' and draft_shield_enabled else 0.0", - "visible": false, - "enabled": "draft_shield_height_limitation == \"limited\"" } } }, From d6bd59da0ed6edd64a684525cd592fe22b62e5ae Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Wed, 27 Jan 2016 10:21:34 +0100 Subject: [PATCH 5/5] made some settings max value warning instead of impossible --- resources/machines/fdmprinter.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json index 885331a686..abc98c4682 100644 --- a/resources/machines/fdmprinter.json +++ b/resources/machines/fdmprinter.json @@ -511,7 +511,7 @@ "type": "float", "default": 20, "min_value": "0", - "max_value": "100", + "max_value_warning": "100", "children": { "infill_line_distance": { "label": "Line distance", @@ -547,7 +547,7 @@ "type": "float", "default": 10, "min_value": "0", - "max_value": "100", + "max_value_warning": "100", "inherit_function": "10 if infill_sparse_density < 95 else 0", "visible": false }, @@ -1436,7 +1436,7 @@ "unit": "%", "type": "float", "min_value": "0", - "max_value": "100", + "max_value_warning": "100", "default": 15, "visible": false, "enabled": "support_enable",