Skip to content

Adding command line useability improvements. #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Adding command line useability improvements. #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
115 changes: 88 additions & 27 deletions Scripts for Variable Angle/Backtransformation_GCode_var_angle.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,8 @@
import re
import numpy as np
import time

# -----------------------------------------------------------------------------------------
# Transformation Settings
# -----------------------------------------------------------------------------------------
FILE_NAME = 'tower_01_B.gcode' # filename including extension
FOLDER_NAME = 'gcodes/' # name of the subfolder in which the gcode is located
CONE_ANGLE = 16 # transformation angle
CONE_TYPE = 'outward' # type of the cone: 'inward' & 'outward'
FIRST_LAYER_HEIGHT = 0.2 # moves all the gcode up to this height. Use also for stacking
X_SHIFT = 110 # moves your gcode away from the origin into the center of the bed (usually bed size / 2)
Y_SHIFT = 90

import argparse
import os

def insert_Z(row, z_value):
"""
Expand Down Expand Up @@ -333,11 +323,13 @@ def translate_data(data, cone_type, translate_x, translate_y, z_desired, e_paral
return new_data


def backtransform_file(path, cone_type, maximal_length, angle_comp, x_shift, y_shift, cone_angle_deg, z_desired, e_parallel, e_perpendicular):
def backtransform_file(input_file, output_file, cone_type, maximal_length, angle_comp, x_shift, y_shift, cone_angle_deg, z_desired, e_parallel, e_perpendicular):
"""
Read GCode from file, backtransform and translate it.
:param path: string
String with the path to the GCode-file
:param input_file: string
String with the path to the input GCode-file
:param output_file: string
String with the path to the output GCode-file
:param cone_type: string
String, either 'outward' or 'inward', defines which transformation should be used
:param maximal_length: float
Expand All @@ -364,25 +356,94 @@ def backtransform_file(path, cone_type, maximal_length, angle_comp, x_shift, y_s
if angle_comp == 'radial':
backtransform_data = backtransform_data_radial

with open(path, 'r') as f_gcode:
with open(input_file, 'r') as f_gcode:
data = f_gcode.readlines()
data_bt = backtransform_data(data, cone_type, maximal_length, cone_angle_rad)
data_bt_string = ''.join(data_bt)
data_bt = [row + ' \n' for row in data_bt_string.split('\n')]
data_bt = translate_data(data_bt, cone_type, x_shift, y_shift, z_desired, e_parallel, e_perpendicular)
data_bt_string = ''.join(data_bt)

path_write = re.sub(r'gcodes', 'gcodes_backtransformed', path)
path_write = re.sub(r'.gcode', '_bt_' + cone_type + '_' + angle_comp + '.gcode', path_write)
print(path_write)
with open(path_write, 'w+') as f_gcode_bt:
with open(output_file, 'w+') as f_gcode_bt:
f_gcode_bt.write(data_bt_string)
print('File successfully backtransformed and translated.')

return None

starttime = time.time()
backtransform_file(path=FOLDER_NAME + FILE_NAME, cone_type=CONE_TYPE, maximal_length=0.5, angle_comp='radial', x_shift=X_SHIFT, y_shift=Y_SHIFT,
cone_angle_deg=CONE_ANGLE, z_desired=FIRST_LAYER_HEIGHT, e_parallel=0, e_perpendicular=0)
endtime = time.time()
print('GCode translated, time used:', endtime - starttime)

if __name__ == "__main__":
parser = argparse.ArgumentParser(prog='Conical Transform', description='Conical Transformation - Bactransform variable angle', formatter_class=lambda prog: argparse.HelpFormatter(prog,max_help_position=80))
parser.add_argument('-f', '--file', type=str, required=True, help='Relative or absolute path to the .gcode file (ie. tower_01_B.gcode)')
parser.add_argument('-o', '--output', type=str, default='gcodes', help='Folder in which to save transformed .gcode file')
parser.add_argument('-a', '--angle', type=int, required=False, help='Cone angle')
parser.add_argument('-r', '--reverse', action='store_true', required=False, help='Reversed (invard cone)')
parser.add_argument('-l', '--layer', type=float, default=0.2, help='Moves all the gcode up to this height. Use also for stacking')
parser.add_argument('-x', type=int, default=110, help='Moves your gcode away from the origin into the center of the bed')
parser.add_argument('-y', type=int, default=90, help='Moves your gcode away from the origin into the center of the bed')
args = parser.parse_args()

# Check if file exists
if not os.path.exists(args.file):
print("File `{}` does not exist!".format(args.file))
print("Aborting.")
exit()
# Check if right extension
elif not args.file.lower().endswith('.gcode'):
print("Unsupported file type. Expected '.gcode' (file:`{}`)!".format(args.file), re.MULTILINE)
print("Aborting.")
exit()

# Set tranformation settings
# 1) Use command line parameters first, if they are missing
# 2) Try to infer parameters from the filename
pattern = re.compile(r".*?transformed_(inward|outward)_([0-9]{1,3})deg.*?\.gcode")
filename_re = pattern.match(args.file, re.IGNORECASE)
if args.angle is not None and not args.reverse:
print("-- Using parameters from the command line")
if args.reverse:
cone_type = 'outward'
else:
cone_type = 'inward'
cone_angle = args.angle
elif filename_re is not None:
print("-- Using parameters inferred from the file name")
cone_type = filename_re.group(1).lower()
cone_angle = int(filename_re.group(2))
else:
print("Critical command lines arguments missing and could not infer them from the file name. Aborting.")
exit()

# Create new file name for transformed file
output_file_name = os.path.basename(args.file)
if output_file_name.lower().endswith('.gcode'):
output_file_name = output_file_name.replace('.gcode', '')
# Pattern is: (filename)_(transformation-type)_(cone-angle)deg_transformed.stl

output_file_name = "{}_bt_{}_{}deg.gcode".format(output_file_name, cone_type, cone_angle)
output_file_path = os.path.join(args.output, output_file_name)

# If output directory does not exist, create so we can save output file
if not os.path.isdir(args.output):
try:
os.makedirs(args.output)
except Exception as e:
print(e)
print("Failed to create output directory `{}`. Would not be able to save output file. Aborting.".format(args.output))
exit()

# Print requested parameters
print('-'*50)
print("Transforming:\t\t{}".format(args.file))
print("Saving output to:\t{}".format(output_file_path))
print("Cone type:\t\t{}".format(cone_type))
print("Cone angle:\t\t{}".format(cone_angle))
print("Shift X:\t\t{}".format(args.x))
print("Shift Y:\t\t{}".format(args.y))
print("First layer height:\t{}".format(args.layer))
print('-'*50)

# Begin transformation
print('Starting transformation... (this could take a while)')
start_time = time.time()
backtransform_file(input_file=args.file, output_file=output_file_path, cone_type=cone_type, maximal_length=0.5, angle_comp='radial', x_shift=args.x, y_shift=args.y,
cone_angle_deg=cone_angle, z_desired=args.layer, e_parallel=0, e_perpendicular=0)
end_time = time.time()
print('GCode translated in {} seconds'.format(round(end_time-start_time, 2)))
87 changes: 70 additions & 17 deletions Scripts for Variable Angle/Transformation_STL_var_angle.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,8 @@
import numpy as np
from stl import mesh
import time


#-----------------------------------------------------------------------------------------
# Transformation Settings
#-----------------------------------------------------------------------------------------

FILE_NAME = 'tower_01_-20' # Filename without extension
FOLDER_NAME_UNTRANSFORMED = 'stl/'
FOLDER_NAME_TRANSFORMED = 'stl_transformed/' # Make sure this folder exists
CONE_ANGLE = 16 # Transformation angle
REFINEMENT_ITERATIONS = 1 # refinement iterations of the stl. 2-3 is a good start for regular stls. If its already uniformaly fine, use 0 or 1. High number cause huge models and long script runtimes
TRANSFORMATION_TYPE = 'outward' # type of the cone: 'inward' & 'outward'
import os
import argparse


def transformation_kegel(points, cone_angle_rad, cone_type):
Expand Down Expand Up @@ -104,8 +94,71 @@ def transformation_STL_file(path, cone_type, cone_angle_deg, nb_iterations):
my_mesh_transformed = mesh.Mesh(my_mesh_transformed)
return my_mesh_transformed

startzeit = time.time()
transformed_STL = transformation_STL_file(path=FOLDER_NAME_UNTRANSFORMED + FILE_NAME + '.stl', cone_type=TRANSFORMATION_TYPE, cone_angle_deg=CONE_ANGLE, nb_iterations=REFINEMENT_ITERATIONS)
transformed_STL.save(FOLDER_NAME_TRANSFORMED + FILE_NAME + '_' + TRANSFORMATION_TYPE + '_' + str(CONE_ANGLE) + 'deg_transformed.stl')
endzeit = time.time()
print('Transformation time:', endzeit - startzeit)

if __name__ == "__main__":
parser = argparse.ArgumentParser(prog='Conical Transform', description='Conical Transformation - Variable angle', formatter_class=lambda prog: argparse.HelpFormatter(prog,max_help_position=80))
parser.add_argument('-f', '--file', type=str, required=True, help='Relative or absolute path to the .stl file (ie. tower_01_-20)')
parser.add_argument('-o', '--output', type=str, default='stl_transformed', help='Folder in which to save transformed .stl file')
parser.add_argument('-a', '--angle', type=int, default=16, help='Transformation angle')
parser.add_argument('-i', '--iterations', type=int, default=1, help='Refinement iterations of the stl')
parser.add_argument('-r', '--reverse', action='store_true', default=False, help='Reverse transformation type (set this flag for inward transformation)')
parser.add_argument('--absolute', action='store_true', default=False, help='Force use of absolute paths')
args = parser.parse_args()

# Check if file exists
if not os.path.exists(args.file):
print("File `{}` does not exist!".format(args.file))
print("Aborting.")
exit()
# Check if right extension
elif not args.file.lower().endswith('.stl'):
print("Unsupported file type. Expected '.stl' (file:`{}`)!".format(args.file))
print("Aborting.")
exit()

# Check if output folder exists
if not os.path.exists(args.output):
print("Output folder `{}` does not exist. Creating...".format(args.output))
try:
os.mkdir(args.output)
except Exception as e:
print(e)
print("Failed to create directory `{}`".format(args.output))
exit()

# Set transformation type
if not args.reverse:
transformation_type = 'outward'
else:
transformation_type = 'inward'

# Create new file name for transformed file
output_file_name = os.path.basename(args.file)
if output_file_name.lower().endswith('.stl'):
output_file_name = output_file_name.replace('.stl', '')
# Pattern is: (filename)_transformed_(transformation-type)_(cone-angle)deg_transformed.stl
output_file_name = "{}_transformed_{}_{}deg.stl".format(output_file_name, transformation_type, args.angle)
output_file_path = os.path.join(args.output, output_file_name)

# Force use of absolute paths (convenience and debugging)
if args.absolute:
args.file = os.path.abspath(args.file)
output_file_path = os.path.abspath(output_file_path)

# Print requested parameters
print('-'*50)
print("Transforming:\t\t{}".format(args.file))
print("Saving output to:\t{}".format(output_file_path))
print("Cone angle:\t\t{}".format(args.angle))
print("Refinement iterations:\t{}".format(args.iterations))
print("Transformation type:\t{}".format(transformation_type))
print('-'*50)

# Begin transformation
print('Starting transformation... (this could take a while)')
start_time = time.time()
transformed_STL = transformation_STL_file(path=args.file, cone_type=transformation_type, cone_angle_deg=args.angle, nb_iterations=args.iterations)
transformed_STL.save(output_file_path)
end_time = time.time()
print('Done.')
print('Transformation took {} seconds'.format( round(end_time-start_time, 2) ))
3 changes: 3 additions & 0 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
numpy
numpy-stl
argparse