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

Starting work on the Update Settings page

Browse source
This commit is contained in:
LarsBrubaker 2020-08-28 13:51:20 -07:00
parent 607a9d7b58
commit 2e958fda5d
8 changed files with 425 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

47
MatterControlLib/ApplicationView/SettingsValidation.cs
View file

@ -90,47 +90,22 @@ namespace MatterHackers.MatterControl
// Check to see if current OEM layer matches downloaded OEM layer
{
var make = printer.Settings.GetValue(SettingsKey.make);
var model = printer.Settings.GetValue(SettingsKey.model);
var serverOemSettings = ProfileManager.LoadOemSettingsAsync(OemSettings.Instance.OemProfiles[make][model],
make,
model).Result;
var ignoreSettings = new HashSet<string>()
if (ProfileManager.GetOemSettingsNeedingUpdate(printer).Any())
{
SettingsKey.created_date,
};
foreach (var localOemSetting in printer.Settings.OemLayer)
{
if (!ignoreSettings.Contains(localOemSetting.Key)
&& !PrinterSettingsExtensions.SettingsToReset.ContainsKey(localOemSetting.Key)
&& serverOemSettings.GetValue(localOemSetting.Key) != localOemSetting.Value)
errors.Add(new ValidationError(ValidationErrors.SettingsUpdateAvailable)
{
errors.Add(new ValidationError(ValidationErrors.SettingsUpdateAvailable)
Error = "Settings Update Available".Localize(),
Details = "The default settings for this printer have changed and can be updated".Localize(),
ErrorLevel = ValidationErrorLevel.Warning,
FixAction = new NamedAction()
{
Error = "Settings Update Available".Localize(),
Details = "The default settings for this printer have changed and can be updated".Localize(),
ErrorLevel = ValidationErrorLevel.Warning,
FixAction = new NamedAction()
Title = "Update Settings...".Localize(),
Action = () =>
{
Title = "Update Settings...".Localize(),
Action = () =>
{
// Find and InvokeClick on the Generate Supports toolbar button
var sharedParent = ApplicationController.Instance.DragDropData.View3DWidget.Parents<GuiWidget>().FirstOrDefault(w => w.Name == "View3DContainerParent");
if (sharedParent != null)
{
var supportsPopup = sharedParent.FindDescendant("Support SplitButton");
supportsPopup.InvokeClick();
}
}
DialogWindow.Show(new UpdateSettingsPage(printer));
}
});
// only add one
break;
}
}
});
}
}

10
MatterControlLib/DesignTools/EditorTools/ScaleControls/ScaleTopControl.cs
View file

@ -60,7 +60,7 @@ namespace MatterHackers.Plugins.EditorTools
private List<Vector2> lines = new List<Vector2>();
private Vector3 originalPointToMove;
private double selectCubeSize = 7 * GuiWidget.DeviceScale;
private double arrowSize = 7 * GuiWidget.DeviceScale;
private ThemeConfig theme;
private InlineEditControl zValueDisplayInfo;
private bool hadClickOnControl;
@ -138,7 +138,7 @@ namespace MatterHackers.Plugins.EditorTools
DrawOnTop = true;
topScaleMesh = PlatonicSolids.CreateCube(selectCubeSize, selectCubeSize, selectCubeSize);
topScaleMesh = PlatonicSolids.CreateCube(arrowSize, arrowSize, arrowSize);
CollisionVolume = topScaleMesh.CreateBVHData();
@ -327,10 +327,10 @@ namespace MatterHackers.Plugins.EditorTools
Vector3 bottomPosition = new Vector3(topPosition.X, topPosition.Y, selectedBounds.MinXYZ.Z);
double distBetweenPixelsWorldSpace = InteractionContext.World.GetWorldUnitsPerScreenPixelAtPosition(topPosition);
Vector3 boxCenter = topPosition;
boxCenter.Z += selectCubeSize / 2 * distBetweenPixelsWorldSpace;
Vector3 arrowCenter = topPosition;
arrowCenter.Z += arrowSize / 2 * distBetweenPixelsWorldSpace;
Matrix4X4 centerMatrix = Matrix4X4.CreateTranslation(boxCenter);
Matrix4X4 centerMatrix = Matrix4X4.CreateTranslation(arrowCenter);
centerMatrix = Matrix4X4.CreateScale(distBetweenPixelsWorldSpace) * centerMatrix;
TotalTransform = centerMatrix;

