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

Merge branch 'master' into booleans

Browse source
This commit is contained in:
Lars Brubaker 2015-12-18 14:23:25 -08:00
commit dcecb67c5e
4 changed files with 9 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

2
PartPreviewWindow/ViewGcodeBasic.cs
View file

@ -921,7 +921,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
if (gcodeViewWidget != null
&& gcodeViewWidget.LoadedGCode == null)
{
// If we have finished loading the gcode and the source file exists but we don't have any loaded gcode it is because the loaded decided to not load it.
// If we have finished loading the gcode and the source file exists but we don't have any loaded gcode it is because the loader decided to not load it.
if (File.Exists(printItem.FileLocation))
{
SetProcessingMessage(string.Format(fileTooBigToLoad, printItem.Name));

34
PartPreviewWindow/ViewGcodeWidget.cs
View file

@ -214,10 +214,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
}
Invalidate();
if (ActiveLayerChanged != null)
{
ActiveLayerChanged(this, null);
}
ActiveLayerChanged?.Invoke(this, null);
}
}
}
@ -286,10 +283,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
private void initialLoading_ProgressChanged(object sender, ProgressChangedEventArgs e)
{
if (LoadingProgressChanged != null)
{
LoadingProgressChanged(this, e);
}
LoadingProgressChanged?.Invoke(this, e);
}
private async void initialLoading_RunWorkerCompleted(object sender, RunWorkerCompletedEventArgs e)
@ -298,11 +292,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
gCodeRenderer = new GCodeRenderer(loadedGCode);
await Task.Run(() =>
{
DoPostLoadInitialization();
}
);
await Task.Run(() => DoPostLoadInitialization() );
postLoadInitialization_RunWorkerCompleted();
}
@ -311,10 +301,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
{
try
{
if (gCodeRenderer.GCodeFileToDraw != null)
{
gCodeRenderer.GCodeFileToDraw.GetFilamentUsedMm(ActiveSliceSettings.Instance.FilamentDiameter);
}
gCodeRenderer.GCodeFileToDraw?.GetFilamentUsedMm(ActiveSliceSettings.Instance.FilamentDiameter);
}
catch (Exception e)
{
@ -324,20 +311,9 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
gCodeRenderer.CreateFeaturesForLayerIfRequired(0);
}
private void postLoadInitialization_ProgressChanged(object sender, ProgressChangedEventArgs e)
{
if (LoadingProgressChanged != null)
{
LoadingProgressChanged(this, e);
}
}
private void postLoadInitialization_RunWorkerCompleted()
{
if (DoneLoading != null)
{
DoneLoading(this, null);
}
DoneLoading?.Invoke(this, null);
}
private PathStorage grid = new PathStorage();

4
StaticData/SliceSettings/Layouts.txt
View file

@ -110,7 +110,7 @@ Advanced
support_material_speed
bridge_speed
gap_fill_speed
Speed for non Print Moves
Speed for Non-Print Moves
travel_speed
Modifiers
first_layer_speed
@ -276,7 +276,7 @@ Advanced
print_leveling_solution
print_leveling_method
print_leveling_required_to_print
Prob Settings
Probe Settings
manual_probe_paper_width
Options
Custom G-Code

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit 46e8f7f448451d0a24edc2b25ac7322e188410e6
Subproject commit 44e8b42cf7395fa337726e134587b892c331d1e5