Merge pull request #42 from AndyEveritt/mac_support

Mac support

Makefile

@@ -1,2 +1,2 @@
 exe:
-	pyinstaller main.py --onefile --name ASMBL-dev
+	pyinstaller main.py --onefile --name ASMBL

src/ASMBL_parser.py

@@ -1,4 +1,5 @@
 import sys
+import subprocess
 import os
 import re
 from math import (
@@ -330,7 +331,7 @@ def create_output_file(self, gcode, folder_path="output/", relative_path=True):
         f.close()
 
         try:
-            os.startfile(file_path)
+            utils.open_file(file_path)
         except FileNotFoundError:
             pass
 

src/fusion_api/Handlers.py

@@ -8,6 +8,7 @@
 import subprocess
 
 from ..ASMBL_parser import Parser
+from .. import utils
 
 # Global list to keep all event handlers in scope.
 # This is only needed with Python.
@@ -388,16 +389,13 @@ def notify(self, args):
         # ui.messageBox(config.__str__())
 
         try:
+            time.sleep(1)   # be sure files are written completely
             asmbl_parser = Parser(config, progress)
 
             outputFolder = os.path.expanduser('~/Asmbl/output/')
             asmbl_parser.create_output_file(asmbl_parser.merged_gcode_script, outputFolder)
 
-            if sys.platform == 'win32':
-                os.startfile(outputFolder)
-            else:
-                opener = 'open' if sys.platform == 'darwin' else 'xdg-open'
-                subprocess.call([opener, outputFolder])
+            utils.open_file(outputFolder)
         except:
             ui.messageBox('Failed combing gcode files:\n{}'.format(traceback.format_exc()))
             return
@@ -487,10 +485,6 @@ def notify(self, args):
             ui.messageBox('Failed posting toolpaths:\n{}'.format(traceback.format_exc()))
             return
 
-        if sys.platform == 'win32':
-            os.startfile(output_folder)
-        else:
-            opener = 'open' if sys.platform == 'darwin' else 'xdg-open'
-            subprocess.call([opener, output_folder])
+        utils.open_file(output_folder)
 
         ui.messageBox('Milling Setup Post Processing Complete.\nFile saved in \'{}\''.format(output_folder))

src/utils.py

@@ -1,3 +1,9 @@
+import sys
+import os
+import subprocess
+import time
+
+
 def convert_relative(gcode_abs):
     """ Converts absolute extrusion gcode into relative extrusion gcode """
     absolute_mode = False
@@ -104,3 +110,12 @@ def find_maxima(numbers):
                     prev_increasing = False
 
     return maxima
+
+
+def open_file(path):
+    if sys.platform == 'win32':
+        path = os.path.normpath(path)
+        os.startfile(path, 'open')
+    else:
+        opener = 'open' if sys.platform == 'darwin' else 'xdg-open'
+        subprocess.call([opener, path])