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

Get updated profiles compiling on Android

Browse source 
- Remove unused properties from ApplicationView
 - Rename CompactApplicationView to TouchscreenView
 - Rename ResponsiveApplicationView to DesktopView
 - Move abstract ToggleTopContainer() specific to TouchscreenView
 - Remove unused HideTopContainer implementations
 - Conditionally compile invocation/assignment of ApplicationMenuRow
 - Migrate single setting from PrinterSettings "PublishBedImage" to SliceSettings
 - Remove PrinterSettings class
 - Import "PublishBedImage" during ImportPrinters
 - Remove code that doubles the size of the splitter bar when collapsed
 - Fix incorrect path to "config.ini"
This commit is contained in:
John Lewin 2016-05-03 18:22:59 -07:00
parent a333961029
commit 5db7c79d00
16 changed files with 87 additions and 236 deletions
Download patch file Download diff file Expand all files Collapse all files

116
SettingsManagement/PrinterSettings.cs
View file

@ -1,116 +0,0 @@
using MatterHackers.MatterControl.DataStorage;
using MatterHackers.MatterControl.SlicerConfiguration;
using System.Collections.Generic;
namespace MatterHackers.MatterControl
{
public class PrinterSettings
{
private static PrinterSettings globalInstance = null;
public Dictionary<string, PrinterSetting> settingsDictionary;
private int ActiveSettingsPrinterId = -1;
public static PrinterSettings Instance
{
get
{
if (globalInstance == null)
{
globalInstance = new PrinterSettings();
globalInstance.LoadData();
}
return globalInstance;
}
}
private void LoadDataIfNeeded()
{
// TODO: Review int printerID
int printerID;
int.TryParse(ActiveSliceSettings.Instance.Id(), out printerID);
//Lazy load the data (rather than hook to printer change event)
if (printerID != ActiveSettingsPrinterId)
{
LoadData();
}
}
public string get(string key)
{
string result = null;
if (ActiveSliceSettings.Instance == null)
{
//No printer selected
}
else
{
LoadDataIfNeeded();
if (settingsDictionary.ContainsKey(key))
{
result = settingsDictionary[key].Value;
}
}
return result;
}
public void set(string key, string value)
{
if (ActiveSliceSettings.Instance == null)
{
//No printer selected
}
else
{
LoadDataIfNeeded();
PrinterSetting setting;
if (settingsDictionary.ContainsKey(key))
{
setting = settingsDictionary[key];
}
else
{
// TODO: Review int printerID
int printerID;
int.TryParse(ActiveSliceSettings.Instance.Id(), out printerID);
setting = new PrinterSetting();
setting.Name = key;
setting.PrinterId = printerID;
settingsDictionary[key] = setting;
}
setting.Value = value;
setting.Commit();
}
}
private void LoadData()
{
if (ActiveSliceSettings.Instance != null)
{
settingsDictionary = new Dictionary<string, PrinterSetting>();
foreach (PrinterSetting s in GetPrinterSettings())
{
settingsDictionary[s.Name] = s;
}
// TODO: Review int printerID
int printerID;
int.TryParse(ActiveSliceSettings.Instance.Id(), out printerID);
ActiveSettingsPrinterId = printerID;
}
}
private IEnumerable<PrinterSetting> GetPrinterSettings()
{
//Retrieve a list of settings from the Datastore
string query = string.Format("SELECT * FROM PrinterSetting WHERE PrinterId = {0};", ActiveSliceSettings.Instance.Id());
return Datastore.Instance.dbSQLite.Query<PrinterSetting>(query);
}
}
}