From 530a2c5f1038d6ee280aaf99f47483a27ce7fbbd Mon Sep 17 00:00:00 2001 From: Blaine Date: Thu, 11 Jun 2020 21:49:18 +0530 Subject: replace canvas from qwidget to qgraphicsview --- src/main/python/utils/canvas.py | 35 +++++++++++++++-------------------- 1 file changed, 15 insertions(+), 20 deletions(-) (limited to 'src/main/python/utils/canvas.py') diff --git a/src/main/python/utils/canvas.py b/src/main/python/utils/canvas.py index f37d1f8..3c7ac67 100644 --- a/src/main/python/utils/canvas.py +++ b/src/main/python/utils/canvas.py @@ -1,7 +1,7 @@ from PyQt5.QtCore import Qt, QPointF from PyQt5.QtGui import QBrush, QPalette from PyQt5.QtWidgets import (QFileDialog, QApplication, QHBoxLayout, QMenu, - QTabWidget, QWidget, QSpacerItem, QStyle) + QTabWidget, QWidget, QSpacerItem, QStyle,) from . import dialogs from .graphics import customView, customScene @@ -10,14 +10,14 @@ from .app import shapeGrips, lines import shapes -class canvas(QWidget): +class canvas(customView): """ 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= 'A0', ppi= '72' , parentMdiArea = None, parentFileWindow = None, landscape=True): - super(canvas, self).__init__(parent) + super(canvas, self).__init__(parent=parent) #Store values for the canvas dimensions for ease of access, these are here just to be # manipulated by the setters and getters @@ -31,13 +31,13 @@ class canvas(QWidget): #set layout and background color self.painter = customScene() self.painter.setBackgroundBrush(QBrush(Qt.white)) #set white background + self.setScene = self.painter + # self = customView(self.painter, self) #create a viewport for the canvas board - self.view = customView(self.painter, self) #create a viewport for the canvas board - - self.layout = QHBoxLayout(self) #create the layout of the canvas, the canvas could just subclass QGView instead - self.layout.addWidget(self.view, alignment=Qt.AlignCenter) - self.layout.setContentsMargins(0, 0, 0, 0) - self.setLayout(self.layout) + # self.layout = QHBoxLayout(self) #create the layout of the canvas, the canvas could just subclass QGView instead + # self.layout.addWidget(self, alignment=Qt.AlignCenter) + # self.layout.setContentsMargins(0, 0, 0, 0) + # self.setLayout(self.layout) #set initial paper size for the scene self.painter.setSceneRect(0, 0, *paperSizes[self._canvasSize][self._ppi]) @@ -51,29 +51,24 @@ class canvas(QWidget): def adjustView(self): #utitily to adjust current diagram view width, height = self.dimensions - frameWidth = self.view.frameWidth() + frameWidth = self.frameWidth() #update view size - self.view.setSceneRect(0, 0, width - frameWidth*2, height) + self.setSceneRect(0, 0, width - frameWidth*2, height) # use the available mdi area, also add padding prect = self.parentMdiArea.rect() - width = width + 20 - height = height + 60 + width = width + height = height # add scrollbar size to width and height if they are visible, avoids clipping - if self.view.verticalScrollBar().isVisible(): + if self.verticalScrollBar().isVisible(): width += self.style().pixelMetric(QStyle.PM_ScrollBarExtent) - if self.view.horizontalScrollBar().isVisible(): + if self.horizontalScrollBar().isVisible(): height += self.style().pixelMetric(QStyle.PM_ScrollBarExtent) #if view is visible use half of available width - factor = 2 if self.parentFileWindow.sideViewTab is not None else 1 #use minimum width required to fit the view - width = min((prect.width() - 60)//factor, width) - height = min(prect.height() - 120, height) #set view dims - self.view.setFixedWidth(width) - self.view.setFixedHeight(height) def resizeEvent(self, event): #overloaded function to also view size on window update -- cgit From ffff3aba43422ccb74ead3b288bbf1935f7e52ac Mon Sep 17 00:00:00 2001 From: Blaine Date: Thu, 11 Jun 2020 21:53:05 +0530 Subject: restore scroll bars on side View --- src/main/python/utils/canvas.py | 21 --------------------- 1 file changed, 21 deletions(-) (limited to 'src/main/python/utils/canvas.py') diff --git a/src/main/python/utils/canvas.py b/src/main/python/utils/canvas.py index 3c7ac67..fd06fb7 100644 --- a/src/main/python/utils/canvas.py +++ b/src/main/python/utils/canvas.py @@ -32,12 +32,6 @@ class canvas(customView): self.painter = customScene() self.painter.setBackgroundBrush(QBrush(Qt.white)) #set white background self.setScene = self.painter - # self = customView(self.painter, self) #create a viewport for the canvas board - - # self.layout = QHBoxLayout(self) #create the layout of the canvas, the canvas could just subclass QGView instead - # self.layout.addWidget(self, alignment=Qt.AlignCenter) - # self.layout.setContentsMargins(0, 0, 0, 0) - # self.setLayout(self.layout) #set initial paper size for the scene self.painter.setSceneRect(0, 0, *paperSizes[self._canvasSize][self._ppi]) @@ -55,21 +49,6 @@ class canvas(customView): #update view size self.setSceneRect(0, 0, width - frameWidth*2, height) - # use the available mdi area, also add padding - prect = self.parentMdiArea.rect() - width = width - height = height - - # add scrollbar size to width and height if they are visible, avoids clipping - if self.verticalScrollBar().isVisible(): - width += self.style().pixelMetric(QStyle.PM_ScrollBarExtent) - if self.horizontalScrollBar().isVisible(): - height += self.style().pixelMetric(QStyle.PM_ScrollBarExtent) - - #if view is visible use half of available width - #use minimum width required to fit the view - #set view dims - def resizeEvent(self, event): #overloaded function to also view size on window update self.adjustView() -- cgit From 6ac91c9a9fc3adc2ed23e396ab718cba3e21a188 Mon Sep 17 00:00:00 2001 From: Blaine Date: Thu, 11 Jun 2020 22:46:00 +0530 Subject: side view fixed --- src/main/python/utils/canvas.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/main/python/utils/canvas.py') diff --git a/src/main/python/utils/canvas.py b/src/main/python/utils/canvas.py index fd06fb7..674d27c 100644 --- a/src/main/python/utils/canvas.py +++ b/src/main/python/utils/canvas.py @@ -41,17 +41,18 @@ class canvas(customView): def resizeView(self, w, h): #helper function to resize canvas self.painter.setSceneRect(0, 0, w, h) - + def adjustView(self): #utitily to adjust current diagram view width, height = self.dimensions frameWidth = self.frameWidth() #update view size self.setSceneRect(0, 0, width - frameWidth*2, height) - + def resizeEvent(self, event): #overloaded function to also view size on window update - self.adjustView() + # self.adjustView() + pass def setCanvasSize(self, size): """ -- cgit From 737961c33741348a79987efbad35cf78c8d3a613 Mon Sep 17 00:00:00 2001 From: Blaine Date: Thu, 11 Jun 2020 22:47:40 +0530 Subject: fixed typo --- src/main/python/utils/canvas.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/python/utils/canvas.py') diff --git a/src/main/python/utils/canvas.py b/src/main/python/utils/canvas.py index 674d27c..88e3c43 100644 --- a/src/main/python/utils/canvas.py +++ b/src/main/python/utils/canvas.py @@ -31,7 +31,7 @@ class canvas(customView): #set layout and background color self.painter = customScene() self.painter.setBackgroundBrush(QBrush(Qt.white)) #set white background - self.setScene = self.painter + self.setScene(self.painter) #set initial paper size for the scene self.painter.setSceneRect(0, 0, *paperSizes[self._canvasSize][self._ppi]) -- cgit From c0412bcf3853abeb6911c82aaf35125c25529277 Mon Sep 17 00:00:00 2001 From: Blaine Date: Thu, 11 Jun 2020 22:53:36 +0530 Subject: fixed context menu --- src/main/python/utils/canvas.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/main/python/utils/canvas.py') diff --git a/src/main/python/utils/canvas.py b/src/main/python/utils/canvas.py index 88e3c43..480a2e1 100644 --- a/src/main/python/utils/canvas.py +++ b/src/main/python/utils/canvas.py @@ -37,7 +37,11 @@ class canvas(customView): self.painter.setSceneRect(0, 0, *paperSizes[self._canvasSize][self._ppi]) self.parentMdiArea = parentMdiArea self.parentFileWindow = parentFileWindow + self.customContextMenuRequested.connect(self.sideViewContextMenu) + def sideViewContextMenu(self, pos): + self.parentFileWindow.sideViewContextMenu(self.mapTo(self.parentFileWindow, pos)) + def resizeView(self, w, h): #helper function to resize canvas self.painter.setSceneRect(0, 0, w, h) -- cgit