diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-05-14 14:00:24 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-05-14 15:38:03 +0000 |
| commit | 5c55197f7bda409a390fa50e0887fef013c6b5bb (patch) | |
| tree | f2c27dd50977a96be9403af6a1a6dd8c783d37fd | |
| parent | 4459222fe52e753442ee09823193ab1e6aaa182a (diff) | |
Fix further f-string errors in examples
examples/multimedia/camera/camera.py", line 141
pattern = f"{picturesLocation}/pyside6_camera_{dateString}_{:03d}.jpg"
SyntaxError f-string: empty expression not allowed
examples/external/matplotlib/widget3d/widget3d.py", line 91
self.slider_azim_layout.addWidget(QLabel(f"{self.slider_azim.maximum()))
SyntaxError EOL while scanning string literal
Amends c5db9d63277201ee58829f7eb0656c534d04c249.
Change-Id: If6ca3deae03ecb39d58d1eea0ba1802c8b954b57
Reviewed-by: Christian Tismer <tismer@stackless.com>
(cherry picked from commit 4bc6eb21e032b9523424ea1316440b9d6ad7c8d7)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | examples/external/matplotlib/widget3d/widget3d.py | 14 | ||||
| -rw-r--r-- | examples/multimedia/camera/camera.py | 2 |
2 files changed, 9 insertions, 7 deletions
diff --git a/examples/external/matplotlib/widget3d/widget3d.py b/examples/external/matplotlib/widget3d/widget3d.py index 9000372ef..08c764bb9 100644 --- a/examples/external/matplotlib/widget3d/widget3d.py +++ b/examples/external/matplotlib/widget3d/widget3d.py @@ -82,18 +82,20 @@ class ApplicationWindow(QMainWindow): self.canvas = FigureCanvas(self.fig) # Sliders (Left) - self.slider_azim = QSlider(minimum=0, maximum=360, orientation=Qt.Horizontal) - self.slider_elev = QSlider(minimum=0, maximum=360, orientation=Qt.Horizontal) + min = 0 + max = 360 + self.slider_azim = QSlider(minimum=min, maximum=max, orientation=Qt.Horizontal) + self.slider_elev = QSlider(minimum=min, maximum=max, orientation=Qt.Horizontal) self.slider_azim_layout = QHBoxLayout() - self.slider_azim_layout.addWidget(QLabel(f"{self.slider_azim.minimum()}")) + self.slider_azim_layout.addWidget(QLabel(f"{min}")) self.slider_azim_layout.addWidget(self.slider_azim) - self.slider_azim_layout.addWidget(QLabel(f"{self.slider_azim.maximum())) + self.slider_azim_layout.addWidget(QLabel(f"{max}")) self.slider_elev_layout = QHBoxLayout() - self.slider_elev_layout.addWidget(QLabel(f"{self.slider_elev.minimum())) + self.slider_elev_layout.addWidget(QLabel(f"{min}")) self.slider_elev_layout.addWidget(self.slider_elev) - self.slider_elev_layout.addWidget(QLabel(f"{self.slider_elev.maximum())) + self.slider_elev_layout.addWidget(QLabel(f"{max}")) # Table (Right) self.table = QTableWidget() diff --git a/examples/multimedia/camera/camera.py b/examples/multimedia/camera/camera.py index 8ec3c869d..030840803 100644 --- a/examples/multimedia/camera/camera.py +++ b/examples/multimedia/camera/camera.py @@ -138,7 +138,7 @@ class MainWindow(QMainWindow): def nextImageFileName(self): picturesLocation = QStandardPaths.writableLocation(QStandardPaths.PicturesLocation) dateString = QDate.currentDate().toString("yyyyMMdd") - pattern = f"{picturesLocation}/pyside6_camera_{dateString}_{:03d}.jpg" + pattern = f"{picturesLocation}/pyside6_camera_{dateString}_{{:03d}}.jpg" n = 1 while True: result = pattern.format(n) |