diff --git a/PartPreviewWindow/ViewGcodeBasic.cs b/PartPreviewWindow/ViewGcodeBasic.cs index 169b6ebfe..4accde35e 100644 --- a/PartPreviewWindow/ViewGcodeBasic.cs +++ b/PartPreviewWindow/ViewGcodeBasic.cs @@ -519,19 +519,19 @@ namespace MatterHackers.MatterControl.PartPreviewWindow string costLabel = "Estimated Cost".Localize(); string costLabelFull = string.Format("{0}:", costLabel); - modelInfoContainer.AddChild(new TextWidget(costLabelFull, pointSize: 9, textColor: ActiveTheme.Instance.PrimaryTextColor)); + if (totalCost != 0) { - string costText; - if (totalCost != 0) { + modelInfoContainer.AddChild(new TextWidget(costLabelFull, pointSize: 9, textColor: ActiveTheme.Instance.PrimaryTextColor)); + { + string costText; costText = string.Format("${0:0.00}", totalCost); - } else { - costText = "Unknown"; - } - GuiWidget estimatedPrintTime = new TextWidget(costText, pointSize: 14, textColor: ActiveTheme.Instance.PrimaryTextColor); - //estimatedPrintTime.HAnchor = Agg.UI.HAnchor.ParentLeft; - estimatedPrintTime.Margin = new BorderDouble(0, 9, 0, 3); - modelInfoContainer.AddChild(estimatedPrintTime); + + GuiWidget estimatedPrintTime = new TextWidget(costText, pointSize: 14, textColor: ActiveTheme.Instance.PrimaryTextColor); + //estimatedPrintTime.HAnchor = Agg.UI.HAnchor.ParentLeft; + estimatedPrintTime.Margin = new BorderDouble(0, 9, 0, 3); + modelInfoContainer.AddChild(estimatedPrintTime); + } } //modelInfoContainer.AddChild(new TextWidget("Layer Count:", textColor: ActiveTheme.Instance.PrimaryTextColor)); diff --git a/StaticData/SliceSettings/Layouts.txt b/StaticData/SliceSettings/Layouts.txt index 90408b232..c4053ffe9 100644 --- a/StaticData/SliceSettings/Layouts.txt +++ b/StaticData/SliceSettings/Layouts.txt @@ -50,6 +50,8 @@ Intermediate Filament Filament filament_diameter + filament_density + filament_cost Extruder Temperatures first_layer_temperature temperature diff --git a/StaticData/SliceSettings/Properties.json b/StaticData/SliceSettings/Properties.json index 04a2468b4..769b4938f 100644 --- a/StaticData/SliceSettings/Properties.json +++ b/StaticData/SliceSettings/Properties.json @@ -546,10 +546,19 @@ "ShowAsOverride": true, "ShowIfSet": null, "ResetAtEndOfPrint": false, - "DefaultValue": "0.00" + "DefaultValue": "0" }, { - "QuickMenuSettings": [], + "QuickMenuSettings": [ + { + "MenuName": "PLA", + "Value": "1.24" + }, + { + "MenuName": "ABS", + "Value": "1.04" + } + ], "SetSettingsOnChange": [], "SlicerConfigName": "filament_density", "PresentationName": "Density", @@ -559,7 +568,7 @@ "ShowAsOverride": true, "ShowIfSet": null, "ResetAtEndOfPrint": false, - "DefaultValue": "0.00" + "DefaultValue": "1.24" }, { "QuickMenuSettings": [], diff --git a/StaticData/Translations/Master.txt b/StaticData/Translations/Master.txt index 4862fa2c4..70aef1d0c 100644 --- a/StaticData/Translations/Master.txt +++ b/StaticData/Translations/Master.txt @@ -5116,3 +5116,27 @@ Translated:Email Address English:A password reset code will be sent to your email. Translated:A password reset code will be sent to your email. +English:The price of one kilogram of filament. Used for estimating the cost of a print in the Layer View. +Translated:The price of one kilogram of filament. Used for estimating the cost of a print in the Layer View. + +English:Material density. Only used for estimating mass in the Layer View. +Translated:Material density. Only used for estimating mass in the Layer View. + +English:Estimated Cost +Translated:Estimated Cost + +English:Density +Translated:Density + +English:g/cm³ +Translated:g/cm³ + +English:Cost +Translated:Cost + +English:$/kg +Translated:$/kg + +English:OEM Date Modified +Translated:OEM Date Modified +