3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-07 23:17:32 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge branch 'master' of github.com:Ultimaker/Cura

Browse source
This commit is contained in:
Jaime van Kessel 2016-08-19 09:36:56 +02:00
commit 286949dad1
7 changed files with 67 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

1
cura/CuraApplication.py
View file

@ -248,7 +248,6 @@ class CuraApplication(QtApplication):
blackmagic blackmagic
print_sequence print_sequence
infill_mesh infill_mesh
dual
experimental experimental
""".replace("\n", ";").replace(" ", "")) """.replace("\n", ";").replace(" ", ""))

13
plugins/XmlMaterialProfile/XmlMaterialProfile.py
View file

@ -292,7 +292,7 @@ class XmlMaterialProfile(UM.Settings.InstanceContainer):
for identifier in identifiers: for identifier in identifiers:
machine_id = self.__product_id_map.get(identifier.get("product"), None) machine_id = self.__product_id_map.get(identifier.get("product"), None)
if machine_id is None: if machine_id is None:
Logger.log("w", "Cannot create material for unknown machine %s", machine_id) Logger.log("w", "Cannot create material for unknown machine %s", identifier.get("product"))
continue continue
definitions = UM.Settings.ContainerRegistry.getInstance().findDefinitionContainers(id = machine_id) definitions = UM.Settings.ContainerRegistry.getInstance().findDefinitionContainers(id = machine_id)
@ -373,6 +373,7 @@ class XmlMaterialProfile(UM.Settings.InstanceContainer):
"print temperature": "material_print_temperature", "print temperature": "material_print_temperature",
"heated bed temperature": "material_bed_temperature", "heated bed temperature": "material_bed_temperature",
"standby temperature": "material_standby_temperature", "standby temperature": "material_standby_temperature",
"processing temperature graph": "material_flow_temp_graph",
"print cooling": "cool_fan_speed", "print cooling": "cool_fan_speed",
"retraction amount": "retraction_amount", "retraction amount": "retraction_amount",
"retraction speed": "retraction_speed", "retraction speed": "retraction_speed",
@ -381,11 +382,11 @@ class XmlMaterialProfile(UM.Settings.InstanceContainer):
# Map XML file product names to internal ids # Map XML file product names to internal ids
# TODO: Move this to definition's metadata # TODO: Move this to definition's metadata
__product_id_map = { __product_id_map = {
"Ultimaker2": "ultimaker2", "Ultimaker 2": "ultimaker2",
"Ultimaker2+": "ultimaker2_plus", "Ultimaker 2+": "ultimaker2_plus",
"Ultimaker2go": "ultimaker2_go", "Ultimaker 2 Go": "ultimaker2_go",
"Ultimaker2extended": "ultimaker2_extended", "Ultimaker 2 Extended": "ultimaker2_extended",
"Ultimaker2extended+": "ultimaker2_extended_plus", "Ultimaker 2 Extended+": "ultimaker2_extended_plus",
"Ultimaker Original": "ultimaker_original", "Ultimaker Original": "ultimaker_original",
"Ultimaker Original+": "ultimaker_original_plus" "Ultimaker Original+": "ultimaker_original_plus"
} }

4
resources/definitions/innovo_inventor.def.json
View file

@ -95,9 +95,5 @@
"infill_overlap": { "infill_overlap": {
"default_value": 10.0 "default_value": 10.0
} }
},
"machine_preferences": {
"prefered_profile": "Normal Quality",
"prefered_material": "PLA"
} }
} }

13
resources/materials/generic_abs.xml.fdm_material
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
Generic PLA profile. Serves as an example file, data in this file is not correct. Generic ABS profile. Serves as an example file, data in this file is not correct.
--> -->
<fdmmaterial xmlns="http://www.ultimaker.com/material"> <fdmmaterial xmlns="http://www.ultimaker.com/material">
<metadata> <metadata>
@ -10,20 +10,21 @@ Generic PLA profile. Serves as an example file, data in this file is not correct
<color>Generic</color> <color>Generic</color>
</name> </name>
<GUID>60636bb4-518f-42e7-8237-fe77b194ebe0</GUID> <GUID>60636bb4-518f-42e7-8237-fe77b194ebe0</GUID>
<version>0</version> <version>1</version>
<color_code>#8cb219</color_code> <color_code>#8cb219</color_code>
</metadata> </metadata>
<properties> <properties>
<density>1.07</density> <density>1.10</density>
<diameter>2.85</diameter> <diameter>2.85</diameter>
</properties> </properties>
<settings> <settings>
<setting key="print temperature">250</setting> <setting key="print temperature">240</setting>
<setting key="heated bed temperature">80</setting> <setting key="heated bed temperature">80</setting>
<setting key="standby temperature">200</setting>
<machine> <machine>
<machine_identifier manufacturer="Ultimaker" product="Ultimaker2+"/> <machine_identifier manufacturer="Ultimaker" product="Ultimaker 2+"/>
<machine_identifier manufacturer="Ultimaker" product="Ultimaker2extended+"/> <machine_identifier manufacturer="Ultimaker" product="Ultimaker 2 Extended+"/>
<hotend id="0.25 mm" /> <hotend id="0.25 mm" />
<hotend id="0.4 mm" /> <hotend id="0.4 mm" />

