elias/OSCADSharpDotnet7
1
0
Fork 0
mirror of https://github.com/eliasstepanik/OSCADSharpDotnet7.git synced 2026-01-27 04:48:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replaced a bunch of conditionals with new method BindIfVariableNotNull

Browse Source
This commit is contained in:
Michael Smith 2016-03-03 21:27:56 -08:00
parent 730b54d703
commit 4c51ffc3f4
8 changed files with 31 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
OSCADSharp/OSCADSharp/OSCADObject.cs
View File

@ -767,6 +767,17 @@ namespace OSCADSharp
/// </summary> /// </summary>
internal OSCADObject Parent { get; set; } internal OSCADObject Parent { get; set; }
/// <summary>
/// If the variable is not null, binds it to the property specified
/// </summary>
/// <param name="property"></param>
/// <param name="variable"></param>
internal void BindIfVariableNotNull(string property, Variable variable)
{
if (variable != null)
this.Bind(property, variable);
}
/// <summary> /// <summary>
/// Internal collection of children for this object /// Internal collection of children for this object
/// </summary> /// </summary>

12
OSCADSharp/OSCADSharp/Solids/Sphere.cs
View File

@ -75,14 +75,10 @@ namespace OSCADSharp.Solids
/// <param name="minimumFragmentSize"></param> /// <param name="minimumFragmentSize"></param>
public Sphere(Variable diameter = null, Variable resolution = null, Variable minimumAngle = null, Variable minimumFragmentSize = null) public Sphere(Variable diameter = null, Variable resolution = null, Variable minimumAngle = null, Variable minimumFragmentSize = null)
{ {
if (diameter != null) this.BindIfVariableNotNull("diameter", diameter);
this.Bind("diameter", diameter); this.BindIfVariableNotNull("resolution", resolution);
if (resolution != null) this.BindIfVariableNotNull("minimumangle", minimumAngle);
this.Bind("resolution", resolution); this.BindIfVariableNotNull("minimumfragmentsize", minimumFragmentSize);
if (minimumAngle != null)
this.Bind("minimumangle", minimumAngle);
if (minimumFragmentSize != null)
this.Bind("minimumfragmentsize", minimumFragmentSize);
} }
#endregion #endregion

5
OSCADSharp/OSCADSharp/Transforms/ColoredObject.cs
View File

@ -39,10 +39,7 @@ namespace OSCADSharp.Transforms
internal ColoredObject(OSCADObject obj, Variable colorName, Variable opacity) : base(obj) internal ColoredObject(OSCADObject obj, Variable colorName, Variable opacity) : base(obj)
{ {
this.Bind("color", colorName); this.Bind("color", colorName);
if(opacity != null) this.BindIfVariableNotNull("opacity", opacity);
{
this.Bind("opacity", opacity);
}
} }
public override string ToString() public override string ToString()

10
OSCADSharp/OSCADSharp/Transforms/MirroredObject.cs
View File

@ -38,13 +38,9 @@ namespace OSCADSharp.Transforms
internal MirroredObject(OSCADObject obj, Vector3 normal, Variable x, Variable y, Variable z) : base(obj) internal MirroredObject(OSCADObject obj, Vector3 normal, Variable x, Variable y, Variable z) : base(obj)
{ {
this.Normal = new BindableVector(normal); this.Normal = new BindableVector(normal);
this.BindIfVariableNotNull("x", x);
if (x != null) this.BindIfVariableNotNull("y", y);
this.Bind("x", x); this.BindIfVariableNotNull("z", z);
if (y != null)
this.Bind("y", y);
if (z != null)
this.Bind("z", z);
} }
public override string ToString() public override string ToString()

9
OSCADSharp/OSCADSharp/Transforms/ResizedObject.cs
View File

@ -38,12 +38,9 @@ namespace OSCADSharp.Transforms
{ {
this.Size = new BindableVector(size); this.Size = new BindableVector(size);
if (x != null) this.BindIfVariableNotNull("x", x);
this.Bind("x", x); this.BindIfVariableNotNull("y", y);
if (y != null) this.BindIfVariableNotNull("z", z);
this.Bind("y", y);
if (z != null)
this.Bind("z", z);
} }
public override string ToString() public override string ToString()

9
OSCADSharp/OSCADSharp/Transforms/RotatedObject.cs
View File

@ -38,12 +38,9 @@ namespace OSCADSharp.Transforms
{ {
this.Angle = new BindableVector(angle); this.Angle = new BindableVector(angle);
if (x != null) this.BindIfVariableNotNull("x", x);
this.Bind("x", x); this.BindIfVariableNotNull("y", y);
if (y != null) this.BindIfVariableNotNull("z", z);
this.Bind("y", y);
if (z != null)
this.Bind("z", z);
} }
public override string ToString() public override string ToString()

9
OSCADSharp/OSCADSharp/Transforms/ScaledObject.cs
View File

@ -38,12 +38,9 @@ namespace OSCADSharp.Transforms
{ {
this.ScaleFactor = new BindableVector(scale); this.ScaleFactor = new BindableVector(scale);
if (x != null) this.BindIfVariableNotNull("x", x);
this.Bind("x", x); this.BindIfVariableNotNull("y", y);
if (y != null) this.BindIfVariableNotNull("z", z);
this.Bind("y", y);
if (z != null)
this.Bind("z", z);
} }
public override string ToString() public override string ToString()

9
OSCADSharp/OSCADSharp/Transforms/TranslatedObject.cs
View File

@ -35,12 +35,9 @@ namespace OSCADSharp.Transforms
{ {
this.Vector = new BindableVector(vector); this.Vector = new BindableVector(vector);
if (x != null) this.BindIfVariableNotNull("x", x);
this.Bind("x", x); this.BindIfVariableNotNull("y", y);
if (y != null) this.BindIfVariableNotNull("z", z);
this.Bind("y", y);
if (z != null)
this.Bind("z", z);
} }
public override string ToString() public override string ToString()