From 1cc13d4b0fec2e54cddd427585c99b50af089004 Mon Sep 17 00:00:00 2001 From: Sebastian Heimann Date: Thu, 23 Mar 2023 16:58:58 +0100 Subject: [PATCH] fix imports and update for newer qt versions to get talpa operational again --- kite/sources/__init__.py | 12 +++++++++++- kite/talpa/config.py | 2 +- kite/talpa/multiplot.py | 2 +- kite/talpa/sources/base.py | 2 +- kite/talpa/sources/pyrocko.py | 4 ++-- kite/talpa/sources_dock.py | 2 +- 6 files changed, 17 insertions(+), 7 deletions(-) diff --git a/kite/sources/__init__.py b/kite/sources/__init__.py index 24f53fd..10a2238 100644 --- a/kite/sources/__init__.py +++ b/kite/sources/__init__.py @@ -4,12 +4,22 @@ PointCompoundSource, ) from .okada import DislocProcessor, OkadaSource -from .pyrocko_gf import PyrockoMomentTensor, PyrockoProcessor, PyrockoRectangularSource +from .pyrocko_gf import ( + PyrockoDoubleCouple, + PyrockoMomentTensor, + PyrockoProcessor, + PyrockoRectangularSource, + PyrockoRingfaultSource, + PyrockoVLVDSource, +) __sources__ = [ OkadaSource, PyrockoMomentTensor, PyrockoRectangularSource, + PyrockoRingfaultSource, + PyrockoDoubleCouple, + PyrockoVLVDSource, EllipsoidSource, PointCompoundSource, ] diff --git a/kite/talpa/config.py b/kite/talpa/config.py index ed22803..41abc8e 100644 --- a/kite/talpa/config.py +++ b/kite/talpa/config.py @@ -104,7 +104,7 @@ def __init__(self, *args, **kwargs): QtWidgets.QDialog.__init__(self, *args, **kwargs) self.completer = QtWidgets.QCompleter() - self.completer_model = QtWidgets.QFileSystemModel(self.completer) + self.completer_model = QtGui.QFileSystemModel(self.completer) self.completer.setModel(self.completer_model) self.completer.setMaxVisibleItems(8) diff --git a/kite/talpa/multiplot.py b/kite/talpa/multiplot.py index 4b84af7..dba7c75 100644 --- a/kite/talpa/multiplot.py +++ b/kite/talpa/multiplot.py @@ -47,7 +47,7 @@ def updateViews(self): visible_plots = [plt for ip, plt in enumerate(self.plots) if config_mask[ip]] for ip, plt in enumerate(visible_plots): - row = ip / 2 + row = ip // 2 col = ip % 2 + 1 self.addItem(plt, row=row, col=col) diff --git a/kite/talpa/sources/base.py b/kite/talpa/sources/base.py index ffa5be4..978f21d 100644 --- a/kite/talpa/sources/base.py +++ b/kite/talpa/sources/base.py @@ -272,7 +272,7 @@ def __init__(self, delegate, ui_file, *args, **kwargs): @QtCore.pyqtSlot() def getSourceParameters(self): for param, value in self.delegate.getSourceParameters().items(): - self.__getattribute__(param).setValue(value) + self.__getattribute__(param).setValue(int(value)) @QtCore.pyqtSlot() def setSourceParameters(self): diff --git a/kite/talpa/sources/pyrocko.py b/kite/talpa/sources/pyrocko.py index ed12db8..ea502a4 100644 --- a/kite/talpa/sources/pyrocko.py +++ b/kite/talpa/sources/pyrocko.py @@ -1,7 +1,7 @@ import os import numpy as np -from PyQt5 import QtCore, QtGui +from PyQt5 import QtCore, QtGui, QtWidgets from kite.sources import ( PyrockoDoubleCouple, @@ -22,7 +22,7 @@ class PyrockoSourceDialog(SourceEditDialog): def __init__(self, delegate, ui_file, *args, **kwargs): SourceEditDialog.__init__(self, delegate, ui_file, *args, **kwargs) - self.completer = QtGui.QCompleter() + self.completer = QtWidgets.QCompleter() self.completer_model = QtGui.QFileSystemModel(self.completer) self.completer.setModel(self.completer_model) self.completer.setMaxVisibleItems(8) diff --git a/kite/talpa/sources_dock.py b/kite/talpa/sources_dock.py index 27e76fc..82ff8db 100644 --- a/kite/talpa/sources_dock.py +++ b/kite/talpa/sources_dock.py @@ -133,7 +133,7 @@ def sizeHint(self, option, index): doc.setHtml(options.text) doc.setTextWidth(options.rect.width()) - return QtCore.QSize(doc.idealWidth(), doc.size().height()) + return QtCore.QSize(int(doc.idealWidth()), int(doc.size().height())) class SourceContextMenu(QtWidgets.QMenu): def __init__(self, parent, idx, *args, **kwargs):