11
resources/materials/generic_cpe.xml.fdm_material
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
Generic PLA profile. Serves as an example file, data in this file is not correct. Generic CPE profile. Serves as an example file, data in this file is not correct.
--> -->
<fdmmaterial xmlns="http://www.ultimaker.com/material"> <fdmmaterial xmlns="http://www.ultimaker.com/material">
<metadata> <metadata>
@ -10,20 +10,21 @@ Generic PLA profile. Serves as an example file, data in this file is not correct
<color>Generic</color> <color>Generic</color>
</name> </name>
<GUID>12f41353-1a33-415e-8b4f-a775a6c70cc6</GUID> <GUID>12f41353-1a33-415e-8b4f-a775a6c70cc6</GUID>
<version>0</version> <version>1</version>
<color_code>#159499</color_code> <color_code>#159499</color_code>
</metadata> </metadata>
<properties> <properties>
<density>0.94</density> <density>1.27</density>
<diameter>2.85</diameter> <diameter>2.85</diameter>
</properties> </properties>
<settings> <settings>
<setting key="print temperature">250</setting> <setting key="print temperature">250</setting>
<setting key="heated bed temperature">70</setting> <setting key="heated bed temperature">70</setting>
<setting key="standby temperature">175</setting>
<machine> <machine>
<machine_identifier manufacturer="Ultimaker" product="Ultimaker2+"/> <machine_identifier manufacturer="Ultimaker" product="Ultimaker 2+"/>
<machine_identifier manufacturer="Ultimaker" product="Ultimaker2extended+"/> <machine_identifier manufacturer="Ultimaker" product="Ultimaker 2 Extended+"/>
<hotend id="0.25 mm" /> <hotend id="0.25 mm" />
<hotend id="0.4 mm" /> <hotend id="0.4 mm" />

27
resources/materials/generic_pla.xml.fdm_material
View file

@ -10,25 +10,42 @@ Generic PLA profile. Serves as an example file, data in this file is not correct
<color>Generic</color> <color>Generic</color>
</name> </name>
<GUID>506c9f0d-e3aa-4bd4-b2d2-23e2425b1aa9</GUID> <GUID>506c9f0d-e3aa-4bd4-b2d2-23e2425b1aa9</GUID>
<version>0</version> <version>1</version>
<color_code>#ffc924</color_code> <color_code>#ffc924</color_code>
</metadata> </metadata>
<properties> <properties>
<density>1.3</density> <density>1.24</density>
<diameter>2.85</diameter> <diameter>2.85</diameter>
</properties> </properties>
<settings> <settings>
<setting key="print temperature">210</setting> <setting key="print temperature">200</setting>
<setting key="heated bed temperature">60</setting> <setting key="heated bed temperature">60</setting>
<setting key="standby temperature">175</setting>
<machine> <machine>
<machine_identifier manufacturer="Ultimaker" product="Ultimaker2+"/> <machine_identifier manufacturer="Ultimaker" product="Ultimaker 2+"/>
<machine_identifier manufacturer="Ultimaker" product="Ultimaker2extended+"/> <machine_identifier manufacturer="Ultimaker" product="Ultimaker 2 Extended+"/>
<hotend id="0.25 mm" /> <hotend id="0.25 mm" />
<hotend id="0.4 mm" /> <hotend id="0.4 mm" />
<hotend id="0.6 mm" /> <hotend id="0.6 mm" />
<hotend id="0.8 mm" /> <hotend id="0.8 mm" />
</machine> </machine>
<machine>
<machine_identifier manufacturer="Ultimaker" product="Ultimaker 2"/>
<machine_identifier manufacturer="Ultimaker" product="Ultimaker 2 Go"/>
<machine_identifier manufacturer="Ultimaker" product="Ultimaker 2 Extended"/>
<setting key="standby temperature">150</setting>
<setting key="processing temperature graph">
<point flow="2" temperature="180"/>
<point flow="10" temperature="230"/>
</setting>
</machine>
<machine>
<machine_identifier manufacturer="Ultimaker" product="Ultimaker Original"/>
<setting key="standby temperature">150</setting>
</machine>
</settings> </settings>
</fdmmaterial> </fdmmaterial>

