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

Don't update the global container stack unnecessarily

Browse source
This commit is contained in:
fieldOfView 2017-04-10 13:36:16 +02:00
parent 064f744bc0
commit 7bad718823
1 changed files with 44 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

59
plugins/MachineSettingsAction/MachineSettingsAction.qml
View file

@ -100,7 +100,14 @@ Cura.MachineAction
id: buildAreaWidthField id: buildAreaWidthField
text: machineWidthProvider.properties.value text: machineWidthProvider.properties.value
validator: RegExpValidator { regExp: /[0-9\.]{0,6}/ } validator: RegExpValidator { regExp: /[0-9\.]{0,6}/ }
onEditingFinished: { machineWidthProvider.setPropertyValue("value", text); manager.forceUpdate() } onEditingFinished:
{
if (text != machineWidthProvider.properties.value)
{
machineWidthProvider.setPropertyValue("value", text);
manager.forceUpdate();
}
}
} }
Label Label
{ {
@ -116,7 +123,13 @@ Cura.MachineAction
id: buildAreaDepthField id: buildAreaDepthField
text: machineDepthProvider.properties.value text: machineDepthProvider.properties.value
validator: RegExpValidator { regExp: /[0-9\.]{0,6}/ } validator: RegExpValidator { regExp: /[0-9\.]{0,6}/ }
onEditingFinished: { machineDepthProvider.setPropertyValue("value", text); manager.forceUpdate() } onEditingFinished: {
if (text != machineDepthProvider.properties.value)
{
machineDepthProvider.setPropertyValue("value", text);
manager.forceUpdate();
}
}
} }
Label Label
{ {
@ -132,7 +145,13 @@ Cura.MachineAction
id: buildAreaHeightField id: buildAreaHeightField
text: machineHeightProvider.properties.value text: machineHeightProvider.properties.value
validator: RegExpValidator { regExp: /[0-9\.]{0,6}/ } validator: RegExpValidator { regExp: /[0-9\.]{0,6}/ }
onEditingFinished: { machineHeightProvider.setPropertyValue("value", text); manager.forceUpdate() } onEditingFinished: {
if (text != machineHeightProvider.properties.value)
{
machineHeightProvider.setPropertyValue("value", text);
manager.forceUpdate();
}
}
} }
Label Label
{ {
@ -187,8 +206,11 @@ Cura.MachineAction
} }
onActivated: onActivated:
{ {
machineShapeProvider.setPropertyValue("value", shapesModel.get(index).value); if(machineShapeProvider.properties.value != shapesModel.get(index).value)
manager.forceUpdate(); {
machineShapeProvider.setPropertyValue("value", shapesModel.get(index).value);
manager.forceUpdate();
}
} }
} }
} }
@ -392,6 +414,11 @@ Cura.MachineAction
currentIndex: machineExtruderCountProvider.properties.value - 1 currentIndex: machineExtruderCountProvider.properties.value - 1
onActivated: onActivated:
{ {
if(machineExtruderCountProvider.properties.value == index + 1)
{
return;
}
machineExtruderCountProvider.setPropertyValue("value", index + 1); machineExtruderCountProvider.setPropertyValue("value", index + 1);
manager.forceUpdate(); manager.forceUpdate();
base.extruderTabsCount = (index > 0) ? index + 1 : 0; base.extruderTabsCount = (index > 0) ? index + 1 : 0;
@ -503,7 +530,7 @@ Cura.MachineAction
{ {
if(currentIndex > 0) if(currentIndex > 0)
{ {
ExtruderManager.setActiveExtruderIndex(settingsTabs.getTab(currentIndex).extruderIndex); ExtruderManager.setActiveExtruderIndex(currentIndex - 1);
} }
} }
@ -517,8 +544,6 @@ Cura.MachineAction
title: base.extrudersModel.getItem(index).name title: base.extrudersModel.getItem(index).name
anchors.margins: UM.Theme.getSize("default_margin").width anchors.margins: UM.Theme.getSize("default_margin").width
property int extruderIndex: index
Column Column
{ {
spacing: UM.Theme.getSize("default_margin").width spacing: UM.Theme.getSize("default_margin").width
@ -668,8 +693,12 @@ Cura.MachineAction
polygon.push([-parseFloat(printheadXMinField.text),-parseFloat(printheadYMinField.text)]); polygon.push([-parseFloat(printheadXMinField.text),-parseFloat(printheadYMinField.text)]);
polygon.push([ parseFloat(printheadXMaxField.text), parseFloat(printheadYMaxField.text)]); polygon.push([ parseFloat(printheadXMaxField.text), parseFloat(printheadYMaxField.text)]);
polygon.push([ parseFloat(printheadXMaxField.text),-parseFloat(printheadYMinField.text)]); polygon.push([ parseFloat(printheadXMaxField.text),-parseFloat(printheadYMinField.text)]);
machineHeadPolygonProvider.setPropertyValue("value", JSON.stringify(polygon)); var polygon_string = JSON.stringify(polygon);
manager.forceUpdate(); if(polygon != machineHeadPolygonProvider.properties.value)
{
machineHeadPolygonProvider.setPropertyValue("value", polygon_string);
manager.forceUpdate();
}
} }
UM.SettingPropertyProvider UM.SettingPropertyProvider
@ -807,7 +836,7 @@ Cura.MachineAction
{ {
id: extruderNozzleSizeProvider id: extruderNozzleSizeProvider
containerStackId: Cura.ExtruderManager.activeExtruderIndex > 0 ? Cura.MachineManager.activeStackId : "" containerStackId: ExtruderManager.activeExtruderIndex > 0 ? Cura.MachineManager.activeStackId : ""
key: "machine_nozzle_size" key: "machine_nozzle_size"
watchedProperties: [ "value" ] watchedProperties: [ "value" ]
storeIndex: manager.containerIndex storeIndex: manager.containerIndex
@ -817,7 +846,7 @@ Cura.MachineAction
{ {
id: extruderOffsetXProvider id: extruderOffsetXProvider
containerStackId: Cura.ExtruderManager.activeExtruderIndex > 0 ? Cura.MachineManager.activeStackId : "" containerStackId: ExtruderManager.activeExtruderIndex > 0 ? Cura.MachineManager.activeStackId : ""
key: "machine_nozzle_offset_x" key: "machine_nozzle_offset_x"
watchedProperties: [ "value" ] watchedProperties: [ "value" ]
storeIndex: manager.containerIndex storeIndex: manager.containerIndex
@ -827,7 +856,7 @@ Cura.MachineAction
{ {
id: extruderOffsetYProvider id: extruderOffsetYProvider
containerStackId: Cura.ExtruderManager.activeExtruderIndex > 0 ? Cura.MachineManager.activeStackId : "" containerStackId: ExtruderManager.activeExtruderIndex > 0 ? Cura.MachineManager.activeStackId : ""
key: "machine_nozzle_offset_y" key: "machine_nozzle_offset_y"
watchedProperties: [ "value" ] watchedProperties: [ "value" ]
storeIndex: manager.containerIndex storeIndex: manager.containerIndex
@ -837,7 +866,7 @@ Cura.MachineAction
{ {
id: extruderStartGcodeProvider id: extruderStartGcodeProvider
containerStackId: Cura.ExtruderManager.activeExtruderIndex > 0 ? Cura.MachineManager.activeStackId : "" containerStackId: ExtruderManager.activeExtruderIndex > 0 ? Cura.MachineManager.activeStackId : ""
key: "machine_extruder_start_code" key: "machine_extruder_start_code"
watchedProperties: [ "value" ] watchedProperties: [ "value" ]
storeIndex: manager.containerIndex storeIndex: manager.containerIndex
@ -847,7 +876,7 @@ Cura.MachineAction
{ {
id: extruderEndGcodeProvider id: extruderEndGcodeProvider
containerStackId: Cura.ExtruderManager.activeExtruderIndex > 0 ? Cura.MachineManager.activeStackId : "" containerStackId: ExtruderManager.activeExtruderIndex > 0 ? Cura.MachineManager.activeStackId : ""
key: "machine_extruder_end_code" key: "machine_extruder_end_code"
watchedProperties: [ "value" ] watchedProperties: [ "value" ]
storeIndex: manager.containerIndex storeIndex: manager.containerIndex