diff options
| author | Joshua Shreve <j.a.shreve@gmail.com> | 2021-08-20 17:08:34 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-20 17:08:34 -0400 |
| commit | 8f7580bc5f6835a1b896f1112ed34c8d1e5d459a (patch) | |
| tree | a35c190e362d01d5c72fb0f1e209e0763810207d /src/model_builder.py | |
| parent | cdcde68ed97b3b0712f264b3ed690015cddb98cf (diff) | |
| parent | 338510f9857da2f1949550c28209af280c13965e (diff) | |
Merge branch 'master' into trackball
Diffstat (limited to 'src/model_builder.py')
| -rw-r--r-- | src/model_builder.py | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/model_builder.py b/src/model_builder.py index d8a9fac..7cca387 100644 --- a/src/model_builder.py +++ b/src/model_builder.py @@ -3,13 +3,16 @@ import copy import importlib from generate_configuration import * -ENGINE = 'solid' -# ENGINE = 'cadquery' base = shape_config config_options = [ { + 'name': '{}', 'vars': ['ball_side'], # set ball side to both, other half can come from other renders + 'vals': ['both'], + 'val_names': [''] + }, + { 'name': '{}x{}', 'vars': ['nrows', 'ncols'], 'vals':[(4, 5), (5, 6)], # 'vals': [(4, 5), (4, 6), (5, 6), (6, 6)], @@ -21,8 +24,8 @@ config_options = [ }, { 'name': '{}TMB', 'vars': ['thumb_style'], - 'vals': ['DEFAULT', 'MINIDOX'], - 'val_names': ['DEF', 'MDOX'] + 'vals': ['DEFAULT', 'MINIDOX', 'TRACKBALL_ORBISSYL'], + 'val_names': ['DEF', 'MDOX', 'ORBY'] # 'vals': ['DEFAULT', 'MINI', 'CARBONFET', 'MINIDOX'], # 'val_names': ['DEF', 'MINI', 'CF', 'MDOX'] }, @@ -65,7 +68,9 @@ def create_config(config_options): else: n_input = vals - new_config['config_name'] += "_" + temp_opt['name'].format(*n_input) + name_ext = temp_opt['name'].format(*n_input) + if not name_ext == '': + new_config['config_name'] += "_" + name_ext new_config['save_dir'] = new_config['config_name'] new_configurations.append(new_config) configurations = new_configurations |