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

More making printerConnection passed to classes.

Browse source 
Made the speeds for movement controls be extensions methods on PrinterSettings
TODO: Why on ExportPrintItemPage was that if the leveling turned on or off we would show the check box by rebuilding that window.
This commit is contained in:
Lars Brubaker 2017-09-05 10:33:14 -07:00
parent 586dbb43ba
commit b39666634a
34 changed files with 353 additions and 310 deletions
Download patch file Download diff file Expand all files Collapse all files

8
PartPreviewWindow/PrinterTabPage.cs
View file

@ -274,8 +274,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
1,
new Vector2[]
{
ActiveSliceSettings.Instance.Helpers.ExtruderOffset(0),
ActiveSliceSettings.Instance.Helpers.ExtruderOffset(1)
printerConnection.PrinterSettings.Helpers.ExtruderOffset(0),
printerConnection.PrinterSettings.Helpers.ExtruderOffset(1)
},
this.GetRenderType,
MeshViewerWidget.GetExtruderColor);
@ -476,7 +476,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
popupContainer.AddChild(transparentExtrusion);
// Extrusion checkbox
if (ActiveSliceSettings.Instance.GetValue<int>(SettingsKey.extruder_count) > 1)
if (printerConnection.PrinterSettings.GetValue<int>(SettingsKey.extruder_count) > 1)
{
CheckBox hideExtruderOffsets = new CheckBox("Hide Offsets", textColor: textColor);
hideExtruderOffsets.Checked = gcodeOptions.HideExtruderOffsets;
@ -586,7 +586,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
};
parent.AddChild(sideBar);
if (ActiveSliceSettings.Instance.PrinterSelected)
if (printerConnection.PrinterSettings.PrinterSelected)
{
sideBar.AddPage("Slice Settings".Localize(), new SliceSettingsWidget(printerConnection));
}

10
PartPreviewWindow/View3D/PrinterActionsBar.cs
View file

@ -105,11 +105,11 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
sliceButton.Margin = defaultMargin;
sliceButton.Click += async (s, e) =>
{
if (ActiveSliceSettings.Instance.PrinterSelected)
if (printerConnection.PrinterSettings.PrinterSelected)
{
var printItem = ApplicationController.Instance.ActivePrintItem;
if (ActiveSliceSettings.Instance.IsValid() && printItem != null)
if (printerConnection.PrinterSettings.IsValid() && printItem != null)
{
sliceButton.Enabled = false;
@ -172,7 +172,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
Margin = new BorderDouble(right: 10)
});
if (ActiveSliceSettings.Instance.GetValue<bool>(SettingsKey.has_heated_bed))
if (printerConnection.PrinterSettings.GetValue<bool>(SettingsKey.has_heated_bed))
{
this.AddChild(new TemperatureWidgetBed(printerConnection));
}
@ -209,7 +209,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
private GuiWidget GeneratePrinterOverflowMenu()
{
var printerSettings = ActiveSliceSettings.Instance;
var printerSettings = printerConnection.PrinterSettings;
var menuActions = new NamedAction[]
{
@ -249,7 +249,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
{
if (doDelete)
{
ActiveSliceSettings.Instance.Helpers.SetMarkedForDelete(true);
printerConnection.PrinterSettings.Helpers.SetMarkedForDelete(true);
}
},
"Are you sure you want to delete your currently selected printer?".Localize(),