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

usage of DATASTRUCTURE modified

Browse Source
This commit is contained in:
Sebastian Wehling-Benatelli 2015-02-13 11:12:47 +01:00
parent b07f1b5b78
commit 903e87e1e1
3 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
QtPyLoT.py
View File

@ -44,6 +44,7 @@ from pylot.core.util import (FilterOptionsDialog,
MPLWidget, MPLWidget,
PropertiesDlg, PropertiesDlg,
HelpForm) HelpForm)
from pylot.core.util.structure import DATASTRUCTURE
# Version information # Version information
@ -64,7 +65,8 @@ class MainWindow(QMainWindow):
settings.setValue("user/Login", os.getlogin()) settings.setValue("user/Login", os.getlogin())
settings.sync() settings.sync()
self.recentEvents = settings.value("data/recentEvents", []) self.recentEvents = settings.value("data/recentEvents", [])
self.dataStructure = settings.value("data/structure", None) self.dataStructure = DATASTRUCTURE[
settings.value("data/Structure", None)]()
self.setWindowTitle("PyLoT - do seismic processing the python way") self.setWindowTitle("PyLoT - do seismic processing the python way")
self.setWindowIcon(QIcon(":/icon.ico")) self.setWindowIcon(QIcon(":/icon.ico"))
self.seismicPhase = str(settings.value("phase", "P")) self.seismicPhase = str(settings.value("phase", "P"))

3
pylot/core/util/structure.py
View File

@ -8,4 +8,5 @@ Created on Wed Jan 26 17:47:25 2015
from pylot.core.read import SeiscompDataStructure, PilotDataStructure from pylot.core.read import SeiscompDataStructure, PilotDataStructure
DATASTRUCTURE = {'PILOT':PilotDataStructure, 'SeisComP':SeiscompDataStructure} DATASTRUCTURE = {'PILOT':PilotDataStructure, 'SeisComP':SeiscompDataStructure,
None:None}

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

@ -162,15 +162,15 @@ class InputsTab(PropTab):
from pylot.core.util.structure import DATASTRUCTURE from pylot.core.util.structure import DATASTRUCTURE
datastruct = DATASTRUCTURE.keys() self.structureSelect.addItems(DATASTRUCTURE.keys())
self.structureSelect.addItems(datastruct)
self.updateWidget(DATASTRUCTURE)
layout = QGridLayout() layout = QGridLayout()
layout.addWidget(dataDirLabel, 0, 0) layout.addWidget(dataDirLabel, 0, 0)
layout.addWidget(self.dataDirEdit, 0, 1) layout.addWidget(self.dataDirEdit, 0, 1)
layout.addWidget(fullNameLabel, 1, 0) layout.addWidget(fullNameLabel, 1, 0)
layout.addWidget(self.fullNameEdit, 1, 1) layout.addWidget(self.fullNameEdit, 1, 1)
layout.addWidget(structureLabel, 2, 0)
layout.addWidget(self.structureSelect, 2, 1)
self.setLayout(layout) self.setLayout(layout)
@ -178,15 +178,9 @@ class InputsTab(PropTab):
values = {} values = {}
values["data/dataRoot"] = self.dataDirEdit.text() values["data/dataRoot"] = self.dataDirEdit.text()
values["user/FullName"] = self.fullNameEdit.text() values["user/FullName"] = self.fullNameEdit.text()
values["data/Structure"] = self.structureSelect.currentText()
return values return values
def updateWidget(self, structure):
key = self.structureSelect.currentText()
structure = structure[key]
structure().getFields().keys()
class OutputsTab(PropTab): class OutputsTab(PropTab):
@ -351,7 +345,7 @@ class FilterOptionsDialog(QDialog):
self.buttonBox = QDialogButtonBox(QDialogButtonBox.Ok| self.buttonBox = QDialogButtonBox(QDialogButtonBox.Ok|
QDialogButtonBox.Cancel) QDialogButtonBox.Cancel)
grid = QGridLayout() grid = QGridLayout()
grid.addWidget(self.freqGroupBox, 0, 2, 1, 2) grid.addWidget(self.freqGroupBox, 0, 2, 1, 2)
grid.addLayout(self.selectTypeLayout, 1, 2, 1, 2) grid.addLayout(self.selectTypeLayout, 1, 2, 1, 2)
@ -392,7 +386,7 @@ class FilterOptionsDialog(QDialog):
freq.append(self.freqmaxSpinBox.value()) freq.append(self.freqmaxSpinBox.value())
self.filterOptions.freq = freq self.filterOptions.freq = freq
self.filterOptions.order = self.orderSpinBox.value() self.filterOptions.order = self.orderSpinBox.value()
def getFilterOptions(self): def getFilterOptions(self):
return self.filterOptions return self.filterOptions