From 463cdd44befe89a7eeae73737eab4787e4ef82db Mon Sep 17 00:00:00 2001 From: Johannes Pohl Date: Tue, 28 Feb 2017 12:24:49 +0100 Subject: [PATCH] fix quad demod padding issue --- src/urh/SceneManager.py | 12 +++++++----- src/urh/SignalSceneManager.py | 5 +++-- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/urh/SceneManager.py b/src/urh/SceneManager.py index de933fad..34e8f0d1 100644 --- a/src/urh/SceneManager.py +++ b/src/urh/SceneManager.py @@ -54,7 +54,7 @@ class SceneManager(QObject): def show_full_scene(self): self.show_scene_section(0, self.num_samples) - def init_scene(self): + def init_scene(self, apply_padding=True): self.set_text("") if self.num_samples == 0: @@ -65,12 +65,14 @@ class SceneManager(QObject): else: minimum, maximum = self.minimum, self.maximum + padding = self.padding if apply_padding else 1 + if abs(minimum) > abs(maximum): - minimum = -self.padding * abs(minimum) - maximum = -self.padding * minimum + minimum = -padding * abs(minimum) + maximum = -padding * minimum else: - maximum = self.padding*abs(maximum) - minimum = -self.padding*maximum + maximum = padding * abs(maximum) + minimum = -padding * maximum self.scene.setSceneRect(0, minimum, self.num_samples, maximum - minimum) self.scene.setBackgroundBrush(constants.BGCOLOR) diff --git a/src/urh/SignalSceneManager.py b/src/urh/SignalSceneManager.py index 2320fb8b..90ce5ae1 100644 --- a/src/urh/SignalSceneManager.py +++ b/src/urh/SignalSceneManager.py @@ -13,7 +13,7 @@ class SignalSceneManager(SceneManager): def __init__(self, signal: Signal, parent): super().__init__(parent) self.signal = signal - self.text_item = self.scene.addText("Loading...", QFont("Helvetica", 72)) + self.text_item = self.scene.addText("Loading...", QFont("Helvetica", 12)) self.scene_type = 0 # 0 = Analog Signal, 1 = QuadDemodView def show_scene_section(self, x1: float, x2: float, subpath_ranges=None, colors=None): @@ -34,9 +34,10 @@ class SignalSceneManager(SceneManager): self.minimum, self.maximum = 0, self.padding * np.max(self.signal.qad) else: self.minimum, self.maximum = 0, self.padding * noise_val + self.plot_data = self.signal.qad - super().init_scene() + super().init_scene(apply_padding=self.scene_type == 0) self.minimum, self.maximum = stored_minimum, stored_maximum self.line_item.setLine(0, 0, 0, 0) # Hide Axis