From 301e92dfff8e253b2b55bab145b091848d2bc2ef Mon Sep 17 00:00:00 2001 From: Michael L Smith Date: Sun, 6 Mar 2016 16:28:06 -0800 Subject: [PATCH] Shifted all publicly visible classes to the OSCADSharp namespace --- OSCADSharp/OSCADSharp.ConsoleTests/Program.cs | 11 +---------- .../OSCADSharp.UnitTests/Booleans/DifferenceTests.cs | 3 +-- .../Booleans/IntersectionTests.cs | 1 - .../OSCADSharp.UnitTests/Booleans/UnionTests.cs | 1 - OSCADSharp/OSCADSharp.UnitTests/InterpolationTests.cs | 1 - OSCADSharp/OSCADSharp.UnitTests/OSCADObjectTests.cs | 1 - OSCADSharp/OSCADSharp.UnitTests/SettingsTests.cs | 1 - OSCADSharp/OSCADSharp.UnitTests/Solids/CubeTests.cs | 1 - .../OSCADSharp.UnitTests/Solids/CylinderTests.cs | 1 - OSCADSharp/OSCADSharp.UnitTests/Solids/SphereTests.cs | 1 - OSCADSharp/OSCADSharp.UnitTests/Solids/Text3DTests.cs | 1 - .../OSCADSharp.UnitTests/Transforms/ColorTests.cs | 1 - .../OSCADSharp.UnitTests/Transforms/HullTests.cs | 1 - .../OSCADSharp.UnitTests/Transforms/MinkowskiTests.cs | 1 - .../OSCADSharp.UnitTests/Transforms/MirrorTests.cs | 5 ++--- .../OSCADSharp.UnitTests/Transforms/ResizeTests.cs | 1 - .../OSCADSharp.UnitTests/Transforms/RotateTests.cs | 1 - .../OSCADSharp.UnitTests/Transforms/ScaleTests.cs | 1 - .../OSCADSharp.UnitTests/Transforms/TranslateTests.cs | 1 - OSCADSharp/OSCADSharp/Bindings/IBindable.cs | 2 +- OSCADSharp/OSCADSharp/Files/IFileInvoker.cs | 2 +- OSCADSharp/OSCADSharp/Files/IFileWriter.cs | 2 +- OSCADSharp/OSCADSharp/{Sizes.cs => Inches.cs} | 0 OSCADSharp/OSCADSharp/OSCADSharp.csproj | 2 +- OSCADSharp/OSCADSharp/Scripting/Variable.cs | 2 +- OSCADSharp/OSCADSharp/Scripting/VariableCalculator.cs | 2 +- OSCADSharp/OSCADSharp/Scripting/Variables.cs | 2 +- OSCADSharp/OSCADSharp/Solids/Cube.cs | 2 +- OSCADSharp/OSCADSharp/Solids/Cylinder.cs | 2 +- OSCADSharp/OSCADSharp/Solids/Sphere.cs | 2 +- OSCADSharp/OSCADSharp/Solids/Text3D.cs | 2 +- OSCADSharp/OSCADSharp/Spatial/Bounds.cs | 2 +- 32 files changed, 16 insertions(+), 43 deletions(-) rename OSCADSharp/OSCADSharp/{Sizes.cs => Inches.cs} (100%) diff --git a/OSCADSharp/OSCADSharp.ConsoleTests/Program.cs b/OSCADSharp/OSCADSharp.ConsoleTests/Program.cs index d870519..8d9a5df 100644 --- a/OSCADSharp/OSCADSharp.ConsoleTests/Program.cs +++ b/OSCADSharp/OSCADSharp.ConsoleTests/Program.cs @@ -1,13 +1,4 @@ -using OSCADSharp.Scripting; -using OSCADSharp.Solids; -using OSCADSharp.Transforms; -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - + namespace OSCADSharp.ConsoleTests { class Program diff --git a/OSCADSharp/OSCADSharp.UnitTests/Booleans/DifferenceTests.cs b/OSCADSharp/OSCADSharp.UnitTests/Booleans/DifferenceTests.cs index 3d425e4..890c5ef 100644 --- a/OSCADSharp/OSCADSharp.UnitTests/Booleans/DifferenceTests.cs +++ b/OSCADSharp/OSCADSharp.UnitTests/Booleans/DifferenceTests.cs @@ -1,6 +1,5 @@ using System; using Microsoft.VisualStudio.TestTools.UnitTesting; -using OSCADSharp.Solids; using System.Linq; namespace OSCADSharp.UnitTests @@ -60,7 +59,7 @@ namespace OSCADSharp.UnitTests { var diff = new Cube() - new Sphere(); - diff.Bind("SomeProperty", new Scripting.Variable("test", 5)); + diff.Bind("SomeProperty", new Variable("test", 5)); } } } diff --git a/OSCADSharp/OSCADSharp.UnitTests/Booleans/IntersectionTests.cs b/OSCADSharp/OSCADSharp.UnitTests/Booleans/IntersectionTests.cs index 07a562b..8ff8f4e 100644 --- a/OSCADSharp/OSCADSharp.UnitTests/Booleans/IntersectionTests.cs +++ b/OSCADSharp/OSCADSharp.UnitTests/Booleans/IntersectionTests.cs @@ -1,6 +1,5 @@ using System; using Microsoft.VisualStudio.TestTools.UnitTesting; -using OSCADSharp.Solids; namespace OSCADSharp.UnitTests { diff --git a/OSCADSharp/OSCADSharp.UnitTests/Booleans/UnionTests.cs b/OSCADSharp/OSCADSharp.UnitTests/Booleans/UnionTests.cs index 0ae5468..1cad3da 100644 --- a/OSCADSharp/OSCADSharp.UnitTests/Booleans/UnionTests.cs +++ b/OSCADSharp/OSCADSharp.UnitTests/Booleans/UnionTests.cs @@ -1,5 +1,4 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; -using OSCADSharp.Solids; using System; using System.Collections.Generic; using System.Linq; diff --git a/OSCADSharp/OSCADSharp.UnitTests/InterpolationTests.cs b/OSCADSharp/OSCADSharp.UnitTests/InterpolationTests.cs index f64e3d8..35c75b2 100644 --- a/OSCADSharp/OSCADSharp.UnitTests/InterpolationTests.cs +++ b/OSCADSharp/OSCADSharp.UnitTests/InterpolationTests.cs @@ -1,5 +1,4 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; -using OSCADSharp.Solids; using System; using System.Collections.Generic; using System.Linq; diff --git a/OSCADSharp/OSCADSharp.UnitTests/OSCADObjectTests.cs b/OSCADSharp/OSCADSharp.UnitTests/OSCADObjectTests.cs index 989b604..7e25215 100644 --- a/OSCADSharp/OSCADSharp.UnitTests/OSCADObjectTests.cs +++ b/OSCADSharp/OSCADSharp.UnitTests/OSCADObjectTests.cs @@ -2,7 +2,6 @@ using Moq; using OSCADSharp.Files; using OSCADSharp.Scripting; -using OSCADSharp.Solids; using System; using System.Collections.Concurrent; using System.Collections.Generic; diff --git a/OSCADSharp/OSCADSharp.UnitTests/SettingsTests.cs b/OSCADSharp/OSCADSharp.UnitTests/SettingsTests.cs index 824a5d2..90242b8 100644 --- a/OSCADSharp/OSCADSharp.UnitTests/SettingsTests.cs +++ b/OSCADSharp/OSCADSharp.UnitTests/SettingsTests.cs @@ -2,7 +2,6 @@ using Moq; using OSCADSharp.Files; using OSCADSharp.Scripting; -using OSCADSharp.Solids; using System; using System.Collections.Generic; using System.Linq; diff --git a/OSCADSharp/OSCADSharp.UnitTests/Solids/CubeTests.cs b/OSCADSharp/OSCADSharp.UnitTests/Solids/CubeTests.cs index e7b5652..ad676e4 100644 --- a/OSCADSharp/OSCADSharp.UnitTests/Solids/CubeTests.cs +++ b/OSCADSharp/OSCADSharp.UnitTests/Solids/CubeTests.cs @@ -2,7 +2,6 @@ using System.Text; using System.Collections.Generic; using Microsoft.VisualStudio.TestTools.UnitTesting; -using OSCADSharp.Solids; using OSCADSharp.Scripting; namespace OSCADSharp.UnitTests diff --git a/OSCADSharp/OSCADSharp.UnitTests/Solids/CylinderTests.cs b/OSCADSharp/OSCADSharp.UnitTests/Solids/CylinderTests.cs index 474ebb5..bfa95e3 100644 --- a/OSCADSharp/OSCADSharp.UnitTests/Solids/CylinderTests.cs +++ b/OSCADSharp/OSCADSharp.UnitTests/Solids/CylinderTests.cs @@ -1,6 +1,5 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using OSCADSharp.Scripting; -using OSCADSharp.Solids; using System; using System.Collections.Generic; using System.Linq; diff --git a/OSCADSharp/OSCADSharp.UnitTests/Solids/SphereTests.cs b/OSCADSharp/OSCADSharp.UnitTests/Solids/SphereTests.cs index 6b2d01a..a124228 100644 --- a/OSCADSharp/OSCADSharp.UnitTests/Solids/SphereTests.cs +++ b/OSCADSharp/OSCADSharp.UnitTests/Solids/SphereTests.cs @@ -1,6 +1,5 @@ using System; using Microsoft.VisualStudio.TestTools.UnitTesting; -using OSCADSharp.Solids; using OSCADSharp.Scripting; namespace OSCADSharp.UnitTests diff --git a/OSCADSharp/OSCADSharp.UnitTests/Solids/Text3DTests.cs b/OSCADSharp/OSCADSharp.UnitTests/Solids/Text3DTests.cs index fdf9908..bbc212b 100644 --- a/OSCADSharp/OSCADSharp.UnitTests/Solids/Text3DTests.cs +++ b/OSCADSharp/OSCADSharp.UnitTests/Solids/Text3DTests.cs @@ -1,6 +1,5 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using OSCADSharp.Scripting; -using OSCADSharp.Solids; using System; using System.Collections.Generic; using System.Linq; diff --git a/OSCADSharp/OSCADSharp.UnitTests/Transforms/ColorTests.cs b/OSCADSharp/OSCADSharp.UnitTests/Transforms/ColorTests.cs index 5d67864..64a080b 100644 --- a/OSCADSharp/OSCADSharp.UnitTests/Transforms/ColorTests.cs +++ b/OSCADSharp/OSCADSharp.UnitTests/Transforms/ColorTests.cs @@ -1,6 +1,5 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using OSCADSharp.Scripting; -using OSCADSharp.Solids; using System; using System.Collections.Generic; using System.Linq; diff --git a/OSCADSharp/OSCADSharp.UnitTests/Transforms/HullTests.cs b/OSCADSharp/OSCADSharp.UnitTests/Transforms/HullTests.cs index 174698e..ec3df58 100644 --- a/OSCADSharp/OSCADSharp.UnitTests/Transforms/HullTests.cs +++ b/OSCADSharp/OSCADSharp.UnitTests/Transforms/HullTests.cs @@ -1,5 +1,4 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; -using OSCADSharp.Solids; using System; using System.Collections.Generic; using System.Linq; diff --git a/OSCADSharp/OSCADSharp.UnitTests/Transforms/MinkowskiTests.cs b/OSCADSharp/OSCADSharp.UnitTests/Transforms/MinkowskiTests.cs index 072e840..52bf6d0 100644 --- a/OSCADSharp/OSCADSharp.UnitTests/Transforms/MinkowskiTests.cs +++ b/OSCADSharp/OSCADSharp.UnitTests/Transforms/MinkowskiTests.cs @@ -1,6 +1,5 @@ using System; using Microsoft.VisualStudio.TestTools.UnitTesting; -using OSCADSharp.Solids; namespace OSCADSharp.UnitTests { diff --git a/OSCADSharp/OSCADSharp.UnitTests/Transforms/MirrorTests.cs b/OSCADSharp/OSCADSharp.UnitTests/Transforms/MirrorTests.cs index 6ccec09..d00f72f 100644 --- a/OSCADSharp/OSCADSharp.UnitTests/Transforms/MirrorTests.cs +++ b/OSCADSharp/OSCADSharp.UnitTests/Transforms/MirrorTests.cs @@ -1,6 +1,5 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using OSCADSharp.Scripting; -using OSCADSharp.Solids; using System; using System.Collections.Generic; using System.Linq; @@ -65,7 +64,7 @@ namespace OSCADSharp.UnitTests public void Mirror_CanBindNormal() { var cube = new Cube(5, 20, 15).Mirror(1, 0, 0); - cube.Bind("normal", new Scripting.Variable("myVar", new Vector3(1, 0, 0))); + cube.Bind("normal", new Variable("myVar", new Vector3(1, 0, 0))); string script = cube.ToString(); Assert.IsTrue(script.Contains("mirror(myVar)")); @@ -74,7 +73,7 @@ namespace OSCADSharp.UnitTests [TestMethod] public void Mirror_CanBindNormalWithParameter() { - var cube = new Cube(5, 20, 15).Mirror(new Scripting.Variable("myVar", new Vector3(1, 0, 0))); + var cube = new Cube(5, 20, 15).Mirror(new Variable("myVar", new Vector3(1, 0, 0))); string script = cube.ToString(); Assert.IsTrue(script.Contains("mirror(myVar)")); diff --git a/OSCADSharp/OSCADSharp.UnitTests/Transforms/ResizeTests.cs b/OSCADSharp/OSCADSharp.UnitTests/Transforms/ResizeTests.cs index c32a2d1..9c8f656 100644 --- a/OSCADSharp/OSCADSharp.UnitTests/Transforms/ResizeTests.cs +++ b/OSCADSharp/OSCADSharp.UnitTests/Transforms/ResizeTests.cs @@ -1,6 +1,5 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using OSCADSharp.Scripting; -using OSCADSharp.Solids; using System; using System.Collections.Generic; using System.Linq; diff --git a/OSCADSharp/OSCADSharp.UnitTests/Transforms/RotateTests.cs b/OSCADSharp/OSCADSharp.UnitTests/Transforms/RotateTests.cs index e776aeb..e56b314 100644 --- a/OSCADSharp/OSCADSharp.UnitTests/Transforms/RotateTests.cs +++ b/OSCADSharp/OSCADSharp.UnitTests/Transforms/RotateTests.cs @@ -1,6 +1,5 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using OSCADSharp.Scripting; -using OSCADSharp.Solids; using System; using System.Collections.Generic; using System.Linq; diff --git a/OSCADSharp/OSCADSharp.UnitTests/Transforms/ScaleTests.cs b/OSCADSharp/OSCADSharp.UnitTests/Transforms/ScaleTests.cs index 6ed5564..d510eaa 100644 --- a/OSCADSharp/OSCADSharp.UnitTests/Transforms/ScaleTests.cs +++ b/OSCADSharp/OSCADSharp.UnitTests/Transforms/ScaleTests.cs @@ -1,6 +1,5 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using OSCADSharp.Scripting; -using OSCADSharp.Solids; using System; using System.Collections.Generic; using System.Linq; diff --git a/OSCADSharp/OSCADSharp.UnitTests/Transforms/TranslateTests.cs b/OSCADSharp/OSCADSharp.UnitTests/Transforms/TranslateTests.cs index e1442ec..be8b334 100644 --- a/OSCADSharp/OSCADSharp.UnitTests/Transforms/TranslateTests.cs +++ b/OSCADSharp/OSCADSharp.UnitTests/Transforms/TranslateTests.cs @@ -1,6 +1,5 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using OSCADSharp.Scripting; -using OSCADSharp.Solids; using System; using System.Collections.Generic; using System.Linq; diff --git a/OSCADSharp/OSCADSharp/Bindings/IBindable.cs b/OSCADSharp/OSCADSharp/Bindings/IBindable.cs index 4e89fac..4379f56 100644 --- a/OSCADSharp/OSCADSharp/Bindings/IBindable.cs +++ b/OSCADSharp/OSCADSharp/Bindings/IBindable.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace OSCADSharp.Bindings +namespace OSCADSharp { /// /// An object whose properties can be bound to variables diff --git a/OSCADSharp/OSCADSharp/Files/IFileInvoker.cs b/OSCADSharp/OSCADSharp/Files/IFileInvoker.cs index 9cf7f51..d40afaf 100644 --- a/OSCADSharp/OSCADSharp/Files/IFileInvoker.cs +++ b/OSCADSharp/OSCADSharp/Files/IFileInvoker.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace OSCADSharp.Files +namespace OSCADSharp { /// /// Invokes OpenSCAD actions on output files diff --git a/OSCADSharp/OSCADSharp/Files/IFileWriter.cs b/OSCADSharp/OSCADSharp/Files/IFileWriter.cs index 5571318..eb6000d 100644 --- a/OSCADSharp/OSCADSharp/Files/IFileWriter.cs +++ b/OSCADSharp/OSCADSharp/Files/IFileWriter.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace OSCADSharp.Files +namespace OSCADSharp { /// /// A class that takes text and writes to file diff --git a/OSCADSharp/OSCADSharp/Sizes.cs b/OSCADSharp/OSCADSharp/Inches.cs similarity index 100% rename from OSCADSharp/OSCADSharp/Sizes.cs rename to OSCADSharp/OSCADSharp/Inches.cs diff --git a/OSCADSharp/OSCADSharp/OSCADSharp.csproj b/OSCADSharp/OSCADSharp/OSCADSharp.csproj index 2d14881..636e079 100644 --- a/OSCADSharp/OSCADSharp/OSCADSharp.csproj +++ b/OSCADSharp/OSCADSharp/OSCADSharp.csproj @@ -58,7 +58,7 @@ - + diff --git a/OSCADSharp/OSCADSharp/Scripting/Variable.cs b/OSCADSharp/OSCADSharp/Scripting/Variable.cs index 6ce1486..2d3abda 100644 --- a/OSCADSharp/OSCADSharp/Scripting/Variable.cs +++ b/OSCADSharp/OSCADSharp/Scripting/Variable.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace OSCADSharp.Scripting +namespace OSCADSharp { /// /// A value for setting object properties in script output to diff --git a/OSCADSharp/OSCADSharp/Scripting/VariableCalculator.cs b/OSCADSharp/OSCADSharp/Scripting/VariableCalculator.cs index 4c0976c..31ebd10 100644 --- a/OSCADSharp/OSCADSharp/Scripting/VariableCalculator.cs +++ b/OSCADSharp/OSCADSharp/Scripting/VariableCalculator.cs @@ -6,7 +6,7 @@ using System.Linq.Expressions; using System.Text; using System.Threading.Tasks; -namespace OSCADSharp.Scripting +namespace OSCADSharp { internal static class VariableCalculator { diff --git a/OSCADSharp/OSCADSharp/Scripting/Variables.cs b/OSCADSharp/OSCADSharp/Scripting/Variables.cs index 84be48b..b480cb9 100644 --- a/OSCADSharp/OSCADSharp/Scripting/Variables.cs +++ b/OSCADSharp/OSCADSharp/Scripting/Variables.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace OSCADSharp.Scripting +namespace OSCADSharp { /// /// A collection of names/values for variables diff --git a/OSCADSharp/OSCADSharp/Solids/Cube.cs b/OSCADSharp/OSCADSharp/Solids/Cube.cs index d6345d6..f426e47 100644 --- a/OSCADSharp/OSCADSharp/Solids/Cube.cs +++ b/OSCADSharp/OSCADSharp/Solids/Cube.cs @@ -7,7 +7,7 @@ using OSCADSharp.Spatial; using OSCADSharp.Bindings; using OSCADSharp.Scripting; -namespace OSCADSharp.Solids +namespace OSCADSharp { /// /// A Cube geometry diff --git a/OSCADSharp/OSCADSharp/Solids/Cylinder.cs b/OSCADSharp/OSCADSharp/Solids/Cylinder.cs index 1ffb705..8d52229 100644 --- a/OSCADSharp/OSCADSharp/Solids/Cylinder.cs +++ b/OSCADSharp/OSCADSharp/Solids/Cylinder.cs @@ -7,7 +7,7 @@ using OSCADSharp.Spatial; using OSCADSharp.Scripting; using OSCADSharp.Bindings; -namespace OSCADSharp.Solids +namespace OSCADSharp { /// /// A Cylinder geometry diff --git a/OSCADSharp/OSCADSharp/Solids/Sphere.cs b/OSCADSharp/OSCADSharp/Solids/Sphere.cs index f83b108..a23d780 100644 --- a/OSCADSharp/OSCADSharp/Solids/Sphere.cs +++ b/OSCADSharp/OSCADSharp/Solids/Sphere.cs @@ -9,7 +9,7 @@ using System.Collections.Concurrent; using System.Reflection; using OSCADSharp.Bindings; -namespace OSCADSharp.Solids +namespace OSCADSharp { /// /// A Sphere geometry diff --git a/OSCADSharp/OSCADSharp/Solids/Text3D.cs b/OSCADSharp/OSCADSharp/Solids/Text3D.cs index e29d368..d31ea7c 100644 --- a/OSCADSharp/OSCADSharp/Solids/Text3D.cs +++ b/OSCADSharp/OSCADSharp/Solids/Text3D.cs @@ -7,7 +7,7 @@ using System.Threading.Tasks; using OSCADSharp.Spatial; using OSCADSharp.Bindings; -namespace OSCADSharp.Solids +namespace OSCADSharp { /// /// Create text using fonts installed on the local system or provided as separate font file. diff --git a/OSCADSharp/OSCADSharp/Spatial/Bounds.cs b/OSCADSharp/OSCADSharp/Spatial/Bounds.cs index 3d981ce..3fe54e6 100644 --- a/OSCADSharp/OSCADSharp/Spatial/Bounds.cs +++ b/OSCADSharp/OSCADSharp/Spatial/Bounds.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace OSCADSharp.Spatial +namespace OSCADSharp { /// /// A set of boundaries