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

adding ability to set acceleration on a printer profile

Browse source
This commit is contained in:
Lars Brubaker 2018-01-17 14:03:56 -08:00
parent 09c553ae64
commit ec501191dc
12 changed files with 1979 additions and 1875 deletions
Download patch file Download diff file Expand all files Collapse all files

15
ApplicationView/PrinterModels.cs
View file

@ -421,7 +421,16 @@ namespace MatterHackers.MatterControl
public void LoadGCode(Stream stream, CancellationToken cancellationToken, Action<double, string> progressReporter)
{
var loadedGCode = GCodeMemoryFile.Load(stream, cancellationToken, progressReporter);
var settings = this.Printer.Settings;
var maxAcceleration = settings.GetValue<double>(SettingsKey.max_acceleration);
var maxVelocity = settings.GetValue<double>(SettingsKey.max_velocity);
var jerkVelocity = settings.GetValue<double>(SettingsKey.jerk_velocity);
var loadedGCode = GCodeMemoryFile.Load(stream,
new Vector4(maxAcceleration, maxAcceleration, maxAcceleration, maxAcceleration),
new Vector4(maxVelocity, maxVelocity, maxVelocity, maxVelocity),
new Vector4(jerkVelocity, jerkVelocity, jerkVelocity, jerkVelocity),
cancellationToken, progressReporter);
this.GCodeRenderer = new GCodeRenderer(loadedGCode);
this.RenderInfo = new GCodeRenderInfo(
0,
@ -432,8 +441,8 @@ namespace MatterHackers.MatterControl
1,
new Vector2[]
{
this.Printer.Settings.Helpers.ExtruderOffset(0),
this.Printer.Settings.Helpers.ExtruderOffset(1)
settings.Helpers.ExtruderOffset(0),
settings.Helpers.ExtruderOffset(1)
},
this.GetRenderType,
MeshViewerWidget.GetExtruderColor);