From 3dbc64a9417a64466f66d4c82159b4bc14166c80 Mon Sep 17 00:00:00 2001 From: Eric Lin Date: Sun, 25 Feb 2024 20:19:36 -0500 Subject: [PATCH] Added a number of more popular filament vendors based on filamentcolors.xyz and major retailer offerings. --- scripts/generate_presets_vendors.py | 104 +++++++++++++++++++++++++ src/slic3r/GUI/CreatePresetsDialog.cpp | 26 +++++-- 2 files changed, 124 insertions(+), 6 deletions(-) diff --git a/scripts/generate_presets_vendors.py b/scripts/generate_presets_vendors.py index 78b7407ef87..11d14015e8c 100644 --- a/scripts/generate_presets_vendors.py +++ b/scripts/generate_presets_vendors.py @@ -42,3 +42,107 @@ models_formatted = models_formatted.rstrip()[:-1] print(models_formatted) + + + +# 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) \ No newline at end of file diff --git a/src/slic3r/GUI/CreatePresetsDialog.cpp b/src/slic3r/GUI/CreatePresetsDialog.cpp index 9fa1c0cd2b2..f6e0b649c2c 100644 --- a/src/slic3r/GUI/CreatePresetsDialog.cpp +++ b/src/slic3r/GUI/CreatePresetsDialog.cpp @@ -38,12 +38,26 @@ namespace Slic3r { namespace GUI { static const std::vector filament_vendors = - {"3Dgenius", "3DXTECH", "3D BEST-Q", "3D Fuel", "AMOLEN", "Ankermake", "Anycubic", "Atomic", "BASF", "Beyond Plastic", - "California Filament", "ColorFabb", "Creality", "Duramic", "ELEGOO", "Eryone", "eSUN", - "Fillamentum", "FLASHFORGE", "Giantarm", "HATCHBOX", "IEMAI", "INLAND", "iProspect", "iSANMATE", - "Justmaker", "Kexcelled", "MatterHackers", "MIKA3D", "NinjaTek", - "Novamaker", "OVERTURE", "Polymaker", "Priline", "Protopasta", "Prusament", "Regen", "SUNLU", "Ultimaker"}; - + {"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"}; + static const std::vector filament_types = {"PLA", "PLA+", "PLA Tough", "PETG", "ABS", "ASA", "FLEX", "HIPS", "PA", "PACF", "NYLON", "PVA", "PC", "PCABS", "PCTG", "PCCF", "PHA", "PP", "PEI", "PET", "PETG", "PETGCF", "PTBA", "PTBA90A", "PEEK", "TPU93A", "TPU75D", "TPU", "TPU92A", "TPU98A", "Misc",