diff --git a/cg/freecad/Frames/material_requirements.JSON b/cg/freecad/Frames/material_requirements.JSON index 4c5c3ee..f4eb739 100644 --- a/cg/freecad/Frames/material_requirements.JSON +++ b/cg/freecad/Frames/material_requirements.JSON @@ -1,8 +1,6 @@ -{ - "Density": "str" , - "DiffuseColor": "", - "EmissiveColor", - "amogus" -} \ No newline at end of file +["Density", +"DiffuseColor", +"EmissiveColor" +] diff --git a/cg/freecad/Frames/modelExport.py b/cg/freecad/Frames/modelExport.py index 5ea03f2..2ff6f7b 100644 --- a/cg/freecad/Frames/modelExport.py +++ b/cg/freecad/Frames/modelExport.py @@ -27,7 +27,7 @@ import FreeCAD as App import FreeCADGui as Gui from helper.is_solid import is_object_solid - +import json doc = App.ActiveDocument @@ -67,7 +67,9 @@ def materialExistenceCheck(doc): #проверим, что материалы правильно описаны: -material_requirements = {'Density', 'DiffuseColor', 'EmissiveColor', 'amogus'} +# Открываем файл JSON с требованиями и загружаем его содержимое +with open('material_requirements.json', 'r') as f: + material_requirements = json.load(f) @@ -153,3 +155,5 @@ def parse_values(value_str): return value, unit +#todo: +# сделать проверку на солидовые тела \ No newline at end of file