36
resources/qml/SidebarSimple.qml
View file

@ -213,7 +213,7 @@ Item
id: adhesionHelperLabel id: adhesionHelperLabel
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: UM.Theme.getSize("default_margin").width anchors.leftMargin: UM.Theme.getSize("default_margin").width
anchors.verticalCenter: brimCheckBox.verticalCenter anchors.verticalCenter: adhesionCheckBox.verticalCenter
width: parent.width / 100 * 35 - 3 * UM.Theme.getSize("default_margin").width width: parent.width / 100 * 35 - 3 * UM.Theme.getSize("default_margin").width
//: Bed adhesion label //: Bed adhesion label
text: catalog.i18nc("@label", "Helper Parts:"); text: catalog.i18nc("@label", "Helper Parts:");
@ -222,33 +222,45 @@ Item
} }
CheckBox{ CheckBox{
id: brimCheckBox id: adhesionCheckBox
property alias _hovered: brimMouseArea.containsMouse property alias _hovered: adhesionMouseArea.containsMouse
anchors.top: parent.top anchors.top: parent.top
anchors.left: adhesionHelperLabel.right anchors.left: adhesionHelperLabel.right
anchors.leftMargin: UM.Theme.getSize("default_margin").width anchors.leftMargin: UM.Theme.getSize("default_margin").width
//: Setting enable skirt adhesion checkbox //: Setting enable printing build-plate adhesion helper checkbox
text: catalog.i18nc("@option:check", "Print Brim"); text: catalog.i18nc("@option:check", "Print Build Plate Adhesion");
style: UM.Theme.styles.checkbox; style: UM.Theme.styles.checkbox;
enabled: base.settingsEnabled enabled: base.settingsEnabled
checked: platformAdhesionType.properties.value == "brim" checked: platformAdhesionType.properties.value != "skirt"
MouseArea { MouseArea {
id: brimMouseArea id: adhesionMouseArea
anchors.fill: parent anchors.fill: parent
hoverEnabled: true hoverEnabled: true
enabled: base.settingsEnabled enabled: base.settingsEnabled
onClicked: onClicked:
{ {
platformAdhesionType.setPropertyValue("value", !parent.checked ? "brim" : "skirt") var adhesionType = "skirt";
if(!parent.checked)
{
// Remove the "user" setting to see if the rest of the stack prescribes a brim or a raft
platformAdhesionType.removeFromContainer(0);
adhesionType = platformAdhesionType.properties.value;
if(adhesionType == "skirt")
{
// If the rest of the stack doesn't prescribe an adhesion-type, default to a brim
adhesionType = "brim";
}
}
platformAdhesionType.setPropertyValue("value", adhesionType);
} }
onEntered: onEntered:
{ {
base.showTooltip(brimCheckBox, Qt.point(-brimCheckBox.x, 0), base.showTooltip(adhesionCheckBox, Qt.point(-adhesionCheckBox.x, 0),
catalog.i18nc("@label", "Enable printing a brim. This will add a single-layer-thick flat area around your object which is easy to cut off afterwards.")); catalog.i18nc("@label", "Enable printing a brim or raft. This will add a flat area around or under your object which is easy to cut off afterwards."));
} }
onExited: onExited:
{ {
@ -274,7 +286,7 @@ Item
visible: machineExtruderCount.properties.value <= 1 visible: machineExtruderCount.properties.value <= 1
property alias _hovered: supportMouseArea.containsMouse property alias _hovered: supportMouseArea.containsMouse
anchors.top: brimCheckBox.bottom anchors.top: adhesionCheckBox.bottom
anchors.topMargin: UM.Theme.getSize("default_margin").height anchors.topMargin: UM.Theme.getSize("default_margin").height
anchors.left: supportHelperLabel.right anchors.left: supportHelperLabel.right
anchors.leftMargin: UM.Theme.getSize("default_margin").width anchors.leftMargin: UM.Theme.getSize("default_margin").width
@ -311,7 +323,7 @@ Item
visible: machineExtruderCount.properties.value > 1 visible: machineExtruderCount.properties.value > 1
model: extruderModel model: extruderModel
anchors.top: brimCheckBox.bottom anchors.top: adhesionCheckBox.bottom
anchors.topMargin: UM.Theme.getSize("default_margin").height anchors.topMargin: UM.Theme.getSize("default_margin").height
anchors.left: supportHelperLabel.right anchors.left: supportHelperLabel.right
anchors.leftMargin: UM.Theme.getSize("default_margin").width anchors.leftMargin: UM.Theme.getSize("default_margin").width