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

Refactoring and UI Changes - eeprom

Browse source
This commit is contained in:
Kevin Pope 2014-02-23 21:48:17 -08:00
parent cbae2f0236
commit 9d1ea3f8cf
5 changed files with 38 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

23
EeProm/EePromMarlineWidget.cs → EeProm/EePromMarlinWidget.cs
View file

@ -93,14 +93,20 @@ namespace MatterHackers.MatterControl.EeProm
{
Title = new LocalizedString("Marlin Firmware EEPROM Settings").Translated;
BackgroundColor = ActiveTheme.Instance.SecondaryBackgroundColor;
currentEePromSettings = new EePromMarlinSettings();
currentEePromSettings.eventAdded += SetUiToPrinterSettings;
FlowLayoutWidget mainContainer = new FlowLayoutWidget (FlowDirection.TopToBottom);
mainContainer.VAnchor = Agg.UI.VAnchor.Max_FitToChildren_ParentHeight;
mainContainer.HAnchor = Agg.UI.HAnchor.ParentLeftRight;
mainContainer.BackgroundColor = ActiveTheme.Instance.PrimaryBackgroundColor;
mainContainer.Padding = new BorderDouble (3, 0);
FlowLayoutWidget topToBottom = new FlowLayoutWidget(FlowDirection.TopToBottom);
topToBottom.VAnchor = Agg.UI.VAnchor.Max_FitToChildren_ParentHeight;
topToBottom.HAnchor = Agg.UI.HAnchor.ParentLeftRight;
topToBottom.BackgroundColor = ActiveTheme.Instance.SecondaryBackgroundColor;
topToBottom.Padding = new BorderDouble (top: 3);
// the top button bar
{
@ -111,12 +117,12 @@ namespace MatterHackers.MatterControl.EeProm
CreateMainButton(ref buttonReLoadSettings, topButtonBar, "Re-Load Default Settings");
buttonReLoadSettings.Click += buttonReLoadSettings_Click;
topButtonBar.AddChild(new GuiWidget(10, 1));
topButtonBar.Margin = new BorderDouble (0, 3);
CreateMainButton(ref buttonSetToFactorySettings, topButtonBar, "Set Default To Factory Settings");
buttonSetToFactorySettings.Click += SetToFactorySettings;
topToBottom.AddChild(topButtonBar);
mainContainer.AddChild(topButtonBar);
}
topToBottom.AddChild(Create4FieldSet("Steps per mm:",
@ -160,18 +166,18 @@ namespace MatterHackers.MatterControl.EeProm
topBottomSpacer.VAnchor = VAnchor.ParentBottomTop;
topToBottom.AddChild(topBottomSpacer);
mainContainer.AddChild (topToBottom);
// the bottom button bar
{
FlowLayoutWidget bottomButtonBar = new FlowLayoutWidget();
bottomButtonBar.HAnchor = Agg.UI.HAnchor.Max_FitToChildren_ParentWidth;
bottomButtonBar.BackgroundColor = ActiveTheme.Instance.PrimaryBackgroundColor;
bottomButtonBar.Margin = new BorderDouble (0, 3);
CreateMainButton(ref buttonSetActive, bottomButtonBar, "Make Settings Active");
buttonSetActive.Click += buttonSetActive_Click;
bottomButtonBar.AddChild(new GuiWidget(10, 1));
CreateMainButton(ref buttonSave, bottomButtonBar, "Make Settings Active\nAnd Save To Default");
buttonSave.Click += buttonSave_Click;
@ -180,14 +186,14 @@ namespace MatterHackers.MatterControl.EeProm
CreateMainButton(ref buttonAbort, bottomButtonBar, "Cancel");
buttonAbort.Click += buttonAbort_Click;
topToBottom.AddChild(bottomButtonBar);
mainContainer.AddChild(bottomButtonBar);
}
PrinterCommunication.Instance.CommunicationUnconditionalFromPrinter.RegisterEvent(currentEePromSettings.Add, ref unregisterEvents);
currentEePromSettings.eventAdded += SetUiToPrinterSettings;
AddChild(topToBottom);
AddChild(mainContainer);
ShowAsSystemWindow();
@ -296,7 +302,6 @@ namespace MatterHackers.MatterControl.EeProm
private void CreateMainButton(ref Button button, FlowLayoutWidget buttonBar, string text)
{
button = textImageButtonFactory.Generate(new LocalizedString(text).Translated);
button.Margin = new BorderDouble(3);
buttonBar.AddChild(button);
}

4
EeProm/EePromRepatierParameter.cs → EeProm/EePromRepetierParameter.cs
View file

@ -34,7 +34,7 @@ using System.Text;
namespace MatterHackers.MatterControl.EeProm
{
public class EePromRepatierParameter : EventArgs
public class EePromRepetierParameter : EventArgs
{
public string description;
public int type;
@ -42,7 +42,7 @@ namespace MatterHackers.MatterControl.EeProm
string val = "";
bool changed = false;
public EePromRepatierParameter(string line)
public EePromRepetierParameter(string line)
{
update(line);
}

14
EeProm/EePromRepatierStorage.cs → EeProm/EePromRepetierStorage.cs
View file

@ -36,16 +36,16 @@ using MatterHackers.Agg.UI;
namespace MatterHackers.MatterControl.EeProm
{
public delegate void OnEePromRepatierAdded(EePromRepatierParameter param);
public delegate void OnEePromRepetierAdded(EePromRepetierParameter param);
public class EePromRepatierStorage
public class EePromRepetierStorage
{
public Dictionary<int, EePromRepatierParameter> eePromSettingsList;
public Dictionary<int, EePromRepetierParameter> eePromSettingsList;
public event EventHandler eventAdded = null;
public EePromRepatierStorage()
public EePromRepetierStorage()
{
eePromSettingsList = new Dictionary<int, EePromRepatierParameter>();
eePromSettingsList = new Dictionary<int, EePromRepetierParameter>();
}
public void Clear()
@ -55,7 +55,7 @@ namespace MatterHackers.MatterControl.EeProm
public void Save()
{
foreach (EePromRepatierParameter p in eePromSettingsList.Values)
foreach (EePromRepetierParameter p in eePromSettingsList.Values)
{
p.save();
}
@ -77,7 +77,7 @@ namespace MatterHackers.MatterControl.EeProm
return;
}
EePromRepatierParameter parameter = new EePromRepatierParameter(line);
EePromRepetierParameter parameter = new EePromRepetierParameter(line);
if (eePromSettingsList.ContainsKey(parameter.position))
{
eePromSettingsList.Remove(parameter.position);

15
EeProm/EePromRepatierWidget.cs → EeProm/EePromRepetierWidget.cs
View file

@ -43,8 +43,8 @@ namespace MatterHackers.MatterControl.EeProm
{
protected TextImageButtonFactory textImageButtonFactory = new TextImageButtonFactory();
EePromRepatierStorage currentEePromSettings;
BindingList<EePromRepatierParameter> data = new BindingList<EePromRepatierParameter>();
EePromRepetierStorage currentEePromSettings;
BindingList<EePromRepetierParameter> data = new BindingList<EePromRepetierParameter>();
FlowLayoutWidget settingsColmun;
event EventHandler unregisterEvents;
@ -57,11 +57,13 @@ namespace MatterHackers.MatterControl.EeProm
{
BackgroundColor = ActiveTheme.Instance.SecondaryBackgroundColor;
currentEePromSettings = new EePromRepatierStorage();
currentEePromSettings = new EePromRepetierStorage();
FlowLayoutWidget topToBottom = new FlowLayoutWidget(FlowDirection.TopToBottom);
topToBottom.VAnchor = Agg.UI.VAnchor.Max_FitToChildren_ParentHeight;
topToBottom.HAnchor = Agg.UI.HAnchor.ParentLeftRight;
topToBottom.BackgroundColor = ActiveTheme.Instance.PrimaryBackgroundColor;
topToBottom.Padding = new BorderDouble (3, 0);
FlowLayoutWidget row = new FlowLayoutWidget();
row.HAnchor = Agg.UI.HAnchor.ParentLeftRight;
@ -82,6 +84,7 @@ namespace MatterHackers.MatterControl.EeProm
ScrollableWidget settingsAreaScrollBox = new ScrollableWidget(true);
settingsAreaScrollBox.ScrollArea.HAnchor |= Agg.UI.HAnchor.ParentLeftRight;
settingsAreaScrollBox.AnchorAll();
settingsAreaScrollBox.BackgroundColor = ActiveTheme.Instance.SecondaryBackgroundColor;
topToBottom.AddChild(settingsAreaScrollBox);
settingsColmun = new FlowLayoutWidget(FlowDirection.TopToBottom);
@ -94,7 +97,7 @@ namespace MatterHackers.MatterControl.EeProm
buttonBar.HAnchor = Agg.UI.HAnchor.Max_FitToChildren_ParentWidth;
buttonBar.BackgroundColor = ActiveTheme.Instance.PrimaryBackgroundColor;
buttonSave = textImageButtonFactory.Generate(new LocalizedString("Save To EEPROM").Translated);
buttonSave.Margin = new BorderDouble(3);
buttonSave.Margin = new BorderDouble(0,3);
buttonBar.AddChild(buttonSave);
CreateSpacer(buttonBar);
@ -146,7 +149,7 @@ namespace MatterHackers.MatterControl.EeProm
private void NewSettingReadFromPrinter(object sender, EventArgs e)
{
EePromRepatierParameter newSetting = e as EePromRepatierParameter;
EePromRepetierParameter newSetting = e as EePromRepetierParameter;
if (newSetting != null)
{
data.Add(newSetting);
@ -157,7 +160,7 @@ namespace MatterHackers.MatterControl.EeProm
void AddItemToUi(object state)
{
EePromRepatierParameter newSetting = state as EePromRepatierParameter;
EePromRepetierParameter newSetting = state as EePromRepetierParameter;
if (newSetting != null)
{
FlowLayoutWidget row = new FlowLayoutWidget();

15
MatterControl.csproj
View file

@ -38,6 +38,7 @@
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
<ReleaseVersion>0.8.2</ReleaseVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>True</DebugSymbols>
@ -74,11 +75,7 @@
<Compile Include="ActivePrinterProfile.cs" />
<Compile Include="CustomWidgets\ExportQueueItemWindow.cs" />
<Compile Include="CustomWidgets\ExportToFolderFeedbackWindow.cs" />
<Compile Include="EeProm\EePromMarlineWidget.cs" />
<Compile Include="EeProm\EePromMarlinSettings.cs" />
<Compile Include="EeProm\EePromRepatierParameter.cs" />
<Compile Include="EeProm\EePromRepatierStorage.cs" />
<Compile Include="EeProm\EePromRepatierWidget.cs" />
<Compile Include="FieldValidation.cs" />
<Compile Include="PartPreviewWindow\CreateDiscreteMeshes.cs" />
<Compile Include="CustomWidgets\EditableNumberDisplay.cs" />
@ -189,6 +186,10 @@
<Compile Include="CustomWidgets\ThemeColorSelectorWidget.cs" />
<Compile Include="ControlElements\TextImageButtonFactory.cs" />
<Compile Include="FrostedSerial\TermiosH.cs" />
<Compile Include="EeProm\EePromMarlinWidget.cs" />
<Compile Include="EeProm\EePromRepetierParameter.cs" />
<Compile Include="EeProm\EePromRepetierWidget.cs" />
<Compile Include="EeProm\EePromRepetierStorage.cs" />
</ItemGroup>
<ItemGroup>
<Reference Include="Ionic.Zip">
@ -281,10 +282,6 @@
<Project>{D3ABF72C-64C2-4E51-A119-E077210FA990}</Project>
<Name>SerialPortCommunication</Name>
</ProjectReference>
<ProjectReference Include="..\agg-sharp\WindowsFileDialogs\WindowsFileDialogs.csproj">
<Project>{A526DC5D-65F3-461B-805F-D3AC9665F5C9}</Project>
<Name>WindowsFileDialogs</Name>
</ProjectReference>
<ProjectReference Include="Community.CsharpSqlite\Community.CsharpSqlite.csproj">
<Project>{F1653F20-D47D-4F29-8C55-3C835542AF5F}</Project>
<Name>Community.CsharpSqlite</Name>
@ -325,7 +322,7 @@
<Project>{865172A0-A1A9-49C2-9386-F2FDB4E141B7}</Project>
<Name>MatterControlPluginSystem</Name>
</ProjectReference>
<ProjectReference Include="..\agg-sharp\Agg\Agg.csproj">
<ProjectReference Include="..\agg-sharp\agg\Agg.csproj">
<Project>{657DBC6D-C3EA-4398-A3FA-DDB73C14F71B}</Project>
<Name>Agg</Name>
</ProjectReference>