diff options
| author | pravindalve | 2020-06-09 11:37:13 +0530 |
|---|---|---|
| committer | GitHub | 2020-06-09 11:37:13 +0530 |
| commit | 181f050b352560fa5dbbbcf4888db2ccd7a37061 (patch) | |
| tree | 1471d88a2b8496785912a35ea497a0963b896676 /src/main/python/main.py | |
| parent | 0cf5626ed61f29249ebc92fcec6dbae5489bac8e (diff) | |
| parent | 3ea92365befd56852288fdaac5d551c4b96d269a (diff) | |
| download | Chemical-PFD-181f050b352560fa5dbbbcf4888db2ccd7a37061.tar.gz Chemical-PFD-181f050b352560fa5dbbbcf4888db2ccd7a37061.tar.bz2 Chemical-PFD-181f050b352560fa5dbbbcf4888db2ccd7a37061.zip | |
Merge pull request #10 from Blakeinstein/master
Implement JSON_Typer, and advance()
Diffstat (limited to 'src/main/python/main.py')
| -rw-r--r-- | src/main/python/main.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/main/python/main.py b/src/main/python/main.py index 72eb7f8..ff41413 100644 --- a/src/main/python/main.py +++ b/src/main/python/main.py @@ -1,4 +1,3 @@ -import json import sys from fbs_runtime.application_context.PyQt5 import ApplicationContext @@ -13,7 +12,7 @@ from utils.fileWindow import fileWindow from utils.data import ppiList, sheetDimensionList from utils import dialogs from utils.toolbar import toolbar -from utils.app import app, settings +from utils.app import app, settings, load import shapes @@ -105,7 +104,7 @@ class appWindow(QMainWindow): if name: for files in name[0]: with open(files,'r') as file: - projectData = json.load(file) + projectData = load(file) project = fileWindow(self.mdi) self.mdi.addSubWindow(project) project.__setstate__(projectData) |