marcel/pylot
3
0
Fork 0
Code Issues 7 Pull Requests 1 Releases Wiki Activity

[change] ComparisonDlg -> ComparisonWidget

Browse Source
This commit is contained in:
Marcel Paffrath 2017-08-21 16:07:57 +02:00
parent b185ce72b1
commit ed994e987f
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
QtPyLoT.py
View File

@ -79,7 +79,7 @@ from pylot.core.util.event import Event
from pylot.core.io.location import create_creation_info, create_event from pylot.core.io.location import create_creation_info, create_event
from pylot.core.util.widgets import FilterOptionsDialog, NewEventDlg, \ from pylot.core.util.widgets import FilterOptionsDialog, NewEventDlg, \
WaveformWidget, WaveformWidgetPG, PropertiesDlg, HelpForm, createAction, PickDlg, \ WaveformWidget, WaveformWidgetPG, PropertiesDlg, HelpForm, createAction, PickDlg, \
getDataType, ComparisonDialog, TuneAutopicker, PylotParaBox, AutoPickDlg getDataType, ComparisonWidget, TuneAutopicker, PylotParaBox, AutoPickDlg
from pylot.core.util.map_projection import map_projection from pylot.core.util.map_projection import map_projection
from pylot.core.util.structure import DATASTRUCTURE from pylot.core.util.structure import DATASTRUCTURE
from pylot.core.util.thread import Thread, Worker from pylot.core.util.thread import Thread, Worker
@ -1220,8 +1220,8 @@ class MainWindow(QMainWindow):
manupicks = excludeQualityClasses(self.getPicks('manual'), [4], manupicks = excludeQualityClasses(self.getPicks('manual'), [4],
self._inputs['timeerrorsP'], self._inputs['timeerrorsS']) self._inputs['timeerrorsP'], self._inputs['timeerrorsS'])
co = Comparison(auto=autopicks, manu=manupicks) co = Comparison(auto=autopicks, manu=manupicks)
compare_dlg = ComparisonDialog(co, self) compare_dlg = ComparisonWidget(co, self)
compare_dlg.exec_() compare_dlg.show()
def getPlotWidget(self): def getPlotWidget(self):
return self.dataPlot return self.dataPlot

12
pylot/core/util/widgets.py
View File

@ -119,7 +119,7 @@ def createAction(parent, text, slot=None, shortcut=None, icon=None,
return action return action
class ComparisonDialog(QDialog): class ComparisonWidget(QWidget):
def __init__(self, c, parent=None): def __init__(self, c, parent=None):
self._data = c self._data = c
self._stats = c.stations self._stats = c.stations
@ -129,8 +129,9 @@ class ComparisonDialog(QDialog):
histCheckBox=None) histCheckBox=None)
self._phases = 'PS' self._phases = 'PS'
self._plotprops = dict(station=list(self.stations)[0], phase=list(self.phases)[0]) self._plotprops = dict(station=list(self.stations)[0], phase=list(self.phases)[0])
super(ComparisonDialog, self).__init__(parent) super(ComparisonWidget, self).__init__(parent, 1)
self.setupUI() self.setupUI()
self.resize(1280, 720)
self.plotcomparison() self.plotcomparison()
def setupUI(self): def setupUI(self):
@ -162,17 +163,12 @@ class ComparisonDialog(QDialog):
_toolbar.addWidget(_phases_combobox) _toolbar.addWidget(_phases_combobox)
_toolbar.addWidget(_hist_checkbox) _toolbar.addWidget(_hist_checkbox)
_buttonbox = QDialogButtonBox(QDialogButtonBox.Close)
_innerlayout.addWidget(self.canvas) _innerlayout.addWidget(self.canvas)
_innerlayout.addWidget(_buttonbox)
_outerlayout.addWidget(_toolbar) _outerlayout.addWidget(_toolbar)
_outerlayout.addLayout(_innerlayout) _outerlayout.addLayout(_innerlayout)
_buttonbox.rejected.connect(self.reject) # finally layout the entire widget
# finally layout the entire dialog
self.setLayout(_outerlayout) self.setLayout(_outerlayout)
@property @property