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

fix convenience import problems

Browse Source
This commit is contained in:
Sebastian Wehling-Benatelli 2014-11-06 15:05:56 +01:00
parent 7fd191dcc6
commit 013c948b33
3 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pylot/__init__.py
View File

@ -25,7 +25,3 @@ The development of PyLoT is part of the joint research project MAGS2.
GNU Lesser General Public License, Version 3 GNU Lesser General Public License, Version 3
(http://www.gnu.org/copyleft/lesser.html) (http://www.gnu.org/copyleft/lesser.html)
''' '''
from obspy.core.utcdatetime import UTCDateTime
from pylot.core.read import *
from pylot.core.util import *

5
pylot/core/util/__init__.py
View File

@ -2,5 +2,10 @@ from pylot.core.util.connection import checkurl
from pylot.core.util.defaults import FILTERDEFAULTS from pylot.core.util.defaults import FILTERDEFAULTS
from pylot.core.util.errors import OptionsError from pylot.core.util.errors import OptionsError
from pylot.core.util.utils import fnConstructor from pylot.core.util.utils import fnConstructor
from pylot.core.util.widgets import PickDlg
from pylot.core.util.widgets import HelpForm
from pylot.core.util.widgets import FilterOptionsDialog
from pylot.core.util.widgets import PropertiesDlg
from pylot.core.util.widgets import MPLWidget
from pylot.core.util.version import get_git_version as _getVersionString from pylot.core.util.version import get_git_version as _getVersionString

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

@ -14,11 +14,9 @@ from matplotlib.figure import Figure
from matplotlib.backends.backend_qt4agg import FigureCanvasQTAgg from matplotlib.backends.backend_qt4agg import FigureCanvasQTAgg
from PySide.QtGui import (QAction, from PySide.QtGui import (QAction,
QApplication, QApplication,
QCheckBox,
QComboBox, QComboBox,
QDialog, QDialog,
QDialogButtonBox, QDialogButtonBox,
QDockWidget,
QDoubleSpinBox, QDoubleSpinBox,
QGroupBox, QGroupBox,
QGridLayout, QGridLayout,
@ -30,7 +28,6 @@ from PySide.QtGui import (QAction,
QMessageBox, QMessageBox,
QSpinBox, QSpinBox,
QTabWidget, QTabWidget,
QTextBrowser,
QToolBar, QToolBar,
QVBoxLayout, QVBoxLayout,
QWidget) QWidget)
@ -38,7 +35,7 @@ from PySide.QtCore import (Qt,
QUrl, QUrl,
SIGNAL, SIGNAL,
SLOT) SLOT)
from pylot.core.util import OptionsError from PySide.QtWebKit import QWebView
from pylot.core.read import FilterOptions from pylot.core.read import FilterOptions
@ -217,7 +214,6 @@ class FilterOptionsDialog(QDialog):
self.updateUi) self.updateUi)
self.connect(self.selectTypeCombo, SIGNAL("currentIndexChanged(int)"), self.connect(self.selectTypeCombo, SIGNAL("currentIndexChanged(int)"),
self.updateUi) self.updateUi)
self.updateUi()
def updateUi(self): def updateUi(self):
if self.selectTypeCombo.currentText() not in ['bandpass', 'bandstop']: if self.selectTypeCombo.currentText() not in ['bandpass', 'bandstop']:
@ -248,7 +244,7 @@ class FilterOptionsDialog(QDialog):
return self.filterOptions return self.filterOptions
def getFilterOptions(self): def getFilterOptions(self):
return self.filterOptions return self.filterOptions
class LoadDataDlg(QDialog): class LoadDataDlg(QDialog):
@ -261,8 +257,7 @@ class LoadDataDlg(QDialog):
class HelpForm(QDialog): class HelpForm(QDialog):
def __init__(self, page='https://ariadne.geophysik.rub.de/trac/PyLoT/wiki', def __init__(self, page=QUrl(':/help.html'), parent=None):
parent=None):
super(HelpForm, self).__init__(parent) super(HelpForm, self).__init__(parent)
self.setAttribute(Qt.WA_DeleteOnClose) self.setAttribute(Qt.WA_DeleteOnClose)
self.setAttribute(Qt.WA_GroupLeader) self.setAttribute(Qt.WA_GroupLeader)
@ -277,24 +272,25 @@ class HelpForm(QDialog):
toolBar.addAction(backAction) toolBar.addAction(backAction)
toolBar.addAction(homeAction) toolBar.addAction(homeAction)
toolBar.addWidget(self.pageLabel) toolBar.addWidget(self.pageLabel)
self.textBrowser = QTextBrowser() self.webBrowser = QWebView()
self.webBrowser.setHtml(page)
layout = QVBoxLayout() layout = QVBoxLayout()
layout.addWidget(toolBar) layout.addWidget(toolBar)
layout.addWidget(self.textBrowser, 1) layout.addWidget(self.webBrowser, 1)
self.setLayout(layout) self.setLayout(layout)
self.connect(backAction, SIGNAL("triggered()"), self.connect(backAction, SIGNAL("triggered()"),
self.textBrowser, SLOT("backward()")) self.webBrowser, SLOT("backward()"))
self.connect(homeAction, SIGNAL("triggered()"), self.connect(homeAction, SIGNAL("triggered()"),
self.textBrowser, SLOT("home()")) self.webBrowser, SLOT("home()"))
self.connect(self.textBrowser, SIGNAL("sourceChanged(QUrl)"), self.connect(self.webBrowser, SIGNAL("sourceChanged(QUrl)"),
self.updatePageTitle) self.updatePageTitle)
self.textBrowser.setSearchPaths([":/help"]) self.webBrowser.setSearchPaths([":/help"])
self.textBrowser.setSource(QUrl(page)) self.webBrowser.setSource(QUrl(page))
self.resize(400, 600) self.resize(400, 600)
self.setWindowTitle("{0} Help".format(QApplication.applicationName())) self.setWindowTitle("{0} Help".format(QApplication.applicationName()))
def updatePageTitle(self): def updatePageTitle(self):
self.pageLabel.setText(self.textBrowser.documentTitle()) self.pageLabel.setText(self.webBrowser.documentTitle())