added parameter selection with ParameterBox to QtPyLoT Mainwindow

QtPyLoT.py

@@ -67,7 +67,7 @@ from pylot.core.util.utils import fnConstructor, getLogin, \
 from pylot.core.io.location import create_creation_info, create_event
 from pylot.core.util.widgets import FilterOptionsDialog, NewEventDlg, \
     WaveformWidget, PropertiesDlg, HelpForm, createAction, PickDlg, \
-    getDataType, ComparisonDialog, TuneAutopicker
+    getDataType, ComparisonDialog, TuneAutopicker, AutoPickParaBox
 from pylot.core.util.map_projection import map_projection
 from pylot.core.util.structure import DATASTRUCTURE
 from pylot.core.util.thread import AutoPickThread, Thread
@@ -102,6 +102,7 @@ class MainWindow(QMainWindow):
 
         self.project = Project()
         self.tap = None
+        self.paraBox = None
         self.array_map = None
         self._metadata = None
         self._eventChanged = [False, False]
@@ -358,12 +359,16 @@ class MainWindow(QMainWindow):
                                        QCoreApplication.instance().quit,
                                        QKeySequence.Close, quitIcon,
                                        "Close event and quit PyLoT")
+        self.parameterAction = self.createAction(self, "Pick Parameter",
+                                                 self.pickParameter,
+                                                 None, QIcon(None),
+                                                 "Modify Picking Parameter")
         self.filterAction = self.createAction(self, "&Filter ...",
                                               self.filterWaveformData,
                                               "Ctrl+F", filter_icon,
                                               """Toggle un-/filtered waveforms
-                                         to be displayed, according to the
+                                              to be displayed, according to the
-                                         desired seismic phase.""", True)
+                                              desired seismic phase.""", True)
         filterEditAction = self.createAction(self, "&Filter parameter ...",
                                              self.adjustFilterOptions,
                                              "Alt+F", QIcon(None),
@@ -398,7 +403,7 @@ class MainWindow(QMainWindow):
                                 self.openProjectAction, self.saveProjectAction,
                                 self.saveProjectAsAction,
                                 self.openmanualpicksaction, self.saveManualPicksAction, None,
-                                prefsEventAction, quitAction)
+                                prefsEventAction, self.parameterAction, quitAction)
         self.fileMenu.aboutToShow.connect(self.updateFileMenu)
         self.updateFileMenu()
 
@@ -2124,6 +2129,11 @@ class MainWindow(QMainWindow):
             # self.closing.emit()
             # QMainWindow.closeEvent(self, event)
 
+    def pickParameter(self):
+        if not self.paraBox:
+            self.paraBox = AutoPickParaBox(self._inputs)
+        self.paraBox.show()
+        
     def PyLoTprefs(self):
         if not self._props:
             self._props = PropertiesDlg(self, infile=self.infile)

pylot/RELEASE-VERSION

@@ -1 +1 @@
-02a5-dirty
+7d73-dirty

pylot/core/util/widgets.py

@@ -1446,10 +1446,10 @@ class TuneAutopicker(QWidget):
         self.stb_names = ['aicARHfig', 'refSpick', 'el_S1pick', 'el_S2pick']
 
     def add_parameters(self):
-        self.parameters = AutoPickParaBox(self.parameter)
+        self.paraBox = AutoPickParaBox(self.parameter)
-        self.parameters.set_tune_mode(True)
+        self.paraBox.set_tune_mode(True)
         self.update_eventID()
-        self.parameter_layout.addWidget(self.parameters)
+        self.parameter_layout.addWidget(self.paraBox)
         self.parameter_layout.addWidget(self.pb_widget)
         self.tune_layout.insertLayout(1, self.parameter_layout)
 
@@ -1633,7 +1633,7 @@ class TuneAutopicker(QWidget):
         self.parent.fill_eventbox()
 
     def update_eventID(self):
-        self.parameters.boxes['eventID'].setText(
+        self.paraBox.boxes['eventID'].setText(
             self.get_current_event_name())
         self.figure_tabs.setCurrentIndex(0)
 
@@ -1681,7 +1681,7 @@ class TuneAutopicker(QWidget):
 
     def enable(self, bool):
         self.pick_button.setEnabled(bool)
-        self.parameters.setEnabled(bool)
+        self.paraBox.setEnabled(bool)
         self.eventBox.setEnabled(bool)
         self.stationBox.setEnabled(bool)
         self.overview.setEnabled(bool)
@@ -1689,7 +1689,7 @@ class TuneAutopicker(QWidget):
         self.s_tabs.setEnabled(bool)        
         
     def params_from_gui(self):
-        parameters = self.parameters.params_from_gui()
+        parameters = self.paraBox.params_from_gui()
         if self.parent:
             self.parent._inputs = parameters
         return parameters
@@ -1738,8 +1738,9 @@ class AutoPickParaBox(QtGui.QWidget):
         self.parameter = parameter
         self.tabs = QtGui.QTabWidget()
         self.layout = QtGui.QVBoxLayout()
-        self._init_buttons()
+        self._init_save_buttons()
-        self.layout.addWidget(self.tabs)
+        self._init_tabs()
+        self._init_dialog_buttons()
         self.boxes = {}
         self._init_sublayouts()
         self.setLayout(self.layout)
@@ -1747,13 +1748,14 @@ class AutoPickParaBox(QtGui.QWidget):
         self.add_special_pick_parameters_tab()
         self.params_to_gui()
         self._toggle_advanced_settings()
+        self.resize(720, 1280)        
 
     def _init_sublayouts(self):
         self._main_layout = QtGui.QVBoxLayout()
         self._advanced_layout = QtGui.QVBoxLayout()
         self._create_advanced_cb()
 
-    def _init_buttons(self):
+    def _init_save_buttons(self):
         self._buttons_layout = QtGui.QHBoxLayout()
         self.loadButton = QtGui.QPushButton('&Load settings')
         self.saveButton = QtGui.QPushButton('&Save settings')
@@ -1766,6 +1768,24 @@ class AutoPickParaBox(QtGui.QWidget):
         self.saveButton.clicked.connect(self.saveFile)
         self.defaultsButton.clicked.connect(self.restoreDefaults)
 
+    def _init_tabs(self):
+        self.layout.addWidget(self.tabs)
+
+    def _init_dialog_buttons(self):
+        self._dialog_buttons = QtGui.QHBoxLayout()
+        self._okay =  QtGui.QPushButton('Ok')
+        self._close = QtGui.QPushButton('Close')
+        self._apply = QtGui.QPushButton('Apply')
+        self._dialog_buttons.addWidget(self._okay)
+        self._dialog_buttons.addWidget(self._close)
+        self._dialog_buttons.addWidget(self._apply)
+        self._okay.clicked.connect(self.params_from_gui)
+        self._okay.clicked.connect(self.close)
+        self._apply.clicked.connect(self.params_from_gui)
+        self._close.clicked.connect(self.params_to_gui)
+        self._close.clicked.connect(self.close)
+        self.layout.addLayout(self._dialog_buttons)
+        
     def _create_advanced_cb(self):
         self._advanced_cb = QtGui.QCheckBox('Enable Advanced Settings')
         self._advanced_layout.addWidget(self._advanced_cb)
@@ -1794,6 +1814,14 @@ class AutoPickParaBox(QtGui.QWidget):
                 'ctrfile', 'ttpatter', 'outpatter']
         for key in keys:
             self.boxes[key].setEnabled(not(bool))
+        if bool:
+            self._apply.hide()
+            self._okay.hide()
+            self._close.hide()
+        else:
+            self._apply.show()
+            self._okay.show()
+            self._close.show()
         
     def init_boxes(self, parameter_names):
         grid = QtGui.QGridLayout()