From fd8e1d765b2860e6de55205652acd78689004c97 Mon Sep 17 00:00:00 2001 From: cochcoder <103969142+cochcoder@users.noreply.github.com> Date: Tue, 28 May 2024 16:32:04 +0000 Subject: [PATCH] Add filament vendors (CERPRiSE, FilamentOne, Tianse, and VOXELPLA) & rename Formfortura to Formfutura (#5472) * Add filament vendors part 1 * Add filament vendors part 2 * Fix merge confilcts * Readd filament vendors & remove duplicate --- scripts/generate_presets_vendors.py | 8 +++++-- src/slic3r/GUI/CreatePresetsDialog.cpp | 29 +++++++++++++------------- 2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/scripts/generate_presets_vendors.py b/scripts/generate_presets_vendors.py index d28dddef1..e5c3c837d 100644 --- a/scripts/generate_presets_vendors.py +++ b/scripts/generate_presets_vendors.py @@ -74,6 +74,7 @@ filament_vendors = [ 'Comgrow', 'Cookiecad', 'Creality', + 'CERPRiSE', 'Das Filament', 'DO3D', 'DOW', @@ -90,8 +91,9 @@ filament_vendors = [ 'Filamentive', 'Fillamentum', 'FLASHFORGE', - 'Formfortura', + 'Formfutura', 'Francofil', + 'FilamentOne', 'GEEETECH', 'Giantarm', 'Gizmo Dorks', @@ -132,11 +134,13 @@ filament_vendors = [ 'Spectrum', 'SUNLU', 'TTYT3D', + 'Tianse', 'UltiMaker', 'Valment', 'Verbatim', 'VO3D', 'Voxelab', + 'VOXELPLA', 'YOOPAI', 'Yousu', 'Ziro', @@ -148,4 +152,4 @@ 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 +print(filaments_formatted) diff --git a/src/slic3r/GUI/CreatePresetsDialog.cpp b/src/slic3r/GUI/CreatePresetsDialog.cpp index 0bd52707d..1af6a76cc 100644 --- a/src/slic3r/GUI/CreatePresetsDialog.cpp +++ b/src/slic3r/GUI/CreatePresetsDialog.cpp @@ -43,20 +43,21 @@ static const std::vector filament_vendors = "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", "Valment", - "Verbatim", "VO3D", "Voxelab", "YOOPAI", "Yousu", - "Ziro", "Zyltech"}; + "CERPRiSE", "Das Filament", "DO3D", "DOW", "DSM", + "Duramic", "ELEGOO", "Eryone", "Essentium", "eSUN", + "Extrudr", "Fiberforce", "Fiberlogy", "FilaCube", "Filamentive", + "Fillamentum", "FLASHFORGE", "Formfutura", "Francofil", "FilamentOne", + "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", + "Tianse", "UltiMaker", "Valment", "Verbatim", "VO3D", + "Voxelab", "VOXELPLA", "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",