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 +2 -2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 79f3d40714 - Show all commits

2
pylot/core/util/array_map.py
View File

@ -42,7 +42,7 @@ class MplCanvas(FigureCanvas):
class Array_map(QtWidgets.QWidget): class Array_map(QtWidgets.QWidget):
def __init__(self, parent, metadata, parameter=None, axes=None, annotate=True, pointsize=25., def __init__(self, parent, metadata, parameter=None, axes=None, annotate=True, pointsize=25.,
linewidth=1.5, width=5e6, height=2e6): linewidth=1.5, width=5e6, height=2e6):
QtWidgets.QWidget.__init__(self) QtWidgets.QWidget.__init__(self, parent=parent)
assert (parameter is not None or parent is not None), 'either parent or parameter has to be set' assert (parameter is not None or parent is not None), 'either parent or parameter has to be set'
# set properties # set properties

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

@ -4606,7 +4606,7 @@ class PropertiesDlg(QDialog):
self._current_values.append(values) self._current_values.append(values)
def reset_current(self): def reset_current(self):
for values in self._current_values(): for values in self._current_values:
self.setValues(values) self.setValues(values)
@staticmethod @staticmethod