3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-24 15:13:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1

Browse source
This commit is contained in:
Ghostkeeper 2016-01-29 11:23:01 +01:00
commit 6271b4039b
4 changed files with 70 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

3
CMakeLists.txt
View file

@ -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)

2
cura.desktop
View file

@ -10,6 +10,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;

22
cura.sharedmimeinfo Normal file
View file

@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
<mime-type type="application/vnd.ms-3mfdocument">
<comment>3D Manufacturing Format Document</comment>
<icon name="unknown"/>
<glob-deleteall/>
<glob pattern="*.3mf"/>
</mime-type>
<mime-type type="application/sla">
<comment>Computer-aided design and manufacturing format</comment>
<icon name="unknown"/>
<glob-deleteall/>
<glob pattern="*.stl"/>
</mime-type>
<mime-type type="application/prs.wavefront-obj">
<sub-class-of type="text/plain"/>
<comment>Wavefront 3D Object file</comment>
<icon name="unknown"/>
<glob-deleteall/>
<glob pattern="*.obj"/>
</mime-type>
</mime-info>

88
resources/machines/fdmprinter.json
View file

@ -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
},
@ -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\""
}
}
},
@ -1395,7 +1436,7 @@
"unit": "%",
"type": "float",
"min_value": "0",
"max_value": "100",
"max_value_warning": "100",
"default": 15,
"visible": false,
"enabled": "support_enable",
@ -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\""
}
}
},