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

Json Profiles

Browse source
This commit is contained in:
John Lewin 2016-04-18 11:31:31 -07:00
parent bfa2ddafd8
commit 4496720772
93 changed files with 3069 additions and 4120 deletions
Download patch file Download diff file Expand all files Collapse all files

12
ConfigurationPage/CalibrationSettings/CalibrationSettingsView.cs
View file

@ -92,12 +92,12 @@ namespace MatterHackers.MatterControl.ConfigurationPage
ImageWidget levelingIcon = new ImageWidget(levelingImage);
levelingIcon.Margin = new BorderDouble(right: 6);
CheckBox printLevelingSwitch = ImageButtonFactory.CreateToggleSwitch(ActivePrinterProfile.Instance.DoPrintLeveling);
CheckBox printLevelingSwitch = ImageButtonFactory.CreateToggleSwitch(ActiveSliceSettings.Instance.DoPrintLeveling);
printLevelingSwitch.VAnchor = VAnchor.ParentCenter;
printLevelingSwitch.Margin = new BorderDouble(left: 16);
printLevelingSwitch.CheckedStateChanged += (sender, e) =>
{
ActivePrinterProfile.Instance.DoPrintLeveling = printLevelingSwitch.Checked;
ActiveSliceSettings.Instance.DoPrintLeveling = printLevelingSwitch.Checked;
};
printLevelingStatusLabel = new TextWidget("");
@ -105,10 +105,10 @@ namespace MatterHackers.MatterControl.ConfigurationPage
printLevelingStatusLabel.TextColor = ActiveTheme.Instance.PrimaryTextColor;
printLevelingStatusLabel.VAnchor = VAnchor.ParentCenter;
ActivePrinterProfile.Instance.DoPrintLevelingChanged.RegisterEvent((sender, e) =>
ActiveSliceSettings.Instance.DoPrintLevelingChanged.RegisterEvent((sender, e) =>
{
SetPrintLevelButtonVisiblity();
printLevelingSwitch.Checked = ActivePrinterProfile.Instance.DoPrintLeveling;
printLevelingSwitch.Checked = ActiveSliceSettings.Instance.DoPrintLeveling;
}, ref unregisterEvents);
buttonRow.AddChild(levelingIcon);
@ -284,7 +284,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage
private void SetPrintLevelButtonVisiblity()
{
if (ActivePrinterProfile.Instance.DoPrintLeveling)
if (ActiveSliceSettings.Instance.DoPrintLeveling)
{
printLevelingStatusLabel.Text = "Software Print Leveling (enabled)".Localize();
}
@ -302,7 +302,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage
currentStatus == PrinterConnectionAndCommunication.CommunicationStates.Connected ||
currentStatus == PrinterConnectionAndCommunication.CommunicationStates.FinishedPrint;
if (ActivePrinterProfile.Instance.ActivePrinter == null || !connected)
if (ActiveSliceSettings.Instance == null || !connected)
{
printLevelingContainer.SetEnableLevel(DisableableWidget.EnableLevel.Disabled);
}