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

Allow editing head polygon

Browse source
This commit is contained in:
fieldOfView 2016-08-03 18:50:07 +02:00
parent 9a0e78ff46
commit 6a8aa15678
1 changed files with 47 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

59
MachineSettingsAction.qml
View file

@ -155,14 +155,14 @@ Cura.MachineAction
Label Label
{ {
text: catalog.i18nc("@label","X (Width)") text: catalog.i18nc("@label","X min")
} }
TextField TextField
{ {
id: printheadXMinField id: printheadXMinField
text: "" text: getHeadPolygonCoord("x", "min")
validator: RegExpValidator { regExp: /[0-9]{0,6}/ } validator: RegExpValidator { regExp: /[0-9]{0,6}/ }
onEditingFinished: { } onEditingFinished: setHeadPolygon()
} }
Label Label
{ {
@ -171,14 +171,14 @@ Cura.MachineAction
Label Label
{ {
text: catalog.i18nc("@label","X (Width)") text: catalog.i18nc("@label","Y min")
} }
TextField TextField
{ {
id: printheadYMinField id: printheadYMinField
text: "" text: getHeadPolygonCoord("y", "min")
validator: RegExpValidator { regExp: /[0-9]{0,6}/ } validator: RegExpValidator { regExp: /[0-9]{0,6}/ }
onEditingFinished: { } onEditingFinished: setHeadPolygon()
} }
Label Label
{ {
@ -187,14 +187,14 @@ Cura.MachineAction
Label Label
{ {
text: catalog.i18nc("@label","X (Width)") text: catalog.i18nc("@label","X max")
} }
TextField TextField
{ {
id: printheadXMaxField id: printheadXMaxField
text: "" text: getHeadPolygonCoord("x", "max")
validator: RegExpValidator { regExp: /[0-9]{0,6}/ } validator: RegExpValidator { regExp: /[0-9]{0,6}/ }
onEditingFinished: { } onEditingFinished: setHeadPolygon()
} }
Label Label
{ {
@ -203,14 +203,14 @@ Cura.MachineAction
Label Label
{ {
text: catalog.i18nc("@label","X (Width)") text: catalog.i18nc("@label","Y max")
} }
TextField TextField
{ {
id: printheadYMaxField id: printheadYMaxField
text: "" text: getHeadPolygonCoord("y", "max")
validator: RegExpValidator { regExp: /[0-9]{0,6}/ } validator: RegExpValidator { regExp: /[0-9]{0,6}/ }
onEditingFinished: { } onEditingFinished: setHeadPolygon()
} }
Label Label
{ {
@ -315,6 +315,31 @@ Cura.MachineAction
} }
} }
function getHeadPolygonCoord(axis, minMax)
{
var polygon = JSON.parse(machineHeadPolygonProvider.properties.value);
var item = (axis == "x") ? 0 : 1
var result = polygon[0][item];
for(var i = 1; i < polygon.length; i++) {
if (minMax == "min") {
result = Math.min(result, polygon[i][item]);
} else {
result = Math.max(result, polygon[i][item]);
}
}
return Math.abs(result);
}
function setHeadPolygon()
{
var polygon = [];
polygon.push([-parseFloat(printheadXMinField.text),-parseFloat(printheadYMinField.text)]);
polygon.push([-parseFloat(printheadXMinField.text), parseFloat(printheadYMaxField.text)]);
polygon.push([ parseFloat(printheadXMaxField.text), parseFloat(printheadYMaxField.text)]);
polygon.push([ parseFloat(printheadXMaxField.text),-parseFloat(printheadYMinField.text)]);
machineHeadPolygonProvider.setPropertyValue("value", JSON.stringify(polygon));
}
UM.SettingPropertyProvider UM.SettingPropertyProvider
{ {
id: machineWidthProvider id: machineWidthProvider
@ -385,6 +410,16 @@ Cura.MachineAction
storeIndex: 3 storeIndex: 3
} }
UM.SettingPropertyProvider
{
id: machineHeadPolygonProvider
containerStackId: Cura.MachineManager.activeMachineId
key: "machine_head_with_fans_polygon"
watchedProperties: [ "value" ]
storeIndex: 3
}
UM.SettingPropertyProvider UM.SettingPropertyProvider
{ {