Skip to content

Commit 2424565

Browse files
committed
ref: pep8
1 parent 9b2a7bd commit 2424565

32 files changed

Lines changed: 247 additions & 157 deletions

dcscope/gui/analysis/ana_filter.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@ def __init__(self, *args, **kwargs):
5959
self.ui.listWidget_polygon.itemSelectionChanged.connect(
6060
self.on_polygon_selection)
6161

62-
self.ui.comboBox_filters.currentIndexChanged.connect(self.update_content)
62+
self.ui.comboBox_filters.currentIndexChanged.connect(
63+
self.update_content)
6364
self.ui.toolButton_moreless.clicked.connect(self.on_moreless)
6465
self.ui.label_box_edit.setVisible(False)
6566
self._box_edit_view = False
@@ -141,7 +142,8 @@ def _populate_box_filters(self):
141142
"""
142143
feats, labs = self.get_features_labels()
143144

144-
self.ui.verticalLayout_box.setAlignment(QtCore.Qt.AlignmentFlag.AlignTop)
145+
self.ui.verticalLayout_box.setAlignment(
146+
QtCore.Qt.AlignmentFlag.AlignTop)
145147

146148
for lab, feat in sorted(zip(labs, feats)):
147149
integer = True if feat in idiom.INTEGER_FEATURES else False

dcscope/gui/analysis/ana_meta.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@ def update_content(self, slot_index=None, **kwargs):
4848
slot_index = min(slot_index, len(self.pipeline.slot_ids) - 1)
4949

5050
self.ui.comboBox_slots.clear()
51-
self.ui.comboBox_slots.addItems(self.pipeline.deduce_display_names())
51+
self.ui.comboBox_slots.addItems(
52+
self.pipeline.deduce_display_names())
5253
self.ui.comboBox_slots.setCurrentIndex(slot_index)
5354
self.ui.comboBox_slots.blockSignals(False)
5455
# populate content

dcscope/gui/analysis/ana_plot.py

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,9 @@ def __init__(self, *args, **kwargs):
3838
self.ui.comboBox_division.clear()
3939
self.ui.comboBox_division.addItem("Merge all plots", "merge")
4040
self.ui.comboBox_division.addItem("One plot per dataset", "each")
41-
self.ui.comboBox_division.addItem("Scatter plots and joint contour plot",
42-
"multiscatter+contour")
41+
self.ui.comboBox_division.addItem(
42+
"Scatter plots and joint contour plot",
43+
"multiscatter+contour")
4344
self.ui.comboBox_division.addItem("Only contour plots", "onlycontours")
4445
self.ui.comboBox_division.setCurrentIndex(2)
4546

@@ -53,10 +54,14 @@ def __init__(self, *args, **kwargs):
5354
self.on_hue_selected)
5455
self.ui.comboBox_marker_feature.currentIndexChanged.connect(
5556
self.on_hue_selected)
56-
self.ui.comboBox_axis_x.currentIndexChanged.connect(self.on_axis_changed)
57-
self.ui.comboBox_axis_y.currentIndexChanged.connect(self.on_axis_changed)
58-
self.ui.comboBox_scale_x.currentIndexChanged.connect(self.on_axis_changed)
59-
self.ui.comboBox_scale_y.currentIndexChanged.connect(self.on_axis_changed)
57+
self.ui.comboBox_axis_x.currentIndexChanged.connect(
58+
self.on_axis_changed)
59+
self.ui.comboBox_axis_y.currentIndexChanged.connect(
60+
self.on_axis_changed)
61+
self.ui.comboBox_scale_x.currentIndexChanged.connect(
62+
self.on_axis_changed)
63+
self.ui.comboBox_scale_y.currentIndexChanged.connect(
64+
self.on_axis_changed)
6065
self.ui.spinBox_column_count.valueChanged.connect(
6166
self.on_column_num_changed)
6267
self.ui.widget_range_x.range_changed.connect(self.on_range_changed)
@@ -166,7 +171,8 @@ def write_plot_state(self, state):
166171
self.ui.comboBox_axis_y.setCurrentIndex(
167172
self.ui.comboBox_axis_y.findData(gen["axis y"]))
168173
self.ui.checkBox_isoelastics.setChecked(gen["isoelastics"])
169-
lut_index = self.ui.comboBox_lut.findData(gen.get("lut", "LE-2D-FEM-19"))
174+
lut_index = self.ui.comboBox_lut.findData(
175+
gen.get("lut", "LE-2D-FEM-19"))
170176
self.ui.comboBox_lut.setCurrentIndex(lut_index)
171177
kde_index = self.ui.comboBox_kde.findData(gen["kde"])
172178
self.ui.comboBox_kde.setCurrentIndex(kde_index)
@@ -188,7 +194,8 @@ def write_plot_state(self, state):
188194
hue_index = self.ui.comboBox_marker_hue.findData(sca["marker hue"])
189195
self.ui.comboBox_marker_hue.setCurrentIndex(hue_index)
190196
self.ui.doubleSpinBox_marker_size.setValue(sca["marker size"])
191-
feat_index = self.ui.comboBox_marker_feature.findData(sca["hue feature"])
197+
feat_index = self.ui.comboBox_marker_feature.findData(
198+
sca["hue feature"])
192199
feat_index = feat_index or 0
193200
self.ui.comboBox_marker_feature.setCurrentIndex(feat_index)
194201
color_index = COLORMAPS.index(sca["colormap"])
@@ -301,10 +308,11 @@ def _set_range_xy_state(self, axis_x=None, range_x=None,
301308

302309
plot_id = self.current_plot.identifier
303310

304-
for axis, rang, rc in zip([axis_x, axis_y],
305-
[range_x, range_y],
306-
[self.ui.widget_range_x, self.ui.widget_range_y],
307-
):
311+
for axis, rang, rc in zip(
312+
[axis_x, axis_y],
313+
[range_x, range_y],
314+
[self.ui.widget_range_x, self.ui.widget_range_y],
315+
):
308316
if axis is not None:
309317
lim = self.pipeline.get_min_max_coarse(
310318
feat=axis,
@@ -535,7 +543,7 @@ def on_pp_mod_recv(self, data):
535543
"active": True,
536544
"start": state["general"][nm][0],
537545
"end": state["general"][nm][1],
538-
})
546+
})
539547
rc.blockSignals(False)
540548

541549
@QtCore.pyqtSlot()

dcscope/gui/analysis/ana_slot.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,8 @@ def write_pipeline_state(self, state):
146146

147147
self.ui.comboBox_visc_model.setCurrentIndex(idx_vm)
148148
# Set current state of the emodulus lut
149-
idx_lut = self.ui.comboBox_lut.findData(emodulus.get("emodulus lut", ""))
149+
idx_lut = self.ui.comboBox_lut.findData(
150+
emodulus.get("emodulus lut", ""))
150151
self.ui.comboBox_lut.setCurrentIndex(idx_lut)
151152
# This has to be done after setting the scenario
152153
# (otherwise it might be overridden in the frontend)

dcscope/gui/analysis/ana_tables.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,8 @@ def on_select_table(self, table_index):
134134
for graph in names:
135135
if graph in list(self._selected_graphs):
136136
graph_index = names.index(graph)
137-
item = self.ui.listWidget_table_graphs.item(graph_index)
137+
item = self.ui.listWidget_table_graphs.item(
138+
graph_index)
138139
if item:
139140
item.setSelected(True)
140141
self.ui.listWidget_table_graphs.blockSignals(False)

dcscope/gui/bulk/bulk_emodulus.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,12 @@ def __init__(self, parent, pipeline, *args, **kwargs):
5757

5858
self.ui.comboBox_visc_model.clear()
5959
self.ui.comboBox_visc_model.addItem("buyukurganci-2022",
60-
"buyukurganci-2022")
60+
"buyukurganci-2022")
6161
self.ui.comboBox_visc_model.addItem("herold-2017", "herold-2017")
6262
self.ui.comboBox_visc_model.setCurrentIndex(
6363
self.ui.comboBox_visc_model.findData("buyukurganci-2022"))
64-
self.ui.comboBox_visc_model.currentIndexChanged.connect(self.on_cb_medium)
64+
self.ui.comboBox_visc_model.currentIndexChanged.connect(
65+
self.on_cb_medium)
6566

6667
self.ui.comboBox_lut.clear()
6768
lut_dict = dclab.features.emodulus.load.get_internal_lut_names_dict()
@@ -106,7 +107,8 @@ def on_cb_temp(self):
106107
"""User changed temperature"""
107108
temp = self.ui.comboBox_temp.currentData()
108109

109-
if not self.ui.comboBox_temp.isEnabled() or temp in ["feature", "config"]:
110+
if (not self.ui.comboBox_temp.isEnabled()
111+
or temp in ["feature", "config"]):
110112
self.ui.doubleSpinBox_temp.setEnabled(False)
111113
self.ui.doubleSpinBox_temp.setValue(np.nan)
112114
else:
@@ -175,7 +177,8 @@ def update_viscosity(self):
175177
"""Update viscosity shown"""
176178
temp = self.ui.comboBox_temp.currentData()
177179

178-
if not self.ui.comboBox_temp.isEnabled() or temp in ["feature", "config"]:
180+
if (not self.ui.comboBox_temp.isEnabled()
181+
or temp in ["feature", "config"]):
179182
self.ui.doubleSpinBox_visc.setValue(np.nan)
180183
self.ui.doubleSpinBox_visc.setToolTip("unique values per dataset")
181184
else:

dcscope/gui/compute/comp_lme4_results.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ def __init__(self, parent, rlme4_results, *args, **kwargs):
1818

1919
# parameters
2020
self.ui.label_model.setText(res["model"])
21-
self.ui.label_feature.setText(dclab.dfn.get_feature_label(res["feature"]))
21+
self.ui.label_feature.setText(
22+
dclab.dfn.get_feature_label(res["feature"]))
2223
if res["is differential"]:
2324
self.ui.label_differential.setText("Yes")
2425
else:

dcscope/gui/export/e2data.py

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -67,24 +67,28 @@ def __init__(self, parent, pipeline, *args, **kwargs):
6767
self.ui.comboBox_format.addItem("MOV", "mov")
6868

6969
self.ui.comboBox_codec.clear()
70-
self.ui.comboBox_codec.addItem("H264 (high quality, fast export)",
71-
{"pixel_format": "yuv420p",
72-
"codec": "libx264",
73-
"codec_options": {'preset': 'ultrafast',
74-
'crf': '0'}})
75-
self.ui.comboBox_codec.addItem("H264 (high quality, small file size)",
76-
{"pixel_format": "yuv420p",
77-
"codec": "libx264",
78-
"codec_options": {'preset': 'slow',
79-
'crf': '0'}})
80-
self.ui.comboBox_codec.addItem("H264 (lossy compression)",
81-
{"pixel_format": "yuv420p",
82-
"codec": "libx264",
83-
"codec_options": {'preset': 'slow',
84-
'crf': '7'}})
85-
self.ui.comboBox_codec.addItem("RAW (huge files)",
86-
{"pixel_format": "yuv420p",
87-
"codec": "rawvideo"})
70+
self.ui.comboBox_codec.addItem(
71+
"H264 (high quality, fast export)",
72+
{"pixel_format": "yuv420p",
73+
"codec": "libx264",
74+
"codec_options": {'preset': 'ultrafast',
75+
'crf': '0'}})
76+
self.ui.comboBox_codec.addItem(
77+
"H264 (high quality, small file size)",
78+
{"pixel_format": "yuv420p",
79+
"codec": "libx264",
80+
"codec_options": {'preset': 'slow',
81+
'crf': '0'}})
82+
self.ui.comboBox_codec.addItem(
83+
"H264 (lossy compression)",
84+
{"pixel_format": "yuv420p",
85+
"codec": "libx264",
86+
"codec_options": {'preset': 'slow',
87+
'crf': '7'}})
88+
self.ui.comboBox_codec.addItem(
89+
"RAW (huge files)",
90+
{"pixel_format": "yuv420p",
91+
"codec": "rawvideo"})
8892

8993
@property
9094
def file_format(self):

dcscope/gui/export/e2filter.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import pathlib
22

3-
from PyQt6 import uic, QtWidgets
3+
from PyQt6 import QtWidgets
44

55
import dclab
66

dcscope/gui/main.py

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import scipy
1616
from dclab import cached
1717
from dclab.lme4 import rsetup
18-
from PyQt6 import QtCore, QtGui, QtWidgets, uic
18+
from PyQt6 import QtCore, QtGui, QtWidgets
1919
from PyQt6.QtCore import QStandardPaths
2020
from PyQt6.QtWidgets import QMessageBox
2121

@@ -189,7 +189,8 @@ def __init__(self, *arguments):
189189
# plot
190190
self.ui.actionExportPlot.triggered.connect(self.on_action_export_plot)
191191
# Import menu
192-
self.ui.actionImportFilter.triggered.connect(self.on_action_import_filter)
192+
self.ui.actionImportFilter.triggered.connect(
193+
self.on_action_import_filter)
193194
# Help menu
194195
self.ui.actionDocumentation.triggered.connect(self.on_action_docs)
195196
self.ui.actionSoftware.triggered.connect(self.on_action_software)
@@ -203,7 +204,8 @@ def __init__(self, *arguments):
203204
self.init_analysis_view()
204205
self.ui.mdiArea.cascadeSubWindows()
205206

206-
self.ui.toolButton_quick_view.toggled.connect(self.on_quick_view_toggled)
207+
self.ui.toolButton_quick_view.toggled.connect(
208+
self.on_quick_view_toggled)
207209

208210
# BLOCK MATRIX (wraps DataMatrix and PlotMatrix)
209211
# BlockMatrix appearance
@@ -223,7 +225,8 @@ def __init__(self, *arguments):
223225
self.ui.block_matrix.ui.toolButton_new_plot.setEnabled(False)
224226
# BlockMatrix other signals
225227
self.ui.block_matrix.slot_modify_clicked.connect(self.on_modify_slot)
226-
self.ui.block_matrix.filter_modify_clicked.connect(self.on_modify_filter)
228+
self.ui.block_matrix.filter_modify_clicked.connect(
229+
self.on_modify_filter)
227230
self.ui.block_matrix.plot_modify_clicked.connect(self.on_modify_plot)
228231

229232
# QUICK VIEW
@@ -233,9 +236,9 @@ def __init__(self, *arguments):
233236

234237
# ANALYSIS VIEW
235238
# polygon filter creation
236-
self.widget_ana_view.ui.widget_filter.request_new_polygon_filter.connect(
239+
self.widget_ana_view.ui.widget_filter.request_new_polygon_filter.connect( # noqa: E501
237240
self.on_new_polygon_filter)
238-
self.widget_ana_view.ui.widget_filter.request_edit_polygon_filter.connect(
241+
self.widget_ana_view.ui.widget_filter.request_edit_polygon_filter.connect( # noqa: E501
239242
self.on_edit_polygon_filter)
240243

241244
# Top of the pipeline modification hierarchy

0 commit comments

Comments
 (0)