pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Outputing ini file parameters to the subprocess

Browse source
This commit is contained in:
Ross Hendrickson 2013-08-18 01:19:55 -05:00
parent 8e500b78aa
commit 2421824535
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
octoprint/cura/__init__.py
View file

@ -57,12 +57,14 @@ class CuraEngine(object):
logging.info("Slicing call back complete:%s" % str(call_back))
args = [self.cura_path, '-o', gcode, file_path]
args = [self.cura_path, '-o', gcode]
settings = parser.process_profile_ini(config)
args.extend(settings)
args.extend([file_path])
logging.info('CuraEngine args:%s' % str(args))
thread = threading.Thread(target=start_thread, args=(call_back,

6
octoprint/cura/parser.py
View file

@ -1,4 +1,5 @@
import logging
from StringIO import StringIO
def process_profile_ini(filename):
@ -18,7 +19,6 @@ def process_profile_ini(filename):
logging.info("Processing %s" % filename)
for line in profile:
if _is_multi_start(line):
read_multi_line(line, profile, data)
@ -32,7 +32,6 @@ def read_multi_line(line, profile, data):
multi_line = line
line = profile.readline()
if _is_multi_continue(line):
multi_line += line
@ -44,7 +43,6 @@ def read_multi_line(line, profile, data):
while(_is_multi_continue(line)):
line = profile.readline()
if not line:
break
@ -126,7 +124,7 @@ def format_data_for_command(data):
def read_filename(filename):
lines = open(filename, 'r').read()
return lines
return StringIO(lines)
def _is_multi_start(line):