From 16f31d80c81df0e8a3ae6e27a6b5922d8cd2716e Mon Sep 17 00:00:00 2001 From: John Lewin Date: Tue, 14 May 2019 22:13:07 -0700 Subject: [PATCH] Simplify --- .../SettingsManagement/OemSettings.cs | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/MatterControlLib/SettingsManagement/OemSettings.cs b/MatterControlLib/SettingsManagement/OemSettings.cs index 4c369f0ed..65b5b8eff 100644 --- a/MatterControlLib/SettingsManagement/OemSettings.cs +++ b/MatterControlLib/SettingsManagement/OemSettings.cs @@ -1,5 +1,5 @@ /* -Copyright (c) 2014, Lars Brubaker +Copyright (c) 2019, Lars Brubaker, John Lewin All rights reserved. Redistribution and use in source and binary forms, with or without @@ -27,7 +27,6 @@ of the authors and should not be interpreted as representing official policies, either expressed or implied, of the FreeBSD Project. */ -using System; using System.Collections.Generic; using System.IO; using System.Linq; @@ -36,7 +35,6 @@ using System.Threading.Tasks; using MatterHackers.Agg; using MatterHackers.Agg.Image; using MatterHackers.Agg.Platform; -using MatterHackers.MatterControl.Library; using MatterHackers.MatterControl.SlicerConfiguration; using Newtonsoft.Json; @@ -100,8 +98,9 @@ namespace MatterHackers.MatterControl.SettingsManagement internal void SetManufacturers(IEnumerable> unorderedManufacturers, List whitelist = null) { // Sort manufacturers by name - List> manufacturers = new List>(); - KeyValuePair otherInfo = new KeyValuePair(null, null); + var manufacturers = new List>(); + var otherInfo = new KeyValuePair(null, null); + foreach (var printer in unorderedManufacturers.OrderBy(k => k.Value)) { if (printer.Value == "Other") @@ -213,7 +212,7 @@ namespace MatterHackers.MatterControl.SettingsManagement private async Task DownloadMissingProfiles() { - ProgressStatus reportValue = new ProgressStatus(); + var reportValue = new ProgressStatus(); int index = 0; foreach (string oem in OemProfiles.Keys) { @@ -249,6 +248,7 @@ namespace MatterHackers.MatterControl.SettingsManagement public class StorePrinterID { public string SID { get; set; } + public string AltInfoUrl { get; set; } } @@ -258,5 +258,4 @@ namespace MatterHackers.MatterControl.SettingsManagement public string NameToDisplay { get; set; } } -} - +} \ No newline at end of file