diff options
Diffstat (limited to 'src/main/python/utils')
| -rw-r--r-- | src/main/python/utils/app.py | 3 | ||||
| -rw-r--r-- | src/main/python/utils/canvas.py | 14 | ||||
| -rw-r--r-- | src/main/python/utils/fileWindow.py | 26 |
3 files changed, 23 insertions, 20 deletions
diff --git a/src/main/python/utils/app.py b/src/main/python/utils/app.py index 4540a43..4ee11c3 100644 --- a/src/main/python/utils/app.py +++ b/src/main/python/utils/app.py @@ -3,7 +3,10 @@ Declare fbs application so that it can be imported in other modules. """ from fbs_runtime.application_context.PyQt5 import ApplicationContext +from PyQt5.QtCore import QSettings + app = ApplicationContext() +settings = QSettings(QSettings.IniFormat, QSettings.UserScope ,"FOSSEE", "Chemical-PFD") def fileImporter(file): # Helper function to fetch files from src/main/resources diff --git a/src/main/python/utils/canvas.py b/src/main/python/utils/canvas.py index 2332087..5da4487 100644 --- a/src/main/python/utils/canvas.py +++ b/src/main/python/utils/canvas.py @@ -15,7 +15,7 @@ class canvas(QWidget): for context menu and dialogs. """ - def __init__(self, parent=None, size= 'A4', ppi= '72'): + def __init__(self, parent=None, size= 'A4', ppi= '72' , parentMdiArea = None, parentFileWindow = None): super(canvas, self).__init__(parent) #Store values for the canvas dimensions for ease of access, these are here just to be @@ -38,11 +38,11 @@ class canvas(QWidget): self.setLayout(self.layout) #set initial paper size for the scene - self.painter.setSceneRect(0, 0, *paperSizes[self.canvasSize][self.ppi]) - - #set pointers to necessary parents for ease of reference - self.parentMdiArea = self.parent().parentWidget().parentWidget().parentWidget().parentWidget() - self.parentFileWindow = self.parent().parentWidget().parentWidget() + self.painter.setSceneRect(0, 0, *paperSizes[self._canvasSize][self._ppi]) + # self.parentMdiArea = self.parent().parentWidget().parentWidget().parentWidget().parentWidget() + # self.parentFileWindow = self.parent().parentWidget().parentWidget() + self.parentMdiArea = parentMdiArea + self.parentFileWindow = parentFileWindow def resizeView(self, w, h): #helper function to resize canvas @@ -95,6 +95,7 @@ class canvas(QWidget): def dimensions(self): #returns the dimension of the current scene return self.painter.sceneRect().width(), self.painter.sceneRect().height() + @property def items(self): # generator to filter out certain items @@ -132,7 +133,6 @@ class canvas(QWidget): } def __setstate__(self, dict): - self.__init__() self._ppi = dict['ppi'] self._canvasSize = dict['canvasSize'] self.setObjectName(dict['ObjectName']) diff --git a/src/main/python/utils/fileWindow.py b/src/main/python/utils/fileWindow.py index ebe509b..3cf0e8c 100644 --- a/src/main/python/utils/fileWindow.py +++ b/src/main/python/utils/fileWindow.py @@ -1,4 +1,5 @@ import pickle +import json from PyQt5.QtCore import Qt, pyqtSignal, QPoint from PyQt5.QtGui import QIcon @@ -24,8 +25,8 @@ class fileWindow(QMdiSubWindow): def __init__(self, parent = None, title = 'New Project', size = 'A4', ppi = '72'): super(fileWindow, self).__init__(parent) self._sideViewTab = None - self.index = None - + self.index = None + self.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed) #Uses a custom QTabWidget that houses a custom new Tab Button, used to house the seperate # diagrams inside a file @@ -210,19 +211,20 @@ class fileWindow(QMdiSubWindow): self.tabber.widget(currentIndex).deleteLater() self.tabber.removeTab(currentIndex) - def newDiagram(self): + def newDiagram(self, objectName = "New"): # helper function to add a new tab on pressing new tab button, using the add tab method on QTabWidget - diagram = canvas(self.tabber) - diagram.setObjectName("New") - index = self.tabber.addTab(diagram, "New") + diagram = canvas(self.tabber, parentMdiArea = self.mdiArea(), parentFileWindow = self) + diagram.setObjectName(objectName) + index = self.tabber.addTab(diagram, objectName) self.tabber.setCurrentIndex(index) + return diagram def saveProject(self, name = None): # called by dialog.saveEvent, saves the current file name = QFileDialog.getSaveFileName(self, 'Save File', f'New Diagram', 'Process Flow Diagram (*.pfd)') if not name else name if name[0]: - with open(name[0],'wb') as file: - pickle.dump(self, file) + with open(name[0],'w') as file: + json.dump(self.__getstate__(), file, indent=4) return True else: return False @@ -242,14 +244,12 @@ class fileWindow(QMdiSubWindow): return { "_classname_": self.__class__.__name__, "ObjectName": self.objectName(), - "ppi": self._ppi, - "canvasSize": self._canvasSize, "tabs": [i.__getstate__() for i in self.tabList] } def __setstate__(self, dict): - self.__init__(title = dict['ObjectName']) + self.setObjectName = dict['ObjectName'] + self.setWindowTitle = dict['ObjectName'] for i in dict['tabs']: - diagram = canvas(self.tabber, size = dict['canvasSize'], ppi = dict['ppi'], fileWindow = self) + diagram = self.newDiagram(i['ObjectName']) diagram.__setstate__(i) - self.tabber.addTab(diagram, i['ObjectName']) |