Merge branch 'main' of https://github.com/3DCP-TUe/SaladSlicer into main

3DCP-TUe · Aug 27, 2021 · 2621582 · 2621582
2 parents ff98346 + 1dc55c2
commit 2621582
Show file tree

Hide file tree

Showing 35 changed files with 475 additions and 142 deletions.
diff --git a/ExampleFiles/v0.1.0/01_Planar_2D_Slicer.gh b/ExampleFiles/v0.1.0/01_Planar_2D_Slicer.gh
diff --git a/ExampleFiles/v0.1.0/02_Planar_2D_Slicer_mulitple_objects.gh b/ExampleFiles/v0.1.0/02_Planar_2D_Slicer_mulitple_objects.gh
diff --git a/ExampleFiles/v0.1.0/03_Planar_3D_Slicer.gh b/ExampleFiles/v0.1.0/03_Planar_3D_Slicer.gh
diff --git a/SaladSlicer/Core/CodeGeneration/AbsoluteCoordinate.cs b/SaladSlicer/Core/CodeGeneration/AbsoluteCoordinate.cs
@@ -5,13 +5,15 @@
 
 // System Libs
 using Rhino.Geometry;
+// Salad Libs
+using SaladSlicer.Core.Interfaces;
 
 namespace SaladSlicer.Core.CodeGeneration
 {
     /// <summary>
     /// Represents an Absolute Coordinate.
     /// </summary>
-    public class AbsoluteCoordinate : IProgram
+    public class AbsoluteCoordinate : IProgram, IGeometry
     {
         #region fields
         private Plane _plane;
@@ -65,6 +67,15 @@ public IProgram DuplicateProgramObject()
         {
             return this.Duplicate() as IProgram;
         }
+
+        /// <summary>
+        /// Returns an exact duplicate of this Absolute Coordinater instance as an IGeometry.
+        /// </summary>
+        /// <returns> The exact duplicate of this Absolute Coordinate instance as an IGeometry. </returns>
+        public IGeometry DuplicateGeometryObject()
+        {
+            return this.Duplicate() as IGeometry;
+        }
         #endregion
 
         #region methods
@@ -85,6 +96,27 @@ public void ToSinumerik(ProgramGenerator programGenerator)
         {
             programGenerator.Program.Add($"X{_plane.OriginX:0.###} Y{_plane.OriginY:0.###} Z{_plane.OriginZ:0.###}");
         }
+
+        /// <summary>
+        /// Returns the Bounding Box of the object.
+        /// </summary>
+        /// <returns> The Bounding Box. </returns>
+        /// <param name="accurate"> If true, a physically accurate bounding box will be computed. If not, a bounding box estimate will be computed. </param>
+
+        public BoundingBox GetBoundingBox(bool accurate)
+        {
+            return BoundingBox.Empty;
+        }
+
+        /// <summary>
+        /// Transforms the geometry.
+        /// </summary>
+        /// <param name="xform"> Transformation to apply to geometry. </param>
+        /// <returns> True on success, false on failure. </returns>
+        public bool Transform(Transform xform)
+        {
+            return _plane.Transform(xform);
+        }
         #endregion
 
         #region properties

diff --git a/SaladSlicer/Core/CodeGeneration/CodeLine.cs b/SaladSlicer/Core/CodeGeneration/CodeLine.cs
@@ -7,6 +7,8 @@
 using System;
 using System.Runtime.Serialization;
 using System.Security.Permissions;
+// Salad Libs
+using SaladSlicer.Core.Interfaces;
 
 namespace SaladSlicer.Core.CodeGeneration
 {

diff --git a/SaladSlicer/Core/CodeGeneration/FeedRate.cs b/SaladSlicer/Core/CodeGeneration/FeedRate.cs
@@ -3,6 +3,9 @@
 // Free Software Foundation. For more information and the LICENSE file, 
 // see <https://github.com/3DCP-TUe/SaladSlicer>.
 
+// Salad Libs
+using SaladSlicer.Core.Interfaces;
+
 namespace SaladSlicer.Core.CodeGeneration
 {
     /// <summary>

diff --git a/SaladSlicer/Core/CodeGeneration/ProgramGenerator.cs b/SaladSlicer/Core/CodeGeneration/ProgramGenerator.cs
@@ -7,6 +7,7 @@
 using System.Collections.Generic;
 // Salad Slicer Libs
 using SaladSlicer.Core.Utils;
+using SaladSlicer.Core.Interfaces;
 
 namespace SaladSlicer.Core.CodeGeneration
 {

diff --git a/SaladSlicer/Core/CodeGeneration/ProgramGroup.cs b/SaladSlicer/Core/CodeGeneration/ProgramGroup.cs
@@ -5,6 +5,8 @@
 
 // System Libs
 using System.Collections.Generic;
+// Salad Libs
+using SaladSlicer.Core.Interfaces;
 
 namespace SaladSlicer.Core.CodeGeneration
 {

diff --git a/SaladSlicer/Core/Interfaces/IGeometry.cs b/SaladSlicer/Core/Interfaces/IGeometry.cs
@@ -0,0 +1,40 @@
+// This file is part of SaladSlicer. SaladSlicer is licensed 
+// under the terms of GNU General Public License as published by the 
+// Free Software Foundation. For more information and the LICENSE file, 
+// see <https://github.com/3DCP-TUe/SaladSlicer>.
+
+// Rhino Libs
+using Rhino.Geometry;
+
+namespace SaladSlicer.Core.Interfaces
+{
+    /// <summary>
+    /// Represents the interface for all classes that can have a geometry inside.
+    /// </summary>
+    public interface IGeometry
+    {
+        #region constructors
+        /// <summary>
+        /// Returns an exact duplicate of this IGeometry.
+        /// </summary>
+        /// <returns> The exact duplicate of this IGeometry. </returns>
+        IGeometry DuplicateGeometryObject();
+        #endregion
+
+        #region methods
+        /// <summary>
+        /// Transforms the geometry.
+        /// </summary>
+        /// <param name="xform"> Transformation to apply to geometry. </param>
+        /// <returns> True on success, false on failure. </returns>
+        bool Transform(Transform xform);
+
+        /// <summary>
+        /// Returns the Bounding Box of the object.
+        /// </summary>
+        /// <returns> The Bounding Box. </returns>
+        /// <param name="accurate"> If true, a physically accurate bounding box will be computed. </param>
+        BoundingBox GetBoundingBox(bool accurate);
+        #endregion
+    }
+}
diff --git a/SaladSlicer/Core/CodeGeneration/IProgram.cs → SaladSlicer/Core/Interfaces/IProgram.cs b/SaladSlicer/Core/CodeGeneration/IProgram.cs → SaladSlicer/Core/Interfaces/IProgram.cs
@@ -3,7 +3,10 @@
 // Free Software Foundation. For more information and the LICENSE file, 
 // see <https://github.com/3DCP-TUe/SaladSlicer>.
 
-namespace SaladSlicer.Core.CodeGeneration
+// Salad Libs
+using SaladSlicer.Core.CodeGeneration;
+
+namespace SaladSlicer.Core.Interfaces
 {
     /// <summary>
     /// Represents the interface for all classes that can generate code lines for a program.

diff --git a/SaladSlicer/Core/Slicers/ISlicer.cs → SaladSlicer/Core/Interfaces/ISlicer.cs b/SaladSlicer/Core/Slicers/ISlicer.cs → SaladSlicer/Core/Interfaces/ISlicer.cs
@@ -9,7 +9,7 @@
 using Rhino.Geometry;
 using SaladSlicer.Core.CodeGeneration;
 
-namespace SaladSlicer.Core.Slicers
+namespace SaladSlicer.Core.Interfaces
 {
     /// <summary>
     /// Represents the interface for all classes that can generate code lines for a program.
@@ -18,10 +18,10 @@ public interface ISlicer
     {
         #region constructors
         /// <summary>
-        /// Returns an exact duplicate of this IObject.
+        /// Returns an exact duplicate of this ISlicer
         /// </summary>
-        /// <returns> The exact duplicate of this IObject. </returns>
-        ISlicer DuplicateObject();
+        /// <returns> The exact duplicate of this ISlicer. </returns>
+        ISlicer DuplicateSlicerObject();
         #endregion
 
         #region methods
@@ -31,13 +31,6 @@ public interface ISlicer
         /// <param name="programGenerator"> The program generator. </param>
         void ToSinumerik(ProgramGenerator programGenerator);
 
-        /// <summary>
-        /// Transforms the geometry.
-        /// </summary>
-        /// <param name="xform"> Transformation to apply to geometry. </param>
-        /// <returns> True on success, false on failure. </returns>
-        bool Transform(Transform xform);
-
         /// <summary>
         /// Returns the path.
         /// </summary>
@@ -55,13 +48,6 @@ public interface ISlicer
         /// </summary>
         /// <returns> The linearized path. </returns>
         Curve GetLinearizedPath();
-
-        /// <summary>
-        /// Returns the Bounding Box of the object.
-        /// </summary>
-        /// <returns> The Bounding Box. </returns>
-        /// <param name="accurate"> If true, a physically accurate bounding box will be computed. </param>
-        BoundingBox GetBoundingBox(bool accurate);
         #endregion
 
         #region properties

diff --git a/SaladSlicer/Core/Slicers/ClosedPlanar2DSlicer.cs b/SaladSlicer/Core/Slicers/ClosedPlanar2DSlicer.cs
@@ -11,13 +11,14 @@
 // Slicer Salad Libs
 using SaladSlicer.Core.CodeGeneration;
 using SaladSlicer.Core.Geometry.Seams;
+using SaladSlicer.Core.Interfaces;
 
 namespace SaladSlicer.Core.Slicers
 {
     /// <summary>
     /// Represents the Planar 2D Slicer class.
     /// </summary>
-    public class ClosedPlanar2DSlicer : IProgram, ISlicer
+    public class ClosedPlanar2DSlicer : IProgram, ISlicer, IGeometry
     {
         #region fields
         private Curve _baseContour;
@@ -115,13 +116,22 @@ public IProgram DuplicateProgramObject()
         }
 
         /// <summary>
-        /// Returns an exact duplicate of this Planar 2D Slicer instance as an IObject.
+        /// Returns an exact duplicate of this Planar 2D Slicer instance as an ISlicer.
         /// </summary>
-        /// <returns> The exact duplicate of this Planar 2D Slicer instance as an IObject. </returns>
-        public ISlicer DuplicateObject()
+        /// <returns> The exact duplicate of this Planar 2D Slicer instance as an ISlicer. </returns>
+        public ISlicer DuplicateSlicerObject()
         {
             return this.Duplicate() as ISlicer;
         }
+
+        /// <summary>
+        /// Returns an exact duplicate of this Planar 2D Slicer instance as an IGeometry.
+        /// </summary>
+        /// <returns> The exact duplicate of this Planar 2D Slicer instance as an IGeometry. </returns>
+        public IGeometry DuplicateGeometryObject()
+        {
+            return this.Duplicate() as IGeometry;
+        }
         #endregion
 
         #region methods
@@ -309,17 +319,6 @@ public Curve GetLinearizedPath()
             return new PolylineCurve(this.GetPoints());
         }
 
-        /// <summary>
-        /// Returns the Bounding Box of the object.
-        /// </summary>
-        /// <returns> The Bounding Box. </returns>
-        /// <param name="accurate"> If true, a physically accurate bounding box will be computed. If not, a bounding box estimate will be computed. </param>
-
-        public BoundingBox GetBoundingBox(bool accurate)
-        {
-            return this.GetPath().GetBoundingBox(accurate);
-        }
-
         /// <summary>
         /// Returns the length of the path.
         /// </summary>
@@ -373,6 +372,17 @@ public List<List<Point3d>> GetPointsByLayer()
             return points;
         }
 
+        /// <summary>
+        /// Returns the Bounding Box of the object.
+        /// </summary>
+        /// <returns> The Bounding Box. </returns>
+        /// <param name="accurate"> If true, a physically accurate bounding box will be computed. If not, a bounding box estimate will be computed. </param>
+
+        public BoundingBox GetBoundingBox(bool accurate)
+        {
+            return this.GetPath().GetBoundingBox(accurate);
+        }
+
         /// <summary>
         /// Transforms the geometry.
         /// </summary>

diff --git a/SaladSlicer/Core/Slicers/ClosedPlanar3DSlicer.cs b/SaladSlicer/Core/Slicers/ClosedPlanar3DSlicer.cs
@@ -13,13 +13,14 @@
 using SaladSlicer.Core.CodeGeneration;
 using SaladSlicer.Core.Geometry;
 using SaladSlicer.Core.Geometry.Seams;
+using SaladSlicer.Core.Interfaces;
 
 namespace SaladSlicer.Core.Slicers
 {
     /// <summary>
     /// Represents the Planar 3D Slicer class.
     /// </summary>
-    public class ClosedPlanar3DSlicer : IProgram, ISlicer
+    public class ClosedPlanar3DSlicer : IProgram, ISlicer, IGeometry
     {
         #region fields
         private Mesh _mesh ;
@@ -124,13 +125,22 @@ public IProgram DuplicateProgramObject()
         }
 
         /// <summary>
-        /// Returns an exact duplicate of this Planar 3D Slicer instance as an IObject.
+        /// Returns an exact duplicate of this Planar 3D Slicer instance as an ISlicer.
         /// </summary>
-        /// <returns> The exact duplicate of this Planar 3D Slicer instance as an IObject. </returns>
-        public ISlicer DuplicateObject()
+        /// <returns> The exact duplicate of this Planar 3D Slicer instance as an ISlicer. </returns>
+        public ISlicer DuplicateSlicerObject()
         {
             return this.Duplicate() as ISlicer;
         }
+
+        /// <summary>
+        /// Returns an exact duplicate of this Planar 3D Slicer instance as an IGeometry.
+        /// </summary>
+        /// <returns> The exact duplicate of this Planar 3D Slicer instance as an IGeometry. </returns>
+        public IGeometry DuplicateGeometryObject()
+        {
+            return this.Duplicate() as IGeometry;
+        }
         #endregion
 
         #region methods
@@ -376,17 +386,6 @@ public Curve GetLinearizedPath()
             return new PolylineCurve(this.GetPoints());
         }
 
-        /// <summary>
-        /// Returns the Bounding Box of the object.
-        /// </summary>
-        /// <returns> The Bounding Box. </returns>
-        /// <param name="accurate"> If true, a physically accurate bounding box will be computed. If not, a bounding box estimate will be computed. </param>
-
-        public BoundingBox GetBoundingBox(bool accurate)
-        {
-            return this.GetPath().GetBoundingBox(accurate);
-        }
-
         /// <summary>
         /// Returns the length of the path.
         /// </summary>
@@ -440,6 +439,17 @@ public List<List<Point3d>> GetPointsByLayer()
             return points;
         }
 
+        /// <summary>
+        /// Returns the Bounding Box of the object.
+        /// </summary>
+        /// <returns> The Bounding Box. </returns>
+        /// <param name="accurate"> If true, a physically accurate bounding box will be computed. If not, a bounding box estimate will be computed. </param>
+
+        public BoundingBox GetBoundingBox(bool accurate)
+        {
+            return this.GetPath().GetBoundingBox(accurate);
+        }
+
         /// <summary>
         /// Transforms the geometry.
         /// </summary>