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

Improving cylinder

Browse source 
fixing test
commiting patch from jlewin to fix printers without beds trying to heat
This commit is contained in:
LarsBrubaker 2020-07-05 18:05:15 -07:00
parent 690db19baa
commit 0863c25b11
3 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

18
MatterControlLib/DesignTools/Primitives/CylinderObject3D.cs
View file

@ -147,12 +147,17 @@ namespace MatterHackers.MatterControl.DesignTools
this.DebugDepth("Rebuild");
bool valuesChanged = false;
Sides = agg_basics.Clamp(Sides, 3, 360, ref valuesChanged);
Height = agg_basics.Clamp(Height, .01, 1000000, ref valuesChanged);
Diameter = agg_basics.Clamp(Diameter, .01, 1000000, ref valuesChanged);
if (valuesChanged)
{
Invalidate(InvalidateType.DisplayValues);
}
using (RebuildLock())
{
Sides = agg_basics.Clamp(Sides, 3, 360, ref valuesChanged);
Height = agg_basics.Clamp(Height, .01, Height, ref valuesChanged);
Diameter = agg_basics.Clamp(Diameter, .01, Diameter, ref valuesChanged);
using (new CenterAndHeightMaintainer(this))
{
if (!Advanced)
@ -178,11 +183,6 @@ namespace MatterHackers.MatterControl.DesignTools
}
}
if (valuesChanged)
{
Invalidate(InvalidateType.DisplayValues);
}
Parent?.Invalidate(new InvalidateArgs(this, InvalidateType.Mesh));
return Task.CompletedTask;
}

4
MatterControlLib/SlicerConfiguration/EngineMappingsMatterSlice.cs
View file

@ -668,7 +668,8 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
AddDefaultIfNotPresent(preStartGCode, "G21", startGCodeLines, "set units to millimeters");
AddDefaultIfNotPresent(preStartGCode, "M107", startGCodeLines, "fan off");
double bed_temperature = settings.GetValue<double>(SettingsKey.bed_temperature);
if (bed_temperature > 0)
if (bed_temperature > 0
&& settings.GetValue<bool>(SettingsKey.has_heated_bed))
{
string setBedTempString = string.Format("M140 S{0}", bed_temperature);
AddDefaultIfNotPresent(preStartGCode, setBedTempString, startGCodeLines, "start heating the bed");
@ -736,6 +737,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
double bed_temperature = settings.GetValue<double>(SettingsKey.bed_temperature);
if (bed_temperature > 0
&& settings.GetValue<bool>(SettingsKey.has_heated_bed)
&& !startGCode.Contains("M109"))
{
string setBedTempString = string.Format("M190 S{0}", bed_temperature);

2
Tests/MatterControl.Tests/MatterControl/SliceSettingsFieldTests.cs
View file

@ -322,7 +322,7 @@ namespace MatterControl.Tests.MatterControl
}
[Test, Ignore("Not Implemented")]
public async void ColorFieldTest()
public void ColorFieldTest()
{
Assert.Fail();
}