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

Fixed import to not rely on layer_height validation

Browse source 
- Import preset no longer checks for slicer and will validate import on weather or not any settigns were valid
 - calling Import from MenuOptionFIle will cause the same error message as importing a printer form the settings import page
 - Import to new printer now attempts to load values and validates success on importing a valid setting
This commit is contained in:
Matt Moening 2016-08-11 14:59:23 -07:00
parent 89f12946a4
commit 5b42eac301
3 changed files with 41 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ApplicationView/MenuRow/MenuOptionFile.cs
View file

@ -65,7 +65,10 @@ namespace MatterHackers.MatterControl
private void ImportSettingsFile(string settingsFilePath)
{
ProfileManager.ImportFromExisting(settingsFilePath);
if(!ProfileManager.ImportFromExisting(settingsFilePath))
{
StyledMessageBox.ShowMessageBox(null, "Oops! Settings file '{0}' did not contain any settings we could import.".Localize().FormatWith(Path.GetFileName(settingsFilePath)), "Unable to Import".Localize());
}
}
private void importFile_Click()

34
SetupWizard/ImportSettingsPage.cs
View file

@ -492,11 +492,8 @@ namespace MatterHackers.MatterControl
case ".slice": // legacy presets file extension
case ".ini":
var settingsToImport = PrinterSettingsLayer.LoadFromIni(settingsFilePath);
string layerHeight;
bool containsValidSetting = false;
bool isSlic3r = importType == ".slice" || settingsToImport.TryGetValue(SettingsKey.layer_height, out layerHeight);
if (isSlic3r)
{
newLayer = new PrinterSettingsLayer();
newLayer.Name = Path.GetFileNameWithoutExtension(settingsFilePath);
@ -547,14 +544,7 @@ namespace MatterHackers.MatterControl
}
}
else
{
displayFailedToImportMessage(settingsFilePath);
// looks like a cura file
#if DEBUG
//throw new NotImplementedException("need to import from 'cure.ini' files");
#endif
}
break;
default:
@ -580,18 +570,16 @@ namespace MatterHackers.MatterControl
case ".slice": // old presets format
case ".ini":
var settingsToImport = PrinterSettingsLayer.LoadFromIni(settingsFilePath);
string layerHeight;
bool isSlic3r = settingsToImport.TryGetValue(SettingsKey.layer_height, out layerHeight);
bool containsValidSetting = false;
//if (isSlic3r)
// create a scope for variables
{
var settingsToImport = PrinterSettingsLayer.LoadFromIni(settingsFilePath);
bool containsValidSetting = false;
var activeSettings = ActiveSliceSettings.Instance;
foreach (var item in settingsToImport)
{
if(activeSettings.Contains(item.Key))
if (activeSettings.Contains(item.Key))
{
containsValidSetting = true;
string currentValue = activeSettings.GetValue(item.Key).Trim();
@ -601,9 +589,8 @@ namespace MatterHackers.MatterControl
activeSettings.UserLayer[item.Key] = item.Value;
}
}
}
if(containsValidSetting)
if (containsValidSetting)
{
activeSettings.Save();
@ -613,13 +600,8 @@ namespace MatterHackers.MatterControl
{
displayFailedToImportMessage(settingsFilePath);
}
}
//else
{
// looks like a cura file
//throw new NotImplementedException("need to import from 'cure.ini' files");
}
WizardWindow.Close();
}
break;
default:

28
SlicerConfiguration/Settings/ProfileManager.cs
View file

@ -294,18 +294,34 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
break;
case ".ini":
var settingsToImport = PrinterSettingsLayer.LoadFromIni(settingsFilePath);
//Other import paths validate that this is a slicer or MC ini file via checking if layer_height is a setting
if(settingsToImport.ContainsKey(SettingsKey.layer_height))
//Scope variables
{
var settingsToImport = PrinterSettingsLayer.LoadFromIni(settingsFilePath);
var layeredProfile = new PrinterSettings()
{
ID = printerInfo.ID,
OemLayer = settingsToImport
};
bool containsValidSetting = false;
var activeSettings = layeredProfile;
foreach (var item in settingsToImport)
{
if (activeSettings.Contains(item.Key))
{
containsValidSetting = true;
string currentValue = activeSettings.GetValue(item.Key).Trim();
// Compare the value to import to the layer cascade value and only set if different
if (currentValue != item.Value)
{
activeSettings.OemLayer[item.Key] = item.Value;
}
}
}
if(containsValidSetting)
{
// TODO: Resolve name conflicts
layeredProfile.UserLayer[SettingsKey.printer_name.ToString()] = printerInfo.Name;
layeredProfile.UserLayer[SettingsKey.printer_name] = printerInfo.Name;
layeredProfile.ClearValue(SettingsKey.device_token);
printerInfo.DeviceToken = "";
@ -314,6 +330,8 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
layeredProfile.Save();
importSuccessful = true;
}
}
break;
}
return importSuccessful;