From 4474d43532ac2b49e93943f1c58e3a477e651285 Mon Sep 17 00:00:00 2001
From: Michael Smith <mike@mikelikescoding.com>
Date: Wed, 24 Feb 2016 22:48:54 -0800
Subject: [PATCH] Added DefaultFileInvoker, updated FileInvoker, made
 OSCADObject return a fileInvoker from .ToFile

---
 OSCADSharp/OSCADSharp.ConsoleTests/Program.cs |  2 +-
 OSCADSharp/OSCADSharp/OSCADObject.cs          |  5 +++-
 OSCADSharp/OSCADSharp/OSCADSharp.csproj       |  1 +
 .../Scripting/DefaultFileInvoker.cs           | 28 +++++++++++++++++++
 .../OSCADSharp/Scripting/IFileInvoker.cs      | 14 ++++++----
 OSCADSharp/OSCADSharp/Settings.cs             |  6 ++++
 6 files changed, 49 insertions(+), 7 deletions(-)
 create mode 100644 OSCADSharp/OSCADSharp/Scripting/DefaultFileInvoker.cs

diff --git a/OSCADSharp/OSCADSharp.ConsoleTests/Program.cs b/OSCADSharp/OSCADSharp.ConsoleTests/Program.cs
index c1b74b7..18b6f36 100644
--- a/OSCADSharp/OSCADSharp.ConsoleTests/Program.cs
+++ b/OSCADSharp/OSCADSharp.ConsoleTests/Program.cs
@@ -26,7 +26,7 @@ namespace OSCADSharp.ConsoleTests
             //var topCorner = new Sphere().Translate(obj.Bounds().TopRight);
             //var botCorner = new Sphere().Translate(obj.Bounds().BottomLeft);
 
-            (obj + axisHelper).ToFile("test.scad");
+            (obj + axisHelper).ToFile("test.scad").Open();
             
             //Console.ReadKey();
         }
diff --git a/OSCADSharp/OSCADSharp/OSCADObject.cs b/OSCADSharp/OSCADSharp/OSCADObject.cs
index 3e8b537..7e1d4a8 100644
--- a/OSCADSharp/OSCADSharp/OSCADObject.cs
+++ b/OSCADSharp/OSCADSharp/OSCADObject.cs
@@ -1,4 +1,5 @@
 using OSCADSharp.Booleans;
+using OSCADSharp.Scripting;
 using OSCADSharp.Spatial;
 using OSCADSharp.Transforms;
 using System;
@@ -320,7 +321,7 @@ namespace OSCADSharp
         /// (This is just a shortcut for File.WriteAllLines)
         /// </summary>
         /// <param name="filePath">Path for the file to write.  Including filename and (optionally) file extension</param>
-        public void ToFile(string filePath)
+        public IFileInvoker ToFile(string filePath)
         {
             string path = filePath;
 
@@ -335,6 +336,8 @@ namespace OSCADSharp
                 Settings.Globals.ToString(),
                 this.ToString()
             });
+
+            return new DefaultFileInvoker(filePath);
         }
         #endregion
 
diff --git a/OSCADSharp/OSCADSharp/OSCADSharp.csproj b/OSCADSharp/OSCADSharp/OSCADSharp.csproj
index 83d93cc..285d86a 100644
--- a/OSCADSharp/OSCADSharp/OSCADSharp.csproj
+++ b/OSCADSharp/OSCADSharp/OSCADSharp.csproj
@@ -42,6 +42,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Scripting\DefaultFileInvoker.cs" />
     <Compile Include="Scripting\DefaultFileWriter.cs" />
     <Compile Include="Scripting\IFileInvoker.cs" />
     <Compile Include="Scripting\IFileWriter.cs" />
diff --git a/OSCADSharp/OSCADSharp/Scripting/DefaultFileInvoker.cs b/OSCADSharp/OSCADSharp/Scripting/DefaultFileInvoker.cs
new file mode 100644
index 0000000..f67ad89
--- /dev/null
+++ b/OSCADSharp/OSCADSharp/Scripting/DefaultFileInvoker.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OSCADSharp.Scripting
+{
+    internal class DefaultFileInvoker : IFileInvoker
+    {
+        private string filePath;
+        public DefaultFileInvoker(string filePath)
+        {
+            this.filePath = filePath;
+        }
+
+        public void CreateModel(string outputFile)
+        {
+            Process.Start(Settings.OpenSCADPath, String.Format("-o {0} {1}", outputFile, this.filePath));
+        }        
+
+        public void Open()
+        {
+            Process.Start(Settings.OpenSCADPath, String.Format("{0}", this.filePath));
+        }
+    }
+}
diff --git a/OSCADSharp/OSCADSharp/Scripting/IFileInvoker.cs b/OSCADSharp/OSCADSharp/Scripting/IFileInvoker.cs
index 52ee115..e220af8 100644
--- a/OSCADSharp/OSCADSharp/Scripting/IFileInvoker.cs
+++ b/OSCADSharp/OSCADSharp/Scripting/IFileInvoker.cs
@@ -7,15 +7,19 @@ using System.Threading.Tasks;
 namespace OSCADSharp.Scripting
 {
     /// <summary>
-    /// Opens a file
+    /// Invokes OpenSCAD actions on output files
     /// </summary>
     public interface IFileInvoker
     {
         /// <summary>
-        /// Opens the specified file
+        /// Launches OpenSCAD with the specified file open
         /// </summary>
-        /// <param name="path">Path to the file to open</param>
-        /// <param name="arguments">Command-line arguments to pass in</param>
-        void Invoke(string path, string arguments = null);
+        void Open();
+
+        /// <summary>
+        /// Generates an STL from this file with the specified path/name
+        /// </summary>
+        /// <param name="outputFile"></param>
+        void CreateModel(string outputFile);        
     }
 }
diff --git a/OSCADSharp/OSCADSharp/Settings.cs b/OSCADSharp/OSCADSharp/Settings.cs
index d6b183f..7a732c9 100644
--- a/OSCADSharp/OSCADSharp/Settings.cs
+++ b/OSCADSharp/OSCADSharp/Settings.cs
@@ -28,5 +28,11 @@ namespace OSCADSharp
         /// Used to write scripts to file
         /// </summary>
         public static IFileWriter FileWriter = new DefaultFileWriter();
+
+        /// <summary>
+        /// Path to the OpenSCAD executable for file invocation
+        /// (Default value is set the default install directory on Windows)
+        /// </summary>
+        public static string OpenSCADPath = @"C:\Program Files (x86)\OpenSCAD\openscad.exe";
     }
 }