2
MatterControlLib/PartPreviewWindow/View3D/PrinterBar/ValidationErrorsPanel.cs
View file

@ -79,7 +79,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
var row = new SettingsRow(errorText, errorDetails, theme, validationError.ErrorLevel == ValidationErrorLevel.Error ? errorImage : warningImage, fullRowSelect: true)
{
ArrowDirection = ArrowDirection.Left,
Name = errorText + " Row"
Name = validationError.ID + " Row"
};
if (validationError.FixAction is NamedAction action)

12
MatterControlLib/SettingsManagement/ApplicationSettingsPage.cs
View file

@ -32,14 +32,12 @@ using System.Diagnostics;
using System.IO;
using System.Linq;
using MatterHackers.Agg;
using MatterHackers.Agg.Image;
using MatterHackers.Agg.Platform;
using MatterHackers.Agg.UI;
using MatterHackers.Localizations;
using MatterHackers.MatterControl.ConfigurationPage;
using MatterHackers.MatterControl.CustomWidgets;
using MatterHackers.MatterControl.DataStorage;
using MatterHackers.MatterControl.SlicerConfiguration;
using MatterHackers.VectorMath;
namespace MatterHackers.MatterControl
@ -587,15 +585,5 @@ namespace MatterHackers.MatterControl
container.AddChild(widget);
widget.Padding = widget.Padding.Clone(right: 10);
}
private class IgnoredFlowLayout : FlowLayoutWidget, IIgnoredPopupChild
{
public IgnoredFlowLayout()
: base(FlowDirection.TopToBottom)
{
}
public bool KeepMenuOpen => false;
}
}
}

378
MatterControlLib/SettingsManagement/UpdateSettingsPage.cs Normal file
View file

