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

Merge pull request #4508 from larsbrubaker/master

Browse source 
Improve xy calibration objects for large nozzles
This commit is contained in:
Lars Brubaker 2019-05-07 18:29:44 -07:00 • committed by GitHub
commit 41a3b470fc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 59 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

37
MatterControlLib/DesignTools/Primitives/XyCalibrationFaceObject3D.cs
View file

@ -40,7 +40,7 @@ namespace MatterHackers.MatterControl.DesignTools
{
public class XyCalibrationFaceObject3D : Object3D
{
public double NozzleWidth = .4;
public double NozzleWidth { get; set; } = .4;
public XyCalibrationFaceObject3D()
{
@ -53,17 +53,28 @@ namespace MatterHackers.MatterControl.DesignTools
public int CalibrationMaterialIndex { get; set; } = 1;
public override bool CanFlatten => true;
public double ChangingHeight { get; set; } = .4;
public int Layers { get; set; } = 10;
public double Offset { get; set; } = .5;
public double WipeTowerSize { get; set; } = 10;
private double TabDepth => NozzleWidth * TabScale * 5;
private double TabScale => 3;
private double TabWidth => NozzleWidth * TabScale * 3;
private double TabDepth => NozzleWidth * tabScale * 5;
public static async Task<XyCalibrationFaceObject3D> Create(int calibrationMaterialIndex,
double baseHeight, double changingHeight, double offset, double nozzleWidth, double wipeTowerSize, int layers)
private double tabScale = 3;
private double TabWidth => NozzleWidth * tabScale * 3;
public static async Task<XyCalibrationFaceObject3D> Create(int calibrationMaterialIndex = 1,
double baseHeight = .25,
double changingHeight = .2,
double offset = .5,
double nozzleWidth = .4,
double wipeTowerSize = 15,
int layers = 6)
{
var item = new XyCalibrationFaceObject3D()
{
@ -97,6 +108,18 @@ namespace MatterHackers.MatterControl.DesignTools
{
this.DebugDepth("Rebuild");
tabScale = 3;
// by default we don't want tab with to be greater than 10 mm
if (TabWidth > 10)
{
tabScale = 1;
}
else if (TabWidth > 5)
{
tabScale = 2;
}
using (RebuildLock())
{
using (new CenterAndHeightMaintainer(this))
@ -141,7 +164,7 @@ namespace MatterHackers.MatterControl.DesignTools
{
var content = new Object3D();
var spaceBetween = NozzleWidth * TabScale;
var spaceBetween = NozzleWidth * tabScale;
var shape = new VertexStorage();
shape.MoveTo(0, 0);

31
MatterControlLib/DesignTools/Primitives/XyCalibrationTabObject3D.cs
View file

@ -40,7 +40,7 @@ namespace MatterHackers.MatterControl.DesignTools
{
public class XyCalibrationTabObject3D : Object3D
{
public double NozzleWidth = .4;
public double NozzleWidth { get; set; } = .4;
public XyCalibrationTabObject3D()
{
@ -51,16 +51,23 @@ namespace MatterHackers.MatterControl.DesignTools
public int CalibrationMaterialIndex { get; set; } = 1;
public override bool CanFlatten => true;
public double ChangeHeight { get; set; } = .4;
public double Offset { get; set; } = .5;
public double WipeTowerSize { get; set; } = 10;
private double TabDepth => NozzleWidth * TabScale * 5;
private double TabScale => 3;
private double TabWidth => NozzleWidth * TabScale * 3;
private double TabDepth => NozzleWidth * tabScale * 5;
private double tabScale = 3;
private double TabWidth => NozzleWidth * tabScale * 3;
public static async Task<XyCalibrationTabObject3D> Create(int calibrationMaterialIndex = 1,
double changeHeight = .4, double offset = .5, double nozzleWidth = .4)
double changeHeight = .4,
double offset = .5,
double nozzleWidth = .4)
{
var item = new XyCalibrationTabObject3D()
{
@ -91,6 +98,18 @@ namespace MatterHackers.MatterControl.DesignTools
{
this.DebugDepth("Rebuild");
tabScale = 3;
// by default we don't want tab with to be greater than 10 mm
if (TabWidth > 10)
{
tabScale = 1;
}
else if (TabWidth > 5)
{
tabScale = 2;
}
using (RebuildLock())
{
using (new CenterAndHeightMaintainer(this))
@ -135,7 +154,7 @@ namespace MatterHackers.MatterControl.DesignTools
{
var content = new Object3D();
var spaceBetween = NozzleWidth * TabScale;
var spaceBetween = NozzleWidth * tabScale;
var shape = new VertexStorage();
shape.MoveTo(0, 0);

4
MatterControlLib/Library/Providers/MatterControl/PrimitivesContainer.cs
View file

@ -62,6 +62,10 @@ namespace MatterHackers.MatterControl.Library
() => "Calibration Tab".Localize(),
async () => await XyCalibrationTabObject3D.Create())
{ DateCreated = new System.DateTime(index++) },
new GeneratorItem(
() => "Calibration Face".Localize(),
async () => await XyCalibrationFaceObject3D.Create())
{ DateCreated = new System.DateTime(index++) },
#endif
new GeneratorItem(
() => "Pyramid".Localize(),