3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-26 12:21:26 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 20

Merge branch '2.6'

Browse source
This commit is contained in:
Ghostkeeper 2017-06-14 10:58:11 +02:00
commit 8bce6e060c
No known key found for this signature in database
GPG key ID: C5F96EE2BC0F7E75
9 changed files with 90 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/qml/Menus/MaterialMenu.qml
View file

@ -150,7 +150,7 @@ Menu
function materialFilter()
{
var result = { "type": "material", "approximate_diameter": Math.round(materialDiameterProvider.properties.value) };
var result = { "type": "material", "approximate_diameter": Math.round(materialDiameterProvider.properties.value).toString() };
if(Cura.MachineManager.filterMaterialsByMachine)
{
result.definition = Cura.MachineManager.activeQualityDefinitionId;

5
resources/qml/Preferences/GeneralPage.qml
View file

@ -152,9 +152,10 @@ UM.PreferencesPage
append({ text: "Suomi", code: "fi" })
append({ text: "Français", code: "fr" })
append({ text: "Italiano", code: "it" })
append({ text: "日本語", code: "jp" })
//append({ text: "日本語", code: "jp" })
//append({ text: "한국어", code: "ko" })
append({ text: "Nederlands", code: "nl" })
append({ text: "Português do Brasil", code: "ptbr" })
//append({ text: "Português do Brasil", code: "ptbr" })
append({ text: "Русский", code: "ru" })
append({ text: "Türkçe", code: "tr" })
}

9
resources/qml/Preferences/MaterialView.qml
View file

@ -164,7 +164,14 @@ TabView
stepSize: 0.01
readOnly: !base.editingEnabled
onEditingFinished: base.setMetaDataEntry("properties/diameter", properties.diameter, value)
onEditingFinished:
{
// This does not use a SettingPropertyProvider, because we need to make the change to all containers
// which derive from the same base_file
base.setMetaDataEntry("approximate_diameter", properties.approximate_diameter, Math.round(value).toString());
base.setMetaDataEntry("properties/diameter", properties.diameter, value);
Cura.ContainerManager.setContainerProperty(base.containerId, "material_diameter", "value", value);
}
onValueChanged: updateCostPerMeter()
}

5
resources/qml/Preferences/MaterialsPage.qml
View file

@ -24,7 +24,7 @@ UM.ManagementPage
{
filter:
{
var result = { "type": "material", "approximate_diameter": Math.round(materialDiameterProvider.properties.value) }
var result = { "type": "material", "approximate_diameter": Math.round(materialDiameterProvider.properties.value).toString() }
if(Cura.MachineManager.filterMaterialsByMachine)
{
result.definition = Cura.MachineManager.activeQualityDefinitionId;
@ -253,6 +253,7 @@ UM.ManagementPage
property real density: 0.0;
property real diameter: 0.0;
property string approximate_diameter: "0";
property real spool_cost: 0.0;
property real spool_weight: 0.0;
@ -397,11 +398,13 @@ UM.ManagementPage
{
materialProperties.density = currentItem.metadata.properties.density ? currentItem.metadata.properties.density : 0.0;
materialProperties.diameter = currentItem.metadata.properties.diameter ? currentItem.metadata.properties.diameter : 0.0;
materialProperties.approximate_diameter = currentItem.metadata.approximate_diameter ? currentItem.metadata.approximate_diameter : "0";
}
else
{
materialProperties.density = 0.0;
materialProperties.diameter = 0.0;
materialProperties.approximate_diameter = "0";
}
}