fix quad demod padding issue

This commit is contained in:
Johannes Pohl
2017-02-28 12:24:49 +01:00
parent d8fed5dbc8
commit 463cdd44be
2 changed files with 10 additions and 7 deletions

View File

@@ -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)

View File

@@ -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