-
-
Notifications
You must be signed in to change notification settings - Fork 965
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Added additional filament vendors. (#5461)
Added Anker printers to filament presets dialog. Added helper to generate formatted strings for dialog from profile JSON files.
- Loading branch information
Showing
2 changed files
with
190 additions
and
16 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,150 @@ | ||
| # helps manage the static list of vendor names in src/slic3r/GUI/CreatePresetsDialog.cpp | ||
|
|
||
| import json | ||
| from pathlib import Path | ||
| from typing import Dict, List | ||
|
|
||
|
|
||
| scripts_dir = Path(__file__).resolve().parent | ||
| print(f'Scripts dir: {scripts_dir}') | ||
| root_dir = scripts_dir.parent | ||
| profiles_dir = root_dir / 'resources' / 'profiles' | ||
|
|
||
| printers: Dict[str, List[str]] = {} | ||
|
|
||
| # generates the printer vendor list | ||
| print(f'Looking in {profiles_dir.resolve()}') | ||
| for entry in profiles_dir.glob('*.json'): | ||
| if entry.is_file(): | ||
| entry_info = json.loads(entry.read_text()) | ||
| vendor_name = entry_info.get('name', None) | ||
| if vendor_name: | ||
| models = [machine.get('name', None) for machine in entry_info.get('machine_model_list', []) if machine.get('name', None)] | ||
| printers[vendor_name] = models | ||
|
|
||
| vendor_names = [f'"{vendor_name}",' for vendor_name in sorted(printers.keys(), key=str.casefold)] | ||
| vend_col_width = len(max(vendor_names, key=len)) | ||
| vendors_formatted = ' {' + '\n '.join(' '.join(f"{vendor_name:{vend_col_width}}" for vendor_name in vendor_names[i:i+5]) for i in range(0, len(vendor_names), 5)).rstrip()[:-1] + '}' | ||
| print(vendors_formatted) | ||
|
|
||
| # generates the printer model map | ||
| models_formatted = ' {' | ||
| models_indent = len(models_formatted) + vend_col_width + 2 | ||
| for vendor_name in sorted(printers.keys(), key=str.casefold): | ||
| vendor_formatted = f'"{vendor_name}",' | ||
| models_formatted += f'{{{vendor_formatted:{vend_col_width}}{{' | ||
|
|
||
| model_names = printers[vendor_name] | ||
| model_names_formatted = [f'"{model_name}",' for model_name in model_names] | ||
| model_col_width = len(max(model_names_formatted, key=len)) | ||
| model_names_str = ('\n' + ' ' * models_indent).join(' '.join(f"{model_name:{model_col_width}}" for model_name in model_names_formatted[i:i+5]) for i in range(0, len(model_names), 5)).rstrip()[:-1] + '}' | ||
|
|
||
| models_formatted += model_names_str | ||
|
|
||
| models_formatted += '},\n ' | ||
|
|
||
| models_formatted = models_formatted.rstrip()[:-1] | ||
| print(models_formatted) | ||
|
|
||
|
|
||
| # Generate Filament Vendors | ||
| filament_vendors = [ | ||
| '3Dgenius', | ||
| '3DJake', | ||
| '3DXTECH', | ||
| '3D BEST-Q', | ||
| '3D Hero', | ||
| '3D-Fuel', | ||
| 'Aceaddity', | ||
| 'AddNorth', | ||
| 'Amazon Basics', | ||
| 'AMOLEN', | ||
| 'Ankermake', | ||
| 'Anycubic', | ||
| 'Atomic', | ||
| 'AzureFilm', | ||
| 'BASF', | ||
| 'Bblife', | ||
| 'BCN3D', | ||
| 'Beyond Plastic', | ||
| 'California Filament', | ||
| 'Capricorn', | ||
| 'CC3D', | ||
| 'colorFabb', | ||
| 'Comgrow', | ||
| 'Cookiecad', | ||
| 'Creality', | ||
| 'Das Filament', | ||
| 'DO3D', | ||
| 'DOW', | ||
| 'DSM', | ||
| 'Duramic', | ||
| 'ELEGOO', | ||
| 'Eryone', | ||
| 'Essentium', | ||
| 'eSUN', | ||
| 'Extrudr', | ||
| 'Fiberforce', | ||
| 'Fiberlogy', | ||
| 'FilaCube', | ||
| 'Filamentive', | ||
| 'Fillamentum', | ||
| 'FLASHFORGE', | ||
| 'Formfortura', | ||
| 'Francofil', | ||
| 'GEEETECH', | ||
| 'Giantarm', | ||
| 'Gizmo Dorks', | ||
| 'GreenGate3D', | ||
| 'HATCHBOX', | ||
| 'Hello3D', | ||
| 'IC3D', | ||
| 'IEMAI', | ||
| 'IIID Max', | ||
| 'INLAND', | ||
| 'iProspect', | ||
| 'iSANMATE', | ||
| 'Justmaker', | ||
| 'Keene Village Plastics', | ||
| 'Kexcelled', | ||
| 'MakerBot', | ||
| 'MatterHackers', | ||
| 'MIKA3D', | ||
| 'NinjaTek', | ||
| 'Nobufil', | ||
| 'Novamaker', | ||
| 'OVERTURE', | ||
| 'OVVNYXE', | ||
| 'Polymaker', | ||
| 'Priline', | ||
| 'Printed Solid', | ||
| 'Protopasta', | ||
| 'Prusament', | ||
| 'Push Plastic', | ||
| 'R3D', | ||
| 'Re-pet3D', | ||
| 'Recreus', | ||
| 'Regen', | ||
| 'Sain SMART', | ||
| 'SliceWorx', | ||
| 'Snapmaker', | ||
| 'SnoLabs', | ||
| 'Spectrum', | ||
| 'SUNLU', | ||
| 'TTYT3D', | ||
| 'UltiMaker', | ||
| 'Verbatim', | ||
| 'VO3D', | ||
| 'Voxelab', | ||
| 'YOOPAI', | ||
| 'Yousu', | ||
| 'Ziro', | ||
| 'Zyltech', | ||
| ] | ||
|
|
||
| filament_vendors_formatted = [f'"{vendor_name}",' for vendor_name in filament_vendors] | ||
| fil_col_width = len(max(filament_vendors_formatted, key=len)) | ||
| filaments_formatted = ' {' | ||
| filament_indent = len(filaments_formatted) | ||
| filaments_formatted += ('\n' + ' ' * filament_indent).join(' '.join(f'{vendor_name:{fil_col_width}}' for vendor_name in filament_vendors_formatted[i:i+5]) for i in range(0, len(filament_vendors), 5)).rstrip()[:-1] + '};' | ||
| print(filaments_formatted) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters