Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • software_public/passoft/sohstationviewer
1 result
Show changes
Showing
with 27 additions and 25 deletions
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
from typing import Tuple, Union, Dict, List from typing import Tuple, Union, Dict, List
from PySide2 import QtCore from PySide6 import QtCore
from sohstationviewer.model.data_type_model import DataTypeModel from sohstationviewer.model.data_type_model import DataTypeModel
......
from PySide2 import QtCore from PySide6 import QtCore
from sohstationviewer.conf import constants as const from sohstationviewer.conf import constants as const
from sohstationviewer.view.plotting.plotting_widget.plotting_processor_helper\ from sohstationviewer.view.plotting.plotting_widget.plotting_processor_helper\
......
...@@ -6,9 +6,9 @@ import numpy as np ...@@ -6,9 +6,9 @@ import numpy as np
import matplotlib.text import matplotlib.text
from matplotlib import pyplot as pl from matplotlib import pyplot as pl
from matplotlib.transforms import Bbox from matplotlib.transforms import Bbox
from PySide2.QtCore import QTimer, Qt from PySide6.QtCore import QTimer, Qt
from PySide2 import QtCore, QtWidgets from PySide6 import QtCore, QtWidgets
from PySide2.QtWidgets import QWidget, QApplication, QTextBrowser from PySide6.QtWidgets import QWidget, QApplication, QTextBrowser
from sohstationviewer.conf import constants from sohstationviewer.conf import constants
from sohstationviewer.view.util.color import set_color_mode from sohstationviewer.view.util.color import set_color_mode
......
...@@ -3,7 +3,7 @@ from math import sqrt ...@@ -3,7 +3,7 @@ from math import sqrt
from typing import List, Tuple, Union from typing import List, Tuple, Union
import numpy as np import numpy as np
from PySide2 import QtWidgets, QtCore from PySide6 import QtWidgets, QtCore
from sohstationviewer.conf import constants as const from sohstationviewer.conf import constants as const
from sohstationviewer.controller.plotting_data import ( from sohstationviewer.controller.plotting_data import (
......
from typing import Dict, Optional, List from typing import Dict, Optional, List
import numpy as np import numpy as np
from PySide2 import QtCore from PySide6 import QtCore
from sohstationviewer.view.plotting.time_power_squared_helper import \ from sohstationviewer.view.plotting.time_power_squared_helper import \
get_tps_for_discontinuous_data get_tps_for_discontinuous_data
......
# Drawing waveform and mass position # Drawing waveform and mass position
from typing import Tuple, Union, Dict from typing import Tuple, Union, Dict
from PySide2 import QtCore, QtWidgets from PySide6 import QtCore, QtWidgets
from sohstationviewer.model.data_type_model import DataTypeModel from sohstationviewer.model.data_type_model import DataTypeModel
......
from typing import List, Dict from typing import List, Dict
from PySide2 import QtCore from PySide6 import QtCore
from obspy import UTCDateTime from obspy import UTCDateTime
from obspy.core import Trace from obspy.core import Trace
......
...@@ -4,8 +4,8 @@ import os ...@@ -4,8 +4,8 @@ import os
from pathlib import Path from pathlib import Path
from typing import Union, Optional from typing import Union, Optional
from PySide2 import QtWidgets, QtCore, QtGui from PySide6 import QtWidgets, QtCore, QtGui
from PySide2.QtWidgets import QApplication, QWidget, QDialog from PySide6.QtWidgets import QApplication, QWidget, QDialog
from sohstationviewer.conf import constants from sohstationviewer.conf import constants
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
Credit: https://stackoverflow.com/questions/53353450/how-to-highlight-a-words-in-qtablewidget-from-a-searchlist # noqa Credit: https://stackoverflow.com/questions/53353450/how-to-highlight-a-words-in-qtablewidget-from-a-searchlist # noqa
""" """
from typing import List, Dict from typing import List, Dict
from PySide2 import QtCore, QtGui, QtWidgets from PySide6 import QtCore, QtGui, QtWidgets
from PySide2.QtGui import QPen, QTextCursor, QTextCharFormat, QColor from PySide6.QtGui import QPen, QTextCursor, QTextCharFormat, QColor
class HighlightDelegate(QtWidgets.QStyledItemDelegate): class HighlightDelegate(QtWidgets.QStyledItemDelegate):
......
...@@ -3,8 +3,8 @@ import os ...@@ -3,8 +3,8 @@ import os
from pathlib import PosixPath, Path from pathlib import PosixPath, Path
from typing import Dict, List, Tuple, Callable, Union, Optional from typing import Dict, List, Tuple, Callable, Union, Optional
from PySide2 import QtGui, QtCore, QtWidgets from PySide6 import QtGui, QtCore, QtWidgets
from PySide2.QtWidgets import QStyle from PySide6.QtWidgets import QStyle
from sohstationviewer.view.search_message.highlight_delegate import ( from sohstationviewer.view.search_message.highlight_delegate import (
HighlightDelegate) HighlightDelegate)
......
...@@ -2,7 +2,7 @@ import sys ...@@ -2,7 +2,7 @@ import sys
import platform import platform
import os import os
from PySide2 import QtWidgets, QtCore from PySide6 import QtWidgets, QtCore
from functools import partial from functools import partial
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
# #
# WARNING! All changes made in this file will be lost! # WARNING! All changes made in this file will be lost!
from PySide2 import QtCore, QtGui, QtWidgets from PySide6 import QtCore, QtGui, QtWidgets
class Ui_About(object): class Ui_About(object):
def setupUi(self, About): def setupUi(self, About):
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
# #
# WARNING! All changes made in this file will be lost! # WARNING! All changes made in this file will be lost!
from PySide2 import QtCore, QtWidgets from PySide6 import QtCore, QtWidgets
from sohstationviewer.view.calendar.calendar_widget import CalendarWidget from sohstationviewer.view.calendar.calendar_widget import CalendarWidget
......
...@@ -3,12 +3,14 @@ import configparser ...@@ -3,12 +3,14 @@ import configparser
from pathlib import Path from pathlib import Path
from typing import Union, List, Optional from typing import Union, List, Optional
from PySide2 import QtCore, QtGui, QtWidgets from PySide6 import QtCore, QtGui, QtWidgets
from PySide2.QtWidgets import ( from PySide6.QtWidgets import (
QMainWindow, QWidget, QTextBrowser, QPushButton, QLineEdit, QDateEdit, QMainWindow, QWidget, QTextBrowser, QPushButton, QLineEdit, QDateEdit,
QListWidget, QCheckBox, QRadioButton, QMenu, QAction, QLabel, QFrame, QListWidget, QCheckBox, QRadioButton, QMenu, QLabel, QFrame,
QVBoxLayout, QHBoxLayout, QGridLayout, QAbstractItemView, QShortcut, QVBoxLayout, QHBoxLayout, QGridLayout, QAbstractItemView, QButtonGroup,
QActionGroup, QButtonGroup, )
from PySide6.QtGui import (
QAction, QActionGroup, QShortcut
) )
from sohstationviewer.view.calendar.calendar_widget import CalendarWidget from sohstationviewer.view.calendar.calendar_widget import CalendarWidget
......
from __future__ import annotations from __future__ import annotations
from PySide2.QtGui import QCloseEvent from PySide6.QtGui import QCloseEvent
from PySide2.QtWidgets import QWidget from PySide6.QtWidgets import QWidget
class DialogAlreadyOpenedError(Exception): class DialogAlreadyOpenedError(Exception):
......