From f1bbcb67452815d87b84b2c5bcd0d3748cbdbfee Mon Sep 17 00:00:00 2001 From: Johannes Pohl Date: Thu, 21 Jun 2018 23:30:52 +0200 Subject: [PATCH] improve QPen api calls --- src/urh/controller/dialogs/SendDialog.py | 2 +- src/urh/plugins/InsertSine/InsertSinePlugin.py | 2 +- src/urh/signalprocessing/Modulator.py | 7 +++---- src/urh/simulator/GraphicsItem.py | 4 ++-- src/urh/ui/painting/FFTSceneManager.py | 4 +--- src/urh/ui/painting/GridScene.py | 6 +++--- src/urh/ui/painting/LabeledArrow.py | 4 ++-- src/urh/ui/painting/SceneManager.py | 10 +++++----- src/urh/ui/painting/Selection.py | 2 +- src/urh/ui/painting/ZoomableScene.py | 5 ++--- 10 files changed, 21 insertions(+), 25 deletions(-) diff --git a/src/urh/controller/dialogs/SendDialog.py b/src/urh/controller/dialogs/SendDialog.py index fc137bee..49f57341 100644 --- a/src/urh/controller/dialogs/SendDialog.py +++ b/src/urh/controller/dialogs/SendDialog.py @@ -42,7 +42,7 @@ class SendDialog(SendRecvDialog): signal = Signal.from_samples(modulated_data, "Modulated Preview", samp_rate) self.scene_manager = SignalSceneManager(signal, parent=self) self.send_indicator = self.scene_manager.scene.addRect(0, -2, 0, 4, - QPen(QColor(Qt.transparent), Qt.FlatCap), + QPen(QColor(Qt.transparent), 0), QBrush(constants.SEND_INDICATOR_COLOR)) self.send_indicator.stackBefore(self.scene_manager.scene.selection_area) self.scene_manager.init_scene() diff --git a/src/urh/plugins/InsertSine/InsertSinePlugin.py b/src/urh/plugins/InsertSine/InsertSinePlugin.py index 02c97956..5ccc8416 100644 --- a/src/urh/plugins/InsertSine/InsertSinePlugin.py +++ b/src/urh/plugins/InsertSine/InsertSinePlugin.py @@ -51,7 +51,7 @@ class InsertSinePlugin(SignalEditorPlugin): scene_manager = SceneManager(self.dialog_ui.graphicsViewSineWave) self.__dialog_ui.graphicsViewSineWave.scene_manager = scene_manager self.insert_indicator = scene_manager.scene.addRect(0, -2, 0, 4, - QPen(QColor(Qt.transparent), Qt.FlatCap), + QPen(QColor(Qt.transparent), 0), QBrush(self.INSERT_INDICATOR_COLOR)) self.insert_indicator.stackBefore(scene_manager.scene.selection_area) diff --git a/src/urh/signalprocessing/Modulator.py b/src/urh/signalprocessing/Modulator.py index 0b24c3fa..7f897609 100644 --- a/src/urh/signalprocessing/Modulator.py +++ b/src/urh/signalprocessing/Modulator.py @@ -1,8 +1,8 @@ +import array import locale import xml.etree.ElementTree as ET import numpy as np -from PyQt5.QtCore import Qt from PyQt5.QtGui import QPen from PyQt5.QtWidgets import QGraphicsScene @@ -10,7 +10,6 @@ from urh import constants from urh.cythonext import path_creator, signalFunctions from urh.ui.painting.ZoomableScene import ZoomableScene from urh.util.Formatter import Formatter -import array class Modulator(object): @@ -137,10 +136,10 @@ class Modulator(object): scene = ZoomableScene() scene.setSceneRect(0, -1, n, 2) scene.setBackgroundBrush(constants.BGCOLOR) - scene.addLine(0, 0, n, 0, QPen(constants.AXISCOLOR, Qt.FlatCap)) + scene.addLine(0, 0, n, 0, QPen(constants.AXISCOLOR, 0)) y = np.array(y) if len(y) > 0 else np.array(y).astype(np.float32) path = path_creator.array_to_QPath(x, y) - scene.addPath(path, QPen(constants.LINECOLOR, Qt.FlatCap)) + scene.addPath(path, QPen(constants.LINECOLOR, 0)) return scene def modulate(self, data=None, pause=0, start=0): diff --git a/src/urh/simulator/GraphicsItem.py b/src/urh/simulator/GraphicsItem.py index a01801d9..1dbd6545 100644 --- a/src/urh/simulator/GraphicsItem.py +++ b/src/urh/simulator/GraphicsItem.py @@ -125,12 +125,12 @@ class GraphicsItem(QGraphicsObject): if self.hover_active or self.isSelected(): painter.setOpacity(constants.SELECTION_OPACITY) painter.setBrush(constants.SELECTION_COLOR) - painter.setPen(QPen(QColor(Qt.transparent), Qt.FlatCap)) + painter.setPen(QPen(QColor(Qt.transparent), 0)) painter.drawRect(self.boundingRect()) elif not self.is_valid(): painter.setOpacity(constants.SELECTION_OPACITY) painter.setBrush(QColor(255, 0, 0, 150)) - painter.setPen(QPen(QColor(Qt.transparent), Qt.FlatCap)) + painter.setPen(QPen(QColor(Qt.transparent), 0)) painter.drawRect(self.boundingRect()) if self.drag_over: diff --git a/src/urh/ui/painting/FFTSceneManager.py b/src/urh/ui/painting/FFTSceneManager.py index 7d5c1054..67e2d541 100644 --- a/src/urh/ui/painting/FFTSceneManager.py +++ b/src/urh/ui/painting/FFTSceneManager.py @@ -1,5 +1,4 @@ import numpy as np -from PyQt5.QtCore import Qt from PyQt5.QtGui import QPainterPath, QPen from PyQt5.QtWidgets import QGraphicsPathItem @@ -17,8 +16,7 @@ class FFTSceneManager(SceneManager): self.scene = GridScene(parent=graphic_view) self.scene.setBackgroundBrush(constants.BGCOLOR) - self.peak_item = self.scene.addPath(QPainterPath(), - QPen(constants.PEAK_COLOR, Qt.FlatCap)) # type: QGraphicsPathItem + self.peak_item = self.scene.addPath(QPainterPath(), QPen(constants.PEAK_COLOR, 0)) # type: QGraphicsPathItem def show_scene_section(self, x1: float, x2: float, subpath_ranges=None, colors=None): start = int(x1) if x1 > 0 else 0 diff --git a/src/urh/ui/painting/GridScene.py b/src/urh/ui/painting/GridScene.py index f42b7716..faf77165 100644 --- a/src/urh/ui/painting/GridScene.py +++ b/src/urh/ui/painting/GridScene.py @@ -1,5 +1,5 @@ import numpy as np -from PyQt5.QtCore import QRectF, QLineF, Qt +from PyQt5.QtCore import QRectF, QLineF from PyQt5.QtGui import QPainter, QFont, QFontMetrics, QPen, QTransform, QBrush from urh import constants @@ -27,7 +27,7 @@ class GridScene(ZoomableScene): def drawBackground(self, painter: QPainter, rect: QRectF): # freqs = np.fft.fftfreq(len(w), 1 / self.sample_rate) if self.draw_grid and len(self.frequencies) > 0: - painter.setPen(QPen(painter.pen().color(), Qt.FlatCap)) + painter.setPen(QPen(painter.pen().color(), 0)) parent_width = self.parent().width() if hasattr(self.parent(), "width") else 750 view_rect = self.parent().view_rect() if hasattr(self.parent(), "view_rect") else rect @@ -80,7 +80,7 @@ class GridScene(ZoomableScene): y2 = self.sceneRect().y() + self.sceneRect().height() if self.frequency_marker is None: - pen = QPen(constants.LINECOLOR, Qt.FlatCap) + pen = QPen(constants.LINECOLOR, 0) self.frequency_marker = [None, None] self.frequency_marker[0] = self.addLine(x_pos, y1, x_pos, y2, pen) self.frequency_marker[1] = self.addSimpleText("") diff --git a/src/urh/ui/painting/LabeledArrow.py b/src/urh/ui/painting/LabeledArrow.py index 26481afc..907d0fef 100644 --- a/src/urh/ui/painting/LabeledArrow.py +++ b/src/urh/ui/painting/LabeledArrow.py @@ -1,4 +1,4 @@ -from PyQt5.QtCore import QRectF, QSizeF, QPointF, Qt +from PyQt5.QtCore import QRectF, QSizeF, QPointF from PyQt5.QtGui import QPainter, QPen from PyQt5.QtWidgets import QGraphicsLineItem @@ -12,7 +12,7 @@ class LabeledArrow(QGraphicsLineItem): self.ItemIsSelectable = False self.ItemIsFocusable = False self.label = str(label) - self.setPen(QPen(constants.ARROWCOLOR, Qt.FlatCap)) + self.setPen(QPen(constants.ARROWCOLOR, 0)) def boundingRect(self): extra = (self.pen().width() + 20) / 2.0 diff --git a/src/urh/ui/painting/SceneManager.py b/src/urh/ui/painting/SceneManager.py index 3030028f..11c28d8c 100644 --- a/src/urh/ui/painting/SceneManager.py +++ b/src/urh/ui/painting/SceneManager.py @@ -1,7 +1,7 @@ import math import numpy as np -from PyQt5.QtCore import QObject, Qt +from PyQt5.QtCore import QObject from PyQt5.QtGui import QPen, QColor from PyQt5.QtWidgets import QGraphicsPathItem @@ -15,7 +15,7 @@ class SceneManager(QObject): super().__init__(parent) self.scene = ZoomableScene() self.__plot_data = None # type: np.ndarray - self.line_item = self.scene.addLine(0, 0, 0, 0, QPen(constants.AXISCOLOR, Qt.FlatCap)) + self.line_item = self.scene.addLine(0, 0, 0, 0, QPen(constants.AXISCOLOR, 0)) self.minimum = float("nan") # NaN = AutoDetect self.maximum = float("nan") # NaN = AutoDetect @@ -56,7 +56,7 @@ class SceneManager(QObject): colors = [constants.LINECOLOR] * len(paths) if colors is None else colors assert len(paths) == len(colors) for path, color in zip(paths, colors): - path_object = self.scene.addPath(path, QPen(color if color else constants.LINECOLOR, Qt.FlatCap)) + path_object = self.scene.addPath(path, QPen(color if color else constants.LINECOLOR, 0)) if color: path_object.setZValue(1) @@ -123,11 +123,11 @@ class SceneManager(QObject): scene = ZoomableScene() scene.setSceneRect(0, -1, n, 2) scene.setBackgroundBrush(constants.BGCOLOR) - scene.addLine(0, 0, n, 0, QPen(constants.AXISCOLOR, Qt.FlatCap)) + scene.addLine(0, 0, n, 0, QPen(constants.AXISCOLOR, 0)) if len(y) > 0: y = np.array(y) else: y = np.array(y).astype(np.float32) path = path_creator.array_to_QPath(x, y) - scene.addPath(path, QPen(constants.LINECOLOR, Qt.FlatCap)) + scene.addPath(path, QPen(constants.LINECOLOR, 0)) return scene, n diff --git a/src/urh/ui/painting/Selection.py b/src/urh/ui/painting/Selection.py index db3eb06e..de6a9234 100644 --- a/src/urh/ui/painting/Selection.py +++ b/src/urh/ui/painting/Selection.py @@ -18,7 +18,7 @@ class Selection(QGraphicsRectItem): self.resizing = False self.setBrush(fillcolor) - self.setPen(QPen(QColor(Qt.transparent), Qt.FlatCap)) + self.setPen(QPen(QColor(Qt.transparent), 0)) self.setOpacity(opacity) @property diff --git a/src/urh/ui/painting/ZoomableScene.py b/src/urh/ui/painting/ZoomableScene.py index 3dc29709..4af0986a 100644 --- a/src/urh/ui/painting/ZoomableScene.py +++ b/src/urh/ui/painting/ZoomableScene.py @@ -1,4 +1,3 @@ -from PyQt5.QtCore import Qt from PyQt5.QtGui import QPen from PyQt5.QtWidgets import QGraphicsScene, QGraphicsRectItem, QGraphicsSceneDragDropEvent @@ -48,7 +47,7 @@ class ZoomableScene(QGraphicsScene): self.ones_area = QGraphicsRectItem(x, y, w, h / 2 + y_mid) self.ones_area.setBrush(constants.ONES_AREA_COLOR) self.ones_area.setOpacity(constants.SEPARATION_OPACITY) - self.ones_area.setPen(QPen(constants.TRANSPARENT_COLOR, Qt.FlatCap)) + self.ones_area.setPen(QPen(constants.TRANSPARENT_COLOR, 0)) self.addItem(self.ones_area) else: @@ -60,7 +59,7 @@ class ZoomableScene(QGraphicsScene): self.zeros_area = QGraphicsRectItem(x, start, w, (y + h) - start) self.zeros_area.setBrush(constants.ZEROS_AREA_COLOR) self.zeros_area.setOpacity(constants.SEPARATION_OPACITY) - self.zeros_area.setPen(QPen(constants.TRANSPARENT_COLOR, Qt.FlatCap)) + self.zeros_area.setPen(QPen(constants.TRANSPARENT_COLOR, 0)) self.addItem(self.zeros_area) else: self.zeros_area.show()