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

Consolidate SettingsProfile and PrinterSettings types

Browse source
This commit is contained in:
John Lewin 2016-07-18 15:20:19 -07:00
parent f304e9f3d6
commit 42f133aa70
14 changed files with 837 additions and 937 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ConfigurationPage/PrintLeveling/PrintLevelingData.cs
View file

@ -10,7 +10,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
{
public class PrintLevelingData
{
private SettingsProfile settingsProfile;
private PrinterSettings settingsProfile;
public List<Vector3> SampledPositions = new List<Vector3>();
@ -27,7 +27,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
[JsonConverter(typeof(StringEnumConverter))]
public enum LevelingSystem { Probe3Points, Probe2Points, Probe7PointRadial, Probe13PointRadial }
public PrintLevelingData(SettingsProfile settingsProfile)
public PrintLevelingData(PrinterSettings settingsProfile)
{
this.settingsProfile = settingsProfile;
}
@ -114,7 +114,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
}
}
internal static PrintLevelingData Create(SettingsProfile settingsProfile, string jsonData, string depricatedPositionsCsv3ByXYZ)
internal static PrintLevelingData Create(PrinterSettings settingsProfile, string jsonData, string depricatedPositionsCsv3ByXYZ)
{
if (!string.IsNullOrEmpty(jsonData))
{