amd/orcaslicer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Add filament vendors (CERPRiSE, FilamentOne, Tianse, and VOXELPLA) & rename Formfortura to Formfutura (#5472)

Browse source 
* Add filament vendors part 1

* Add filament vendors part 2

* Fix merge confilcts

* Readd filament vendors & remove duplicate
This commit is contained in:
cochcoder 2024-05-28 16:32:04 +00:00 committed by GitHub
parent 3ba57512d0
commit fd8e1d765b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 21 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
scripts/generate_presets_vendors.py
View file

@ -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)
print(filaments_formatted)

29
src/slic3r/GUI/CreatePresetsDialog.cpp
View file

@ -43,20 +43,21 @@ static const std::vector<std::string> 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<std::string> filament_types = {"PLA", "PLA+", "PLA Tough", "PETG", "ABS", "ASA", "FLEX", "HIPS", "PA", "PACF",
"NYLON", "PVA", "PC", "PCABS", "PCTG", "PCCF", "PHA", "PP", "PEI", "PET", "PETG",