@ -0,0 +1,378 @@
/*
Copyright (c) 2018, John Lewin
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
The views and conclusions contained in the software and documentation are those
of the authors and should not be interpreted as representing official policies,
either expressed or implied, of the FreeBSD Project.
*/
using System;
using System.Diagnostics;
using System.IO;
using System.Linq;
using MatterHackers.Agg;
using MatterHackers.Agg.Platform;
using MatterHackers.Agg.UI;
using MatterHackers.Localizations;
using MatterHackers.MatterControl.ConfigurationPage;
using MatterHackers.MatterControl.CustomWidgets;
using MatterHackers.MatterControl.DataStorage;
using MatterHackers.MatterControl.SlicerConfiguration;
using MatterHackers.VectorMath;
namespace MatterHackers.MatterControl
{
public partial class UpdateSettingsPage : DialogPage
{
private PrinterConfig printer;
public UpdateSettingsPage(PrinterConfig printer)
: base("Close".Localize())
{
this.printer = printer;
this.AlwaysOnTopOfMain = true;
this.WindowTitle = this.HeaderText = "Update Settings".Localize();
this.WindowSize = new Vector2(700 * GuiWidget.DeviceScale, 600 * GuiWidget.DeviceScale);
contentRow.Padding = theme.DefaultContainerPadding;
contentRow.Padding = 0;
contentRow.BackgroundColor = Color.Transparent;
GuiWidget settingsColumn;
{
var settingsAreaScrollBox = new ScrollableWidget(true);
settingsAreaScrollBox.ScrollArea.HAnchor |= HAnchor.Stretch;
settingsAreaScrollBox.AnchorAll();
settingsAreaScrollBox.BackgroundColor = theme.MinimalShade;
contentRow.AddChild(settingsAreaScrollBox);
settingsColumn = new FlowLayoutWidget(FlowDirection.TopToBottom)
{
HAnchor = HAnchor.MaxFitOrStretch
};
settingsAreaScrollBox.AddChild(settingsColumn);
}
AddUpgradeInfoPannel(settingsColumn);
AddUsserOptionsPannel(settingsColumn);
AddAdvancedPannel(settingsColumn);
// Enforce consistent SectionWidget spacing and last child borders
foreach (var section in settingsColumn.Children<SectionWidget>())
{
section.Margin = new BorderDouble(0, 10, 0, 0);
if (section.ContentPanel.Children.LastOrDefault() is SettingsItem lastRow)
{
// If we're in a contentPanel that has SettingsItems...
// Clear the last items bottom border
lastRow.Border = lastRow.Border.Clone(bottom: 0);
// Set a common margin on the parent container
section.ContentPanel.Margin = new BorderDouble(2, 0);
}
}
}
private void AddUpgradeInfoPannel(GuiWidget settingsColumn)
{
var generalPanel = new FlowLayoutWidget(FlowDirection.TopToBottom)
{
HAnchor = HAnchor.Stretch,
VAnchor = VAnchor.Fit,
};
var configureIcon = AggContext.StaticData.LoadIcon("fa-cog_16.png", 16, 16, theme.InvertIcons);
var updateSection = new SectionWidget("Update".Localize(), generalPanel, theme, expandingContent: false)
{
Name = "Update Section",
HAnchor = HAnchor.Stretch,
VAnchor = VAnchor.Fit,
};
settingsColumn.AddChild(updateSection);
theme.ApplyBoxStyle(updateSection);
// Print Notifications
var configureNotificationsButton = new IconButton(configureIcon, theme)
{
Name = "Configure Notification Settings Button",
ToolTipText = "Configure Notifications".Localize(),
Margin = new BorderDouble(left: 6),
VAnchor = VAnchor.Center
};
configureNotificationsButton.Click += (s, e) =>
{
if (ApplicationController.ChangeToPrintNotification != null)
{
UiThread.RunOnIdle(() =>
{
ApplicationController.ChangeToPrintNotification(this.DialogWindow);
});
}
};
this.AddSettingsRow(
new SettingsItem(
"Notifications".Localize(),
theme,
new SettingsItem.ToggleSwitchConfig()
{
Checked = UserSettings.Instance.get(UserSettingsKey.PrintNotificationsEnabled) == "true",
ToggleAction = (itemChecked) =>
{
UserSettings.Instance.set(UserSettingsKey.PrintNotificationsEnabled, itemChecked ? "true" : "false");
}
},
configureNotificationsButton,
AggContext.StaticData.LoadIcon("notify-24x24.png", 16, 16, theme.InvertIcons)),
generalPanel);
foreach (var localOemSetting in printer.Settings.OemLayer)
{
if (!ignoreSettings.Contains(localOemSetting.Key)
&& !PrinterSettingsExtensions.SettingsToReset.ContainsKey(localOemSetting.Key)
&& serverOemSettings.GetValue(localOemSetting.Key) != localOemSetting.Value)
{
}
}
}
private void AddAdvancedPannel(GuiWidget settingsColumn)
{
var advancedPanel = new FlowLayoutWidget(FlowDirection.TopToBottom);
var advancedSection = new SectionWidget("Advanced".Localize(), advancedPanel, theme, serializationKey: "ApplicationSettings-Advanced", expanded: false)
{
Name = "Advanced Section",
HAnchor = HAnchor.Stretch,
VAnchor = VAnchor.Fit,
Margin = 0
};
settingsColumn.AddChild(advancedSection);
theme.ApplyBoxStyle(advancedSection);
// Touch Screen Mode
this.AddSettingsRow(
new SettingsItem(
"Touch Screen Mode".Localize(),
theme,
new SettingsItem.ToggleSwitchConfig()
{
Checked = UserSettings.Instance.get(UserSettingsKey.ApplicationDisplayMode) == "touchscreen",
ToggleAction = (itemChecked) =>
{
string displayMode = itemChecked ? "touchscreen" : "responsive";
if (displayMode != UserSettings.Instance.get(UserSettingsKey.ApplicationDisplayMode))
{
UserSettings.Instance.set(UserSettingsKey.ApplicationDisplayMode, displayMode);
UiThread.RunOnIdle(() => ApplicationController.Instance.ReloadAll().ConfigureAwait(false));
}
}
}),
advancedPanel);
AddUserBoolToggle(advancedPanel,
"Utilize High Res Monitors".Localize(),
UserSettingsKey.ApplicationUseHeigResDisplays,
true,
false);
AddUserBoolToggle(advancedPanel,
"Enable Socketeer Client".Localize(),
UserSettingsKey.ApplicationUseSocketeer,
true,
false);
var openCacheButton = new IconButton(AggContext.StaticData.LoadIcon("fa-link_16.png", 16, 16, theme.InvertIcons), theme)
{
ToolTipText = "Open Folder".Localize(),
};
openCacheButton.Click += (s, e) => UiThread.RunOnIdle(() =>
{
Process.Start(ApplicationDataStorage.ApplicationUserDataPath);
});
this.AddSettingsRow(
new SettingsItem(
"Application Storage".Localize(),
openCacheButton,
theme),
advancedPanel);
var clearCacheButton = new HoverIconButton(AggContext.StaticData.LoadIcon("remove.png", 16, 16, theme.InvertIcons), theme)
{
ToolTipText = "Clear Cache".Localize(),
};
clearCacheButton.Click += (s, e) => UiThread.RunOnIdle(() =>
{
CacheDirectory.DeleteCacheData();
});
this.AddSettingsRow(
new SettingsItem(
"Application Cache".Localize(),
clearCacheButton,
theme),
advancedPanel);
#if DEBUG
var configureIcon = AggContext.StaticData.LoadIcon("fa-cog_16.png", 16, 16, theme.InvertIcons);
var configurePluginsButton = new IconButton(configureIcon, theme)
{
ToolTipText = "Configure Plugins".Localize(),
Margin = 0
};
configurePluginsButton.Click += (s, e) =>
{
UiThread.RunOnIdle(() =>
{
DialogWindow.Show<PluginsPage>();
});
};
this.AddSettingsRow(
new SettingsItem(
"Plugins".Localize(),
configurePluginsButton,
theme),
advancedPanel);
#endif
advancedPanel.Children<SettingsItem>().First().Border = new BorderDouble(0, 1);
}
private void AddUsserOptionsPannel(GuiWidget settingsColumn)
{
var optionsPanel = new FlowLayoutWidget(FlowDirection.TopToBottom);
var optionsSection = new SectionWidget("Options".Localize(), optionsPanel, theme, serializationKey: "ApplicationSettings-Options", expanded: false)
{
Name = "Options Section",
HAnchor = HAnchor.Stretch,
VAnchor = VAnchor.Fit,
Margin = 0
};
settingsColumn.AddChild(optionsSection);
theme.ApplyBoxStyle(optionsSection);
AddUserBoolToggle(optionsPanel,
"Shown Welcome Message".Localize(),
UserSettingsKey.ShownWelcomeMessage,
false,
false);
AddUserBoolToggle(optionsPanel,
"Shown Print Canceled Message".Localize(),
UserSettingsKey.ShownPrintCanceledMessage,
false,
false);
AddUserBoolToggle(optionsPanel,
"Shown Print Complete Message".Localize(),
UserSettingsKey.ShownPrintCompleteMessage,
false,
false);
optionsPanel.Children<SettingsItem>().First().Border = new BorderDouble(0, 1);
}
private void AddUserBoolToggle(FlowLayoutWidget advancedPanel, string title, string boolKey, bool requiresRestart, bool reloadAll)
{
this.AddSettingsRow(
new SettingsItem(
title,
theme,
new SettingsItem.ToggleSwitchConfig()
{
Checked = UserSettings.Instance.get(boolKey) != "false",
ToggleAction = (itemChecked) =>
{
string boolValue = itemChecked ? "true" : "false";
if (boolValue != UserSettings.Instance.get(boolKey))
{
UserSettings.Instance.set(boolKey, boolValue);
if (requiresRestart)
{
StyledMessageBox.ShowMessageBox(
"To finish changing your monitor settings you need to restart MatterControl. If after changing your fonts are too small you can adjust Text Size.".Localize(),
"Restart Required".Localize());
}
if (reloadAll)
{
UiThread.RunOnIdle(() => ApplicationController.Instance.ReloadAll().ConfigureAwait(false));
}
}
}
}),
advancedPanel);
}
private void AddApplicationBoolToggle(FlowLayoutWidget advancedPanel, string title, string boolKey, bool requiresRestart, bool reloadAll)
{
this.AddSettingsRow(
new SettingsItem(
title,
theme,
new SettingsItem.ToggleSwitchConfig()
{
Checked = ApplicationSettings.Instance.get(boolKey) == "true",
ToggleAction = (itemChecked) =>
{
string boolValue = itemChecked ? "true" : "false";
if (boolValue != UserSettings.Instance.get(boolKey))
{
ApplicationSettings.Instance.set(boolKey, boolValue);
if (requiresRestart)
{
StyledMessageBox.ShowMessageBox(
"To finish changing your monitor settings you need to restart MatterControl. If after changing your fonts are too small you can adjust Text Size.".Localize(),
"Restart Required".Localize());
}
if (reloadAll)
{
UiThread.RunOnIdle(() => ApplicationController.Instance.ReloadAll().ConfigureAwait(false));
}
}
}
}),
advancedPanel);
}
private void AddSettingsRow(GuiWidget widget, GuiWidget container)
{
container.AddChild(widget);
widget.Padding = widget.Padding.Clone(right: 10);
}
}
}

