diff options
| -rw-r--r-- | src/build/settings/base.json | 2 | ||||
| -rw-r--r-- | src/main/python/main.py | 47 | ||||
| -rw-r--r-- | src/main/python/shapes/line.py | 16 | ||||
| -rw-r--r-- | src/main/python/utils/app.py | 3 | ||||
| -rw-r--r-- | src/main/python/utils/canvas.py | 45 | ||||
| -rw-r--r-- | src/main/python/utils/fileWindow.py | 27 | ||||
| -rw-r--r-- | src/main/resources/base/svg/ellipse.svg | 8 |
7 files changed, 101 insertions, 47 deletions
diff --git a/src/build/settings/base.json b/src/build/settings/base.json index e6321bb..451b3fc 100644 --- a/src/build/settings/base.json +++ b/src/build/settings/base.json @@ -2,5 +2,5 @@ "app_name": "PFD-Tool", "author": "FOSSEE", "main_module": "src/main/python/main.py", - "version": "0.0.0" + "version": "0.0.1" }
\ No newline at end of file diff --git a/src/main/python/main.py b/src/main/python/main.py index 3ebb2b9..72eb7f8 100644 --- a/src/main/python/main.py +++ b/src/main/python/main.py @@ -1,8 +1,8 @@ -import pickle +import json import sys from fbs_runtime.application_context.PyQt5 import ApplicationContext -from PyQt5.QtCore import QObject, Qt, pyqtSignal +from PyQt5.QtCore import QObject, Qt, pyqtSignal, QSize, QPoint from PyQt5.QtGui import QBrush, QColor, QImage, QPainter, QPalette, QPen from PyQt5.QtWidgets import (QComboBox, QFileDialog, QFormLayout, QVBoxLayout, QHBoxLayout, QLabel, QMainWindow, QMenu, @@ -13,7 +13,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 +from utils.app import app, settings import shapes @@ -58,8 +58,9 @@ class appWindow(QMainWindow): #declare main window layout self.setCentralWidget(self.mdi) - self.resize(1280, 720) #set collapse dim + # self.resize(1280, 720) #set collapse dim self.mdi.subWindowActivated.connect(self.tabSwitched) + self.readSettings() def updateMenuBar(self): # used to update menu bar undo-redo buttons to current scene @@ -91,7 +92,7 @@ class appWindow(QMainWindow): self.mdi.addSubWindow(project) if not project.tabList: # important when unpickling a file instead project.newDiagram() #create a new tab in the new file - project.resizeHandler() + # project.resizeHandler() project.fileCloseEvent.connect(self.fileClosed) #closed file signal to switch to sub window view project.tabChangeEvent.connect(self.updateMenuBar) if self.count > 1: #switch to tab view if needed @@ -103,12 +104,15 @@ class appWindow(QMainWindow): name = QFileDialog.getOpenFileNames(self, 'Open File(s)', '', 'Process Flow Diagram (*pfd)') if name: for files in name[0]: - with open(files,'rb') as file: - project = pickle.load(file) + with open(files,'r') as file: + projectData = json.load(file) + project = fileWindow(self.mdi) self.mdi.addSubWindow(project) - project.show() + project.__setstate__(projectData) project.resizeHandler() - project.fileCloseEvent.connect(self.fileClosed) + project.fileCloseEvent.connect(self.fileClosed) + project.tabChangeEvent.connect(self.updateMenuBar) + project.show() if self.count > 1: # self.tabSpace.setVisible(True) self.mdi.setViewMode(QMdiArea.TabbedView) @@ -133,7 +137,7 @@ class appWindow(QMainWindow): def tabSwitched(self, window): #handle window switched edge case - if window: + if window and window.tabCount: window.resizeHandler() def resizeEvent(self, event): @@ -148,13 +152,30 @@ class appWindow(QMainWindow): if len(self.activeFiles) and not dialogs.saveEvent(self): event.ignore() else: - event.accept() + event.accept() + self.writeSettings() def fileClosed(self, index): #checks if the file tab menu needs to be removed if self.count <= 2 : self.mdi.setViewMode(QMdiArea.SubWindowView) - + + def writeSettings(self): + settings.beginGroup("MainWindow") + settings.setValue("maximized", self.isMaximized()) + if not self.isMaximized(): + settings.setValue("size", self.size()) + settings.setValue("pos", self.pos()) + settings.endGroup() + + def readSettings(self): + settings.beginGroup("MainWindow") + self.resize(settings.value("size", QSize(1280, 720))) + self.move(settings.value("pos", QPoint(320, 124))) + if settings.value("maximized", False, type=bool): + self.showMaximized() + settings.endGroup() + @property def activeFiles(self): return [i for i in self.mdi.subWindowList() if i.tabCount] @@ -166,7 +187,7 @@ class appWindow(QMainWindow): @property def activeScene(self): return self.mdi.currentSubWindow().tabber.currentWidget() - + #Key input handler def keyPressEvent(self, event): #overload key press event for custom keyboard shortcuts diff --git a/src/main/python/shapes/line.py b/src/main/python/shapes/line.py index dc0a09c..b798dff 100644 --- a/src/main/python/shapes/line.py +++ b/src/main/python/shapes/line.py @@ -893,4 +893,18 @@ class Line(QGraphicsPathItem): addLableAction = contextMenu.addAction("add Label") action = contextMenu.exec_(event.screenPos()) if action == addLableAction: - self.label.append(LineLabel(event.scenePos(), self))
\ No newline at end of file + self.label.append(LineLabel(event.scenePos(), self)) + def setPenStyle(self, style): + """change current pen style for line""" + self.penStyle = style + + def __getstate__(self): + return { + "_classname_": self.__class__.__name__, + "startPoint": (self.startPoint.x(), self.startPoint.y()), + "endPoint": (self.endPoint.x(), self.endPoint.y()), + "points": [(point.x(), point.y()) for point in self.points] + } + + def __setstate__(self, dict): + self.points = [QPointF(x, y) for x, y in dict["points"]] 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..dee0745 100644 --- a/src/main/python/utils/canvas.py +++ b/src/main/python/utils/canvas.py @@ -1,6 +1,6 @@ -import pickle +import json -from PyQt5.QtCore import Qt +from PyQt5.QtCore import Qt, QPointF from PyQt5.QtGui import QBrush, QPalette from PyQt5.QtWidgets import (QFileDialog, QApplication, QHBoxLayout, QMenu, QTabWidget, QWidget, QSpacerItem, QStyle) @@ -9,13 +9,15 @@ from . import dialogs from .graphics import customView, customScene from .data import paperSizes, ppiList, sheetDimensionList +import shapes + class canvas(QWidget): """ Defines the work area for a single sheet. Contains a QGraphicScene along with necessary properties 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 @@ -27,7 +29,7 @@ class canvas(QWidget): # when we will draw items on this, this might be changed if QGraphicScene is subclassed. #set layout and background color - self.painter = customScene() + self.painter = customScene() self.painter.setBackgroundBrush(QBrush(Qt.white)) #set white background self.view = customView(self.painter, self) #create a viewport for the canvas board @@ -38,11 +40,9 @@ 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 = 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 @@ -128,17 +129,33 @@ class canvas(QWidget): "ppi": self._ppi, "canvasSize": self._canvasSize, "ObjectName": self.objectName(), - "items": [i.__getState__() for i in self.painter.items()] + "symbols": [i.__getstate__() for i in self.painter.items() if isinstance(i, shapes.NodeItem)], + "lines": [i.__getstate__() for i in self.painter.items() if isinstance(i, shapes.Line)], + # "lineLabels": [i.__getstate__() for i in self.painter.items() if isinstance(i, shapes.LineLabel)], + # "itemLabels": [i.__getstate__() for i in self.painter.items() if isinstance(i, shapes.itemLabel)] } def __setstate__(self, dict): - self.__init__() self._ppi = dict['ppi'] self._canvasSize = dict['canvasSize'] self.setObjectName(dict['ObjectName']) - for item in dict['items']: - graphic = getattr(graphics, dict['_classname_']) - graphic.__setstate__(item) + + for item in dict['symbols']: + graphic = getattr(shapes, item['_classname_'])() + graphic.__setstate__(dict = item) self.painter.addItem(graphic) + graphic.setPos(*item['pos']) + + for item in dict['lines']: + line = shapes.Line(QPointF(*item['startPoint']), QPointF(*item['endPoint'])) + line.__setstate__(dict = item) + self.painter.addItem(line) + + self.painter.advance() + + # for item in dict['lineLabels']: + # pass + # for item in dict['itemLabels']: + # pass
\ No newline at end of file diff --git a/src/main/python/utils/fileWindow.py b/src/main/python/utils/fileWindow.py index ebe509b..6ad4477 100644 --- a/src/main/python/utils/fileWindow.py +++ b/src/main/python/utils/fileWindow.py @@ -1,4 +1,4 @@ -import pickle +import json from PyQt5.QtCore import Qt, pyqtSignal, QPoint from PyQt5.QtGui import QIcon @@ -24,8 +24,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 +210,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 +243,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']) diff --git a/src/main/resources/base/svg/ellipse.svg b/src/main/resources/base/svg/ellipse.svg index 7da0ae6..c455408 100644 --- a/src/main/resources/base/svg/ellipse.svg +++ b/src/main/resources/base/svg/ellipse.svg @@ -1,8 +1,8 @@ <?xml version="1.0"?> -<svg xmlns="http://example.org" xmlns:svg="http://www.w3.org/2000/svg"> +<svg xmlns="http://example.org" xmlns:svg="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" viewBox="0 0 100 100"> <!-- parent contents here --> - <svg:svg version="1.2" baseProfile="tiny" viewBox="0 0 100 100"> + <!-- <svg:svg version="1.2" baseProfile="tiny" viewBox="0 0 100 100"> --> <svg:ellipse cx="50" cy="50" rx="50" ry="50" fill="none" stroke="black" stroke-width="1" /> - </svg:svg> + <!-- </svg:svg> --> <!-- ... --> -</svg>
\ No newline at end of file +</svg>
\ No newline at end of file |
