summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.vscode/tasks.json12
-rw-r--r--src/main/python/main.py87
-rw-r--r--src/main/python/utils/canvas.py46
3 files changed, 102 insertions, 43 deletions
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
new file mode 100644
index 0000000..f388534
--- /dev/null
+++ b/.vscode/tasks.json
@@ -0,0 +1,12 @@
+{
+ // See https://go.microsoft.com/fwlink/?LinkId=733558
+ // for the documentation about the tasks.json format
+ "version": "2.0.0",
+ "tasks": [
+ {
+ "label": "run",
+ "type": "shell",
+ "command": "fbs run"
+ }
+ ]
+} \ No newline at end of file
diff --git a/src/main/python/main.py b/src/main/python/main.py
index 88fc48b..b42329e 100644
--- a/src/main/python/main.py
+++ b/src/main/python/main.py
@@ -1,76 +1,77 @@
from fbs_runtime.application_context.PyQt5 import ApplicationContext
-from PyQt5.QtCore import Qt
+from PyQt5.QtCore import Qt, pyqtSignal, pyqtSlot, QObject
from PyQt5.QtGui import (QBrush, QColor, QImage, QPainter,
QPalette)
-from PyQt5.QtWidgets import (QApplication, QComboBox, QDialog, QGraphicsScene,
+from PyQt5.QtWidgets import (QWidget, QComboBox, QMainWindow, QGraphicsScene,
QGraphicsView, QGridLayout, QHBoxLayout, QLabel,
- QMessageBox, QPushButton, QStyleFactory)
-from utils.sizes import paperSizes
+ QPushButton, QMenuBar, QMenu, QFormLayout, QTabWidget)
+
+from utils.canvas import canvas
import sys
-class appWindow(QDialog):
+
+class appWindow(QMainWindow):
def __init__(self, parent=None):
- super(appWindow, self).__init__(parent)
-
- self._ppi = 72
- self._canvasSize = "A0"
+ super(appWindow, self).__init__(parent)
self.resize(1280, 720)
-
- self.painter = QGraphicsScene(0, 0, *paperSizes[self.canvasSize][self.ppi])
- self.painter.setBackgroundBrush(QBrush(Qt.white))
+ titleMenu = self.menuBar()
+ self.mainWidget = QWidget(self)
+ self.menuFile = titleMenu.addMenu('File') #File Menu
+ self.menuFile.addAction("new", self.newDiagram)
+ self.menuGenerate = titleMenu.addMenu('Generate') #Generate menu
+ self.menuGenerate.addAction("Image", self.saveImage)
+ self.menuGenerate.addAction("Report", self.generateReport)
+
+
+ mainLayout = QGridLayout(self.mainWidget)
+ self.tabber = QTabWidget(self.mainWidget)
+ self.tabber.setTabsClosable(True)
+ # QObject.connect(self.tabber, pyqtSignal(QTabWidget.tabCloseRequested(int)), self, pyqtSlot(QTabWidget.closetab(int)))
+ # add close action to tabs
self.createToolbar()
- self.canvas = QGraphicsView(self.painter)
- mainLayout = QGridLayout()
- mainLayout.addLayout(self.topLayout, 0, 0, 1, -1)
- mainLayout.addWidget(self.canvas, 1, 0, -1, -1)
- self.setLayout(mainLayout)
+ mainLayout.addLayout(self.toolbar, 0, 0, -1, 2)
+ mainLayout.addWidget(self.tabber, 0, 2, -1, 10)
+
+ self.mainWidget.setLayout(mainLayout)
+ self.setCentralWidget(self.mainWidget)
def createToolbar(self):
- self.topLayout = QHBoxLayout()
+ self.toolbar = QFormLayout(self.mainWidget)
sizeComboBox = QComboBox()
sizeComboBox.addItems([f'A{i}' for i in range(5)])
+ # sizeComboBox.activated[str].connect(lambda: self.tabber.currentWidget().setCanvasSize)
sizeComboBox.activated[str].connect(self.setCanvasSize)
sizeLabel = QLabel("Canvas Size")
sizeLabel.setBuddy(sizeComboBox)
- self.topLayout.addWidget(sizeLabel)
- self.topLayout.addWidget(sizeComboBox)
+ self.toolbar.setWidget(0, QFormLayout.LabelRole, sizeLabel)
+ self.toolbar.setWidget(0, QFormLayout.FieldRole, sizeComboBox)
ppiComboBox = QComboBox()
ppiComboBox.addItems(["72", "96", "150", "300"])
+ # ppiComboBox.activated[str].connect(lambda: self.tabber.currentWidget().setCanvasPPI)
ppiComboBox.activated[str].connect(self.setCanvasPPI)
ppiLabel = QLabel("Canvas ppi")
ppiLabel.setBuddy(ppiComboBox)
- self.topLayout.addWidget(ppiLabel)
- self.topLayout.addWidget(ppiComboBox)
+ self.toolbar.setWidget(1, QFormLayout.LabelRole, ppiLabel)
+ self.toolbar.setWidget(1, QFormLayout.FieldRole, ppiComboBox)
def setCanvasSize(self, size):
- self.canvasSize = size
+ self.tabber.currentWidget().canvasSize = size
def setCanvasPPI(self, ppi):
- self.ppi = ppi
+ self.tabber.currentWidget().ppi = ppi
+
+ def newDiagram(self):
+ diagram = canvas()
+ self.tabber.addTab(diagram, "New")
- @property
- def canvasSize(self):
- return self._canvasSize
- @property
- def ppi(self):
- return self._ppi
+ def saveImage(self):
+ pass
- @canvasSize.setter
- def canvasSize(self, size):
- self._canvasSize = size
- if self.painter:
- self.painter.setSceneRect(0, 0, *paperSizes[self.canvasSize][self.ppi])
- print(*paperSizes[self.canvasSize][self.ppi])
+ def generateReport(self):
+ pass
- @ppi.setter
- def ppi(self, ppi):
- self._ppi = int(ppi)
- if self.painter:
- self.painter.setSceneRect(0, 0, *paperSizes[self.canvasSize][self.ppi])
- print(*paperSizes[self.canvasSize][self.ppi])
-
if __name__ == '__main__':
app = ApplicationContext() # 1. Instantiate ApplicationContext
test = appWindow()
diff --git a/src/main/python/utils/canvas.py b/src/main/python/utils/canvas.py
new file mode 100644
index 0000000..ad72544
--- /dev/null
+++ b/src/main/python/utils/canvas.py
@@ -0,0 +1,46 @@
+from PyQt5.QtCore import Qt
+from PyQt5.QtGui import QBrush
+from PyQt5.QtWidgets import QWidget, QGraphicsScene, QGraphicsView, QHBoxLayout
+from .sizes import paperSizes
+class canvas(QWidget):
+ def __init__(self, parent=None):
+ super(canvas, self).__init__(parent)
+
+ self._ppi = 72
+ self._canvasSize = "A0"
+ self.resize(1280, 720)
+
+
+ self.painter = QGraphicsScene(0, 0, *paperSizes[self.canvasSize][self.ppi])
+ self.painter.setBackgroundBrush(QBrush(Qt.white))
+ self.view = QGraphicsView(self.painter)
+ self.layout = QHBoxLayout(self)
+ self.layout.addWidget(self.view)
+ self.setLayout(self.layout)
+
+ def setCanvasSize(self, size):
+ self.canvasSize = size
+
+ def setCanvasPPI(self, ppi):
+ self.ppi = ppi
+
+ @property
+ def canvasSize(self):
+ return self._canvasSize
+ @property
+ def ppi(self):
+ return self._ppi
+
+ @canvasSize.setter
+ def canvasSize(self, size):
+ self._canvasSize = size
+ if self.painter:
+ self.painter.setSceneRect(0, 0, *paperSizes[self.canvasSize][self.ppi])
+ # print(*paperSizes[self.canvasSize][self.ppi])
+
+ @ppi.setter
+ def ppi(self, ppi):
+ self._ppi = int(ppi)
+ if self.painter:
+ self.painter.setSceneRect(0, 0, *paperSizes[self.canvasSize][self.ppi])
+ # print(*paperSizes[self.canvasSize][self.ppi]) \ No newline at end of file
generated by cgit (git 2.34.1) at 2024-12-20 19:22:09 +0000