Commit 38ecd0ec authored by Guillaume Seguin's avatar Guillaume Seguin

Use prepare_command in pronterface slicing

parent 4888a5af
...@@ -36,7 +36,8 @@ from . import printcore ...@@ -36,7 +36,8 @@ from . import printcore
from .utils import install_locale, setup_logging, \ from .utils import install_locale, setup_logging, \
iconfile, configfile, format_time, format_duration, \ iconfile, configfile, format_time, format_duration, \
hexcolor_to_float, parse_temperature_report hexcolor_to_float, parse_temperature_report, \
prepare_command
install_locale('pronterface') install_locale('pronterface')
try: try:
...@@ -1223,9 +1224,9 @@ Printrun. If not, see <http://www.gnu.org/licenses/>.""" ...@@ -1223,9 +1224,9 @@ Printrun. If not, see <http://www.gnu.org/licenses/>."""
def skein_func(self): def skein_func(self):
try: try:
param = self.expandcommand(self.settings.slicecommand)
output_filename = self.model_to_gcode_filename(self.filename) output_filename = self.model_to_gcode_filename(self.filename)
pararray = [i.replace("$s", self.filename).replace("$o", output_filename) for i in shlex.split(param.replace("\\", "\\\\"))] pararray = prepare_command(self.settings.slicecommand,
{"$s": self.filename, "$o": output_filename})
if self.settings.slic3rintegration: if self.settings.slic3rintegration:
for cat, config in self.slic3r_configs.items(): for cat, config in self.slic3r_configs.items():
if config: if config:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment