Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Decode JSON containing sub-scaffoldPackages #222

Merged
merged 3 commits into from
Apr 20, 2023
Merged

Decode JSON containing sub-scaffoldPackages #222

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9e0ea82
Add a recursion to decode all sub-scaffoldPackage
Kayvv Apr 19, 2023
fa435ad
Change single quotes to double quotes
Kayvv Apr 19, 2023
27ee892
Merge branch 'ABI-Software:main' into decode_JSON
Kayvv Apr 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 12 additions & 9 deletions src/scaffoldmaker/scaffolds.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,28 +109,28 @@ def findScaffoldTypeByName(self, name):
return None

def getDefaultMeshType(self):
'''
"""
Deprecated: use getDefaultScaffoldType()
'''
"""
return self.getDefaultScaffoldType()

def getDefaultScaffoldType(self):
return MeshType_3d_box1

def getMeshTypes(self):
'''
"""
Deprecated: use getScaffoldTypes()
'''
"""
return self.getScaffoldTypes()

def getScaffoldTypes(self):
return self._allScaffoldTypes


class Scaffolds_JSONEncoder(json.JSONEncoder):
'''
"""
Class encoding scaffold objects in JSON. Pass as cls argument to json.dumps.
'''
"""

def default(self, obj):
if isinstance(obj, ScaffoldPackage):
Expand All @@ -144,11 +144,14 @@ def default(self, obj):


def Scaffolds_decodeJSON(dct):
'''
"""
Function for passing as object_hook argument to json.loads.
Constructs scaffold objects from their JSON object encoding.
'''
if ('_ScaffoldPackage' in dct):
"""
for key in dct.keys():
if isinstance(dct[key], dict):
dct[key] = Scaffolds_decodeJSON(dct[key])
if '_ScaffoldPackage' in dct:
scaffoldType = Scaffolds().findScaffoldTypeByName(dct['scaffoldTypeName'])
#print('Scaffolds_decodeJSON scaffoldType',scaffoldType.getName(), dct)
return ScaffoldPackage(scaffoldType, dct)
Expand Down