nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use auto property, sync param and property naming

Browse source
This commit is contained in:
John Lewin 2019-01-06 19:11:55 -08:00
parent 04e5836915
commit 3ce3cddd19
1 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
MatterControlLib/SlicerConfiguration/MappingClasses/AsPercentOfReferenceOrDirect.cs
View file

@ -32,18 +32,17 @@ namespace MatterHackers.MatterControl.SlicerConfiguration.MappingClasses
public class AsPercentOfReferenceOrDirect : MappedSetting
{
private bool change0ToReference;
private string originalReference;
private double scale;
public AsPercentOfReferenceOrDirect(PrinterConfig printer, string canonicalSettingsName, string exportedName, string originalReference, double scale = 1, bool change0ToReference = true)
public AsPercentOfReferenceOrDirect(PrinterConfig printer, string canonicalSettingsName, string exportedName, string referencedSetting, double scale = 1, bool change0ToReference = true)
: base(printer, canonicalSettingsName, exportedName)
{
this.change0ToReference = change0ToReference;
this.scale = scale;
this.originalReference = originalReference;
this.ReferencedSetting = referencedSetting;
}
public string ReferencedSetting => originalReference;
public string ReferencedSetting { get; }
public override string Value
{
@ -54,7 +53,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration.MappingClasses
{
string withoutPercent = base.Value.Replace("%", "");
double ratio = ParseDouble(withoutPercent) / 100.0;
string originalReferenceString = printer.Settings.GetValue(originalReference);
string originalReferenceString = printer.Settings.GetValue(this.ReferencedSetting);
double valueToModify = ParseDouble(originalReferenceString);
finalValue = valueToModify * ratio;
}
@ -66,7 +65,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration.MappingClasses
if (change0ToReference
&& finalValue == 0)
{
finalValue = ParseDouble(printer.Settings.GetValue(originalReference));
finalValue = ParseDouble(printer.Settings.GetValue(ReferencedSetting));
}
finalValue *= scale;