From 721874dbb7f7f695eaf02d651c4ec83871f50fb3 Mon Sep 17 00:00:00 2001
From: Marcel Paffrath <marcel.paffrath@rub.de>
Date: Wed, 12 Jul 2017 16:49:11 +0200
Subject: [PATCH] [change] layout of sub-parameters of PylotParameter changed
 back to vertical alignment to save horizontal space in tuneautopick window

---
 pylot/core/io/default_parameters.py | 10 +++++-----
 pylot/core/util/widgets.py          | 16 ++++++++++------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/pylot/core/io/default_parameters.py b/pylot/core/io/default_parameters.py
index adf150fc..835a00b2 100644
--- a/pylot/core/io/default_parameters.py
+++ b/pylot/core/io/default_parameters.py
@@ -114,7 +114,7 @@ defaults = {'rootpath': {'type': str,
             'bpz2': {'type': (float, float),
                      'tooltip': 'lower/upper corner freq. of second band pass filter Z-comp. [Hz]',
                      'value': (2, 30),
-                     'namestring': ('Z-bandpass 2', '', '')},
+                     'namestring': ('Z-bandpass 2', 'Lower', 'Upper')},
             
             'bph1': {'type': (float, float),
                      'tooltip': 'lower/upper corner freq. of first band pass filter H-comp. [Hz]',
@@ -124,7 +124,7 @@ defaults = {'rootpath': {'type': str,
             'bph2': {'type': (float, float),
                      'tooltip': 'lower/upper corner freq. of second band pass filter z-comp. [Hz]',
                      'value': (2, 20),
-                     'namestring': ('H-bandpass 2', '', '')},
+                     'namestring': ('H-bandpass 2', 'Lower', 'Upper')},
             
             'algoP': {'type': str,
                       'tooltip': 'choose algorithm for P-onset determination (HOS, ARZ, or AR3)',
@@ -366,17 +366,17 @@ defaults = {'rootpath': {'type': str,
             'maxfreq': {'type': (float, float),
                         'tooltip': 'Upper filter frequency [P, S]',
                         'value': (10.0, 10.0),
-                        'namestring': ('Upper freq.', '', '')},
+                        'namestring': ('Upper freq.', 'P', 'S')},
             
             'filter_order': {'type': (int, int),
                              'tooltip': 'filter order [P, S]',
                              'value': (2, 2),
-                             'namestring': ('Order', '', '')},
+                             'namestring': ('Order', 'P', 'S')},
             
             'filter_type': {'type': (str, str),
                             'tooltip': 'filter type (bandpass, bandstop, lowpass, highpass) [P, S]',
                             'value': ('bandpass' , 'bandpass'),
-                            'namestring': ('Type', '', '')}
+                            'namestring': ('Type', 'P', 'S')}
 }
 
 settings_main={
diff --git a/pylot/core/util/widgets.py b/pylot/core/util/widgets.py
index a6e375ca..54c5c0e8 100644
--- a/pylot/core/util/widgets.py
+++ b/pylot/core/util/widgets.py
@@ -1804,6 +1804,10 @@ class TuneAutopicker(QWidget):
         self.add_log()
         self.set_stretch()
         self.resize(1280, 720)
+        if hasattr(parent, 'metadata'):
+            self.metadata = self.parent.metadata
+        else:
+            self.metadata = None
         #self.setWindowModality(QtCore.Qt.WindowModality.ApplicationModal)
         #self.setWindowFlags(self.windowFlags() | QtCore.Qt.WindowStaysOnTopHint)
 
@@ -2148,7 +2152,7 @@ class TuneAutopicker(QWidget):
         return parameters
 
     def set_stretch(self):
-        self.tune_layout.setStretch(0, 2)
+        self.tune_layout.setStretch(0, 3)
         self.tune_layout.setStretch(1, 1)        
 
     def clear_all(self):
@@ -2330,17 +2334,17 @@ class PylotParaBox(QtGui.QWidget):
     def create_multi_box(self, boxes, headline=None):
         box = QtGui.QWidget()
         gl = QtGui.QGridLayout()
-        row = 0
+        column = 0
         if headline:
             for index, item in enumerate(headline):
                 if not item:
                     continue
-                gl.addWidget(QtGui.QLabel(item), 0, index, 4)
-                row = 1
+                gl.addWidget(QtGui.QLabel(item), index, 0, 2)
+                column = 1
         for index, b in enumerate(boxes):
-            gl.addWidget(b, row, index)
+            gl.addWidget(b, index, column)
         box.setLayout(gl)
-        return box, row
+        return box, column
 
     def add_tab(self, layout, name):
         widget = QtGui.QWidget()