diff --git a/OSCADSharp/OSCADSharp/OSCADSharp.csproj b/OSCADSharp/OSCADSharp/OSCADSharp.csproj index d6d2fcd..fb19b38 100644 --- a/OSCADSharp/OSCADSharp/OSCADSharp.csproj +++ b/OSCADSharp/OSCADSharp/OSCADSharp.csproj @@ -48,14 +48,14 @@ - - - - + + + + - - + + diff --git a/OSCADSharp/OSCADSharp/Solids/Imported/ImportedImage.cs b/OSCADSharp/OSCADSharp/Solids/Imported/ImportedImage.cs index 9089590..2840588 100644 --- a/OSCADSharp/OSCADSharp/Solids/Imported/ImportedImage.cs +++ b/OSCADSharp/OSCADSharp/Solids/Imported/ImportedImage.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; using OSCADSharp.DataBinding; using OSCADSharp.Spatial; using System.Drawing; -using OSCADSharp.Solids.Imported.Images; +using OSCADSharp.Utility.Images; namespace OSCADSharp.Solids.Imported { diff --git a/OSCADSharp/OSCADSharp/Solids/Imported/Images/AdjacentPixelMatrix.cs b/OSCADSharp/OSCADSharp/Utility/Images/AdjacentPixelMatrix.cs similarity index 98% rename from OSCADSharp/OSCADSharp/Solids/Imported/Images/AdjacentPixelMatrix.cs rename to OSCADSharp/OSCADSharp/Utility/Images/AdjacentPixelMatrix.cs index 74599a4..906df18 100644 --- a/OSCADSharp/OSCADSharp/Solids/Imported/Images/AdjacentPixelMatrix.cs +++ b/OSCADSharp/OSCADSharp/Utility/Images/AdjacentPixelMatrix.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace OSCADSharp.Solids.Imported.Images +namespace OSCADSharp.Utility.Images { /// /// A matrix for finding neighbors in regions of pixels diff --git a/OSCADSharp/OSCADSharp/Solids/Imported/Images/CubistImageProcessor.cs b/OSCADSharp/OSCADSharp/Utility/Images/CubistImageProcessor.cs similarity index 99% rename from OSCADSharp/OSCADSharp/Solids/Imported/Images/CubistImageProcessor.cs rename to OSCADSharp/OSCADSharp/Utility/Images/CubistImageProcessor.cs index 183db49..2cf4f31 100644 --- a/OSCADSharp/OSCADSharp/Solids/Imported/Images/CubistImageProcessor.cs +++ b/OSCADSharp/OSCADSharp/Utility/Images/CubistImageProcessor.cs @@ -6,7 +6,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace OSCADSharp.Solids.Imported.Images +namespace OSCADSharp.Utility.Images { /// /// Processes a bitmap image by treating contiguous same-color regions as cubes diff --git a/OSCADSharp/OSCADSharp/Solids/Imported/Images/IImageProcessor.cs b/OSCADSharp/OSCADSharp/Utility/Images/IImageProcessor.cs similarity index 86% rename from OSCADSharp/OSCADSharp/Solids/Imported/Images/IImageProcessor.cs rename to OSCADSharp/OSCADSharp/Utility/Images/IImageProcessor.cs index e08a94d..6d30bc9 100644 --- a/OSCADSharp/OSCADSharp/Solids/Imported/Images/IImageProcessor.cs +++ b/OSCADSharp/OSCADSharp/Utility/Images/IImageProcessor.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace OSCADSharp.Solids.Imported.Images +namespace OSCADSharp.Utility.Images { internal interface IImageProcessor { diff --git a/OSCADSharp/OSCADSharp/Solids/Imported/Images/ImageImportMode.cs b/OSCADSharp/OSCADSharp/Utility/Images/ImageImportMode.cs similarity index 93% rename from OSCADSharp/OSCADSharp/Solids/Imported/Images/ImageImportMode.cs rename to OSCADSharp/OSCADSharp/Utility/Images/ImageImportMode.cs index 72f6b0c..dc4d45e 100644 --- a/OSCADSharp/OSCADSharp/Solids/Imported/Images/ImageImportMode.cs +++ b/OSCADSharp/OSCADSharp/Utility/Images/ImageImportMode.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace OSCADSharp.Solids.Imported.Images +namespace OSCADSharp.Utility.Images { /// /// Ways to process imported images into 3D models diff --git a/OSCADSharp/OSCADSharp/Solids/Imported/Images/NeighboringPointFinder.cs b/OSCADSharp/OSCADSharp/Utility/Images/NeighboringPointFinder.cs similarity index 98% rename from OSCADSharp/OSCADSharp/Solids/Imported/Images/NeighboringPointFinder.cs rename to OSCADSharp/OSCADSharp/Utility/Images/NeighboringPointFinder.cs index 52f5538..ac1a3c6 100644 --- a/OSCADSharp/OSCADSharp/Solids/Imported/Images/NeighboringPointFinder.cs +++ b/OSCADSharp/OSCADSharp/Utility/Images/NeighboringPointFinder.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace OSCADSharp.Solids.Imported.Images +namespace OSCADSharp.Utility.Images { /// /// Helper class to reuse code in image processing for finding adjacent pixels diff --git a/OSCADSharp/OSCADSharp/Solids/Imported/Images/PolygonalImageProcessor.cs b/OSCADSharp/OSCADSharp/Utility/Images/PolygonalImageProcessor.cs similarity index 99% rename from OSCADSharp/OSCADSharp/Solids/Imported/Images/PolygonalImageProcessor.cs rename to OSCADSharp/OSCADSharp/Utility/Images/PolygonalImageProcessor.cs index 1199f11..f44b632 100644 --- a/OSCADSharp/OSCADSharp/Solids/Imported/Images/PolygonalImageProcessor.cs +++ b/OSCADSharp/OSCADSharp/Utility/Images/PolygonalImageProcessor.cs @@ -7,7 +7,7 @@ using System.Text; using System.Threading.Tasks; using OSCADSharp.DataBinding; -namespace OSCADSharp.Solids.Imported.Images +namespace OSCADSharp.Utility.Images {