GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-11 07:29:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove unnecessary eval() construct

Browse Source
This commit is contained in:
fieldOfView 2017-07-10 13:25:08 +02:00
parent 79e38407c8
commit aa7ab2e0a7
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
plugins/MachineSettingsAction/MachineSettingsAction.qml
View File

@ -189,7 +189,7 @@ Cura.MachineAction
sourceComponent: comboBoxWithOptions
property string settingKey: "machine_gcode_flavor"
property bool forceUpdateOnChange: true
property string afterOnActivate: "manager.updateHasMaterialsMetadata()"
property var afterOnActivate: manager.updateHasMaterialsMetadata
}
}
}
@ -329,7 +329,7 @@ Cura.MachineAction
property string settingKey: "material_diameter"
property string unit: catalog.i18nc("@label", "mm")
property string tooltip: catalog.i18nc("@tooltip", "The nominal diameter of filament supported by the printer. The exact diameter will be overridden by the material and/or the profile.")
property string afterOnEditingFinished: "manager.updateMaterialForDiameter()"
property var afterOnEditingFinished: manager.updateMaterialForDiameter
}
Label
{
@ -587,7 +587,7 @@ Cura.MachineAction
property bool _isExtruderSetting: (typeof(isExtruderSetting) === 'undefined') ? false: isExtruderSetting
property bool _allowNegative: (typeof(allowNegative) === 'undefined') ? false : allowNegative
property string _afterOnEditingFinished: (typeof(afterOnEditingFinished) === 'undefined') ? "": afterOnEditingFinished
property var _afterOnEditingFinished: (typeof(afterOnEditingFinished) === 'undefined') ? undefined : afterOnEditingFinished
property bool _forceUpdateOnChange: (typeof(forceUpdateOnChange) === 'undefined') ? false : forceUpdateOnChange
property string _tooltip: (typeof(tooltip) === 'undefined') ? propertyProvider.properties.description : tooltip
@ -630,9 +630,9 @@ Cura.MachineAction
ExtruderManager.setActiveExtruderIndex(extruderIndex)
}
}
if(_afterOnEditingFinished != "")
if(_afterOnEditingFinished)
{
eval(_afterOnEditingFinished);
_afterOnEditingFinished();
}
}
}
@ -659,7 +659,7 @@ Cura.MachineAction
property bool _isExtruderSetting: (typeof(isExtruderSetting) === 'undefined') ? false : isExtruderSetting
property bool _forceUpdateOnChange: (typeof(forceUpdateOnChange) === 'undefined') ? false : forceUpdateOnChange
property string _afterOnActivate: (typeof(afterOnActivate) === 'undefined') ? "": afterOnActivate
property var _afterOnActivate: (typeof(afterOnActivate) === 'undefined') ? undefined : afterOnActivate
property string _tooltip: (typeof(tooltip) === 'undefined') ? propertyProvider.properties.description : tooltip
UM.SettingPropertyProvider
@ -725,9 +725,9 @@ Cura.MachineAction
{
manager.forceUpdate();
}
if(_afterOnActivate != "")
if(_afterOnActivate)
{
eval(_afterOnActivate);
_afterOnActivate();
}
}
}