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

CodeFactor clean up

Browse source
This commit is contained in:
John Lewin 2018-12-10 14:32:56 -08:00
parent 527c57fb10
commit 7b20dd9b41
3 changed files with 29 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

25
MatterControlLib/ApplicationView/ApplicationController.cs
View file

@ -266,9 +266,6 @@ namespace MatterHackers.MatterControl
public IEnumerable<PrinterConfig> ActivePrinters => this.Workspaces.Where(w => w.Printer != null).Select(w => w.Printer);
//// A list of printers which are open (i.e. displaying a tab) on this instance of MatterControl
//private List<PrinterConfig> _activePrinters = new List<PrinterConfig>();
private Dictionary<Type, HashSet<IObject3DEditor>> objectEditorsByType;
public PopupMenu GetActionMenuForSceneItem(IObject3D selectedItem, InteractiveScene scene, bool addInSubmenu)
@ -288,9 +285,6 @@ namespace MatterHackers.MatterControl
(newName) =>
{
selectedItem.Name = newName;
// TODO: Revise SelectedObjectPanel to sync name on model change
// editorSectionWidget.Text = newName;
}));
};
@ -3242,13 +3236,10 @@ If you experience adhesion problems, please re-run leveling."
return Task.CompletedTask;
});
// Instead of opening printers, we should load open tabs........................
// Persist part workspaces
var history = applicationController.Library.PlatingHistory;
// TODO: Loading previous parts/printer is a relatively huge task compared to other startup tasks. These might work better if
// loaded after startup tasks and should have better progress reporting
if (File.Exists(ProfileManager.Instance.OpenTabsPath))
{
try
@ -3264,9 +3255,6 @@ If you experience adhesion problems, please re-run leveling."
// Load the actual workspace if content file exists
if (File.Exists(persistedWorkspace.ContentPath))
{
// Spin up the printer if specified
// Push item to loaded workspaces
string printerID = persistedWorkspace.PrinterID;
PartWorkspace workspace = null;
@ -3283,7 +3271,7 @@ If you experience adhesion problems, please re-run leveling."
workspace = new PartWorkspace(new BedConfig(history));
}
// Load it up
// Load the previous content
await workspace.SceneContext.LoadContent(new EditContext() {
ContentStore = history,
SourceItem = new FileSystemFileItem(persistedWorkspace.ContentPath)
@ -3304,13 +3292,8 @@ If you experience adhesion problems, please re-run leveling."
}
catch
{
// Create new part tab on failure?
}
}
else
{
// Create new part tab if no existing?
}
if (applicationController.Workspaces.Count == 0)
{
@ -3338,7 +3321,7 @@ If you experience adhesion problems, please re-run leveling."
await applicationController.OpenAllPrinters();
});
// Batch startup tasks
// Batch execute startup tasks
foreach (var task in ApplicationController.StartupTasks.OrderByDescending(t => t.Priority))
{
await applicationController.Tasks.Execute(task.Title, null, task.Action);

39
MatterControlLib/ApplicationView/LibraryItemConverter.cs
View file

@ -53,25 +53,24 @@ namespace MatterHackers.MatterControl
public override void WriteJson(JsonWriter writer, ILibraryItem value, JsonSerializer serializer)
{
}
public class DummyItem : ILibraryItem
{
public string ID { get; set; }
public string Name { get; set; }
public bool IsProtected { get; set; }
public bool IsVisible { get; set; }
public DateTime DateModified { get; set; }
public DateTime DateCreated { get; set; }
public string Path { get; set; }
public string AssetPath { get; set; }
}
}
public class DummyItem : ILibraryItem
{
public string ID { get; set; }
public string Name { get; set; }
public bool IsProtected { get; set; }
public bool IsVisible { get; set; }
public DateTime DateModified { get; set; }
public DateTime DateCreated { get; set; }
public string Path { get; set; }
public string AssetPath { get; set; }
}
}

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

@ -456,7 +456,9 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
oemProfile.Helpers.SetComPort(profile.ComPort);
oemProfile.Save();
}
catch { }
catch
{
}
return oemProfile;
}
@ -478,14 +480,15 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
return printerSettings;
}
}
catch { }
catch
{
}
}
}
return null;
}
internal static bool ImportFromExisting(string settingsFilePath)
{
if (string.IsNullOrEmpty(settingsFilePath) || !File.Exists(settingsFilePath))