diff --git a/src/data/AlMg4.5Mn0.7.json b/src/data/AlMg4.5Mn0.7.json index 854267e..128d5e3 100644 --- a/src/data/AlMg4.5Mn0.7.json +++ b/src/data/AlMg4.5Mn0.7.json @@ -3,7 +3,10 @@ "Name_de": "G.AL® C250 Mittelfeste Präzisionsplatte", "Formula": "AlMg4.5Mn0.7", "Standard": { - "EN-AW": "EN AW 5083", + "ISO": "AlMg4.5Mn0.7", + "DIN1725": "AlMg4.5Mn", + "EN-AW": "5083", + "WERKSTOFFNUMMER": "3.3547", "Type": "non heat-treatable" }, "Electromagnetic Data": { @@ -22,6 +25,10 @@ }, "Hardness": { "HBW": ["68-75", "2.5/62.5"] + }, + "Anodising": { + "AH": 2, + "ASA": 4 } }, "Heat treatment": { diff --git a/src/data/example.json b/src/data/example.json index 2b49180..b952a7b 100644 --- a/src/data/example.json +++ b/src/data/example.json @@ -3,10 +3,10 @@ "Formula": "Al, AlMg4.5Mn0.7", "Standard": { "CAS Reg No.": "7429-90-5", - "ISO": "ISO or IUPAC number", - "DIN1725": "DIN 1725 number", - "EN-AW": "EN AW 5083", - "WERKSTOFFNUMMER": "DIN Werkstoffnummer", + "ISO": "AlMg4.5Mn0.7", + "DIN1725": "AlMg4.5Mn", + "EN-AW": "5083", + "WERKSTOFFNUMMER": "3.3547", "SAE": "AISI/SAE steel grade", "Type": "non heat-treatable" }, @@ -35,6 +35,10 @@ }, "Hardness": { "HBW": ["68-75", "2.5/62.5"] + }, + "Anodising": { + "AH": 2, + "ASA": 4 } }, "Heat treatment": { diff --git a/src/materials.py b/src/materials.py index 51389a9..3188723 100755 --- a/src/materials.py +++ b/src/materials.py @@ -211,7 +211,7 @@ def main(): print(args) if args.command == 'list': - file_list = read_dir(absolute_path("data"), "INFO.json", True) + file_list = read_dir(absolute_path("data"), ["INFO.json", "example.json"], True) for filename in file_list: file, _ = os.path.splitext(os.path.basename(filename)) print(file) @@ -244,6 +244,7 @@ def main(): print_dict(data_dict) else: + data = load_material(args.materialname) print_material(data) return 0