24
MatterControlLib/SlicerConfiguration/Settings/ProfileManager.cs
View file

@ -118,6 +118,30 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
return userProfilesDirectory;
}
public static IEnumerable<(string key, string currentValue, string newValue)> GetOemSettingsNeedingUpdate(PrinterConfig printer)
{
var make = printer.Settings.GetValue(SettingsKey.make);
var model = printer.Settings.GetValue(SettingsKey.model);
var serverOemSettings = ProfileManager.LoadOemSettingsAsync(OemSettings.Instance.OemProfiles[make][model],
make,
model).Result;
var ignoreSettings = new HashSet<string>()
{
SettingsKey.created_date,
};
foreach (var localOemSetting in printer.Settings.OemLayer)
{
if (!ignoreSettings.Contains(localOemSetting.Key)
&& !PrinterSettingsExtensions.SettingsToReset.ContainsKey(localOemSetting.Key)
&& serverOemSettings.GetValue(localOemSetting.Key) != localOemSetting.Value)
{
yield return (localOemSetting.Key, localOemSetting.Value, serverOemSettings.GetValue(localOemSetting.Key));
}
}
}
public void DeletePrinter(string printerID)
{
var printerInfo = ProfileManager.Instance[printerID];

2
Submodules/MatterSlice

@ -1 +1 @@
Subproject commit 97b31c19c67f1698bf3a4bec8a9211eb704f6c3a
Subproject commit af146f1680c9e398869ccb5c2df0da2b26c7e6da

8
Tests/MatterControl.AutomationTests/SliceSettingsTests.cs
View file

@ -81,19 +81,21 @@ namespace MatterHackers.MatterControl.Tests.Automation
// open the print menu and prove no oem message
testRunner.OpenPrintPopupMenu();
var expectedWaringName = "Default Settings Have Changed Row";
var expectedWarningName = ValidationErrors.SettingsUpdateAvailable + " Row";
Assert.IsFalse(testRunner.NameExists(expectedWaringName, 1));
Assert.IsFalse(testRunner.NameExists(expectedWarningName, 1));
// close the menu
testRunner.ClickByName("PartPreviewContent");
testRunner.WaitFor(() => !testRunner.NamedWidgetExists("Start Print Button"));
// change some oem settings
printer.Settings.SetValue(SettingsKey.layer_height, ".213", printer.Settings.OemLayer);
// open menu again and check that warning is now visible
testRunner.OpenPrintPopupMenu();
Assert.IsTrue(testRunner.NameExists(expectedWaringName, 1));
Assert.IsTrue(testRunner.NameExists(expectedWarningName, 1));
}
return Task.CompletedTask;