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

feature/port-to-py3 #11

Merged
marcel merged 59 commits from feature/port-to-py3 into develop 2022-03-21 15:30:06 +01:00
Conversation 0 Commits 59 Files Changed 45 +7 -7
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c254ee09b3 - Show all commits

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

@ -200,8 +200,8 @@ class ProgressBarWidget(QtWidgets.QWidget):
class AddMetadataWidget(QWidget): class AddMetadataWidget(QWidget):
def __init__(self, parent=None, metadata=None, windowflag=1): def __init__(self, parent=None, metadata=None, windowflag=Qt.Window):
super(AddMetadataWidget, self).__init__(parent, Qt.Window) super(AddMetadataWidget, self).__init__(parent, windowflag)
self.inventories_add = [] self.inventories_add = []
self.inventories_delete = [] self.inventories_delete = []
@ -401,7 +401,7 @@ class AddMetadataWidget(QWidget):
class ComparisonWidget(QWidget): class ComparisonWidget(QWidget):
def __init__(self, c, parent=None, windowflag=1): def __init__(self, c, parent=None, windowflag=Qt.Window):
self._data = c self._data = c
self._stats = c.stations self._stats = c.stations
self._canvas = PlotWidget(self) self._canvas = PlotWidget(self)
@ -3158,7 +3158,7 @@ class MultiEventWidget(QWidget):
''' '''
def __init__(self, options=None, parent=None, windowflag=1): def __init__(self, options=None, parent=None, windowflag=Qt.Window):
QtWidgets.QWidget.__init__(self, parent, windowflag) QtWidgets.QWidget.__init__(self, parent, windowflag)
self.options = options self.options = options
@ -3365,7 +3365,7 @@ class CompareEventsWidget(MultiEventWidget):
''' '''
def __init__(self, parent, options, eventdict, comparisons): def __init__(self, parent, options, eventdict, comparisons):
MultiEventWidget.__init__(self, options, parent, 1) MultiEventWidget.__init__(self, options, parent, Qt.Window)
self.eventdict = eventdict self.eventdict = eventdict
self.comparisons = comparisons self.comparisons = comparisons
self.compare_widget = QtWidgets.QWidget() self.compare_widget = QtWidgets.QWidget()
@ -3410,10 +3410,10 @@ class CompareEventsWidget(MultiEventWidget):
self.eventbox.clear() self.eventbox.clear()
self.fill_eventbox() self.fill_eventbox()
def update_comparison(self, index=0): def update_comparison(self):
self.compare_widget.setParent(None) self.compare_widget.setParent(None)
self.compare_widget = ComparisonWidget( self.compare_widget = ComparisonWidget(
self.comparisons[self.eventbox.currentText()], self, 0) self.comparisons[self.eventbox.currentText()], self, Qt.Widget)
self.event_layout.insertWidget(1, self.compare_widget) self.event_layout.insertWidget(1, self.compare_widget)
self.set_main_stretch() self.set_main_stretch()