vsview-nativeres 0.3.2__tar.gz → 0.3.3__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {vsview_nativeres-0.3.2 → vsview_nativeres-0.3.3}/PKG-INFO +1 -1
- {vsview_nativeres-0.3.2 → vsview_nativeres-0.3.3}/src/vsview_nativeres/components.py +20 -1
- {vsview_nativeres-0.3.2 → vsview_nativeres-0.3.3}/src/vsview_nativeres/main.py +108 -47
- {vsview_nativeres-0.3.2 → vsview_nativeres-0.3.3}/src/vsview_nativeres/settings.py +4 -2
- {vsview_nativeres-0.3.2 → vsview_nativeres-0.3.3}/.gitignore +0 -0
- {vsview_nativeres-0.3.2 → vsview_nativeres-0.3.3}/LICENSE +0 -0
- {vsview_nativeres-0.3.2 → vsview_nativeres-0.3.3}/README.md +0 -0
- {vsview_nativeres-0.3.2 → vsview_nativeres-0.3.3}/pyproject.toml +0 -0
- {vsview_nativeres-0.3.2 → vsview_nativeres-0.3.3}/src/vsview_nativeres/__init__.py +0 -0
- {vsview_nativeres-0.3.2 → vsview_nativeres-0.3.3}/src/vsview_nativeres/plotting.py +0 -0
- {vsview_nativeres-0.3.2 → vsview_nativeres-0.3.3}/src/vsview_nativeres/py.typed +0 -0
- {vsview_nativeres-0.3.2 → vsview_nativeres-0.3.3}/src/vsview_nativeres/utils.py +0 -0
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: vsview-nativeres
|
|
3
|
-
Version: 0.3.
|
|
3
|
+
Version: 0.3.3
|
|
4
4
|
Summary: A vsview plugin for analyzing and determining the native resolution of video content
|
|
5
5
|
Project-URL: Documentation, https://github.com/Jaded-Encoding-Thaumaturgy/nativeres/blob/master/src/plugin/README.md
|
|
6
6
|
Project-URL: Source Code, https://github.com/Jaded-Encoding-Thaumaturgy/nativeres/tree/master/src/plugin
|
|
@@ -1,6 +1,17 @@
|
|
|
1
|
+
from jetpytools import CustomNotImplementedError
|
|
1
2
|
from PySide6.QtCore import QSize
|
|
2
3
|
from PySide6.QtGui import Qt
|
|
3
|
-
from PySide6.QtWidgets import
|
|
4
|
+
from PySide6.QtWidgets import (
|
|
5
|
+
QLabel,
|
|
6
|
+
QLayout,
|
|
7
|
+
QListWidget,
|
|
8
|
+
QProgressBar,
|
|
9
|
+
QScrollArea,
|
|
10
|
+
QSpinBox,
|
|
11
|
+
QStackedWidget,
|
|
12
|
+
QVBoxLayout,
|
|
13
|
+
QWidget,
|
|
14
|
+
)
|
|
4
15
|
from vsview.api import run_in_loop
|
|
5
16
|
|
|
6
17
|
|
|
@@ -78,3 +89,11 @@ class ProgressBar(QProgressBar):
|
|
|
78
89
|
def reset_progress(self) -> None:
|
|
79
90
|
self.reset()
|
|
80
91
|
self.setFormat("%p%")
|
|
92
|
+
|
|
93
|
+
|
|
94
|
+
class RangeSpinStack(QStackedWidget):
|
|
95
|
+
@property
|
|
96
|
+
def current(self) -> QSpinBox:
|
|
97
|
+
if isinstance(w := self.currentWidget(), QSpinBox):
|
|
98
|
+
return w
|
|
99
|
+
raise CustomNotImplementedError
|
|
@@ -59,7 +59,7 @@ from nativeres.funcs import (
|
|
|
59
59
|
resolve_kernel,
|
|
60
60
|
)
|
|
61
61
|
|
|
62
|
-
from .components import GetNativeImportList, ProgressBar, TabContainer
|
|
62
|
+
from .components import GetNativeImportList, ProgressBar, RangeSpinStack, TabContainer
|
|
63
63
|
from .settings import GlobalSettings, LocalSettings
|
|
64
64
|
from .utils import get_edge_detect_classes, warmup_plots
|
|
65
65
|
|
|
@@ -122,14 +122,35 @@ class GetNativeTab(TabContainer, IconReloadMixin):
|
|
|
122
122
|
|
|
123
123
|
controls.addLayout(dimension_base_parity, 1)
|
|
124
124
|
|
|
125
|
-
self.
|
|
126
|
-
self.
|
|
127
|
-
self.
|
|
128
|
-
self.
|
|
129
|
-
self.
|
|
130
|
-
self.
|
|
125
|
+
self.range_min_stack = RangeSpinStack(self.controls_section)
|
|
126
|
+
self.range_max_stack = RangeSpinStack(self.controls_section)
|
|
127
|
+
self.range_min_spin_h = QSpinBox(self.controls_section, suffix=" px", minimum=0, maximum=99999, singleStep=1)
|
|
128
|
+
self.range_max_spin_h = QSpinBox(self.controls_section, suffix=" px", minimum=0, maximum=99999, singleStep=1)
|
|
129
|
+
self.range_min_spin_w = QSpinBox(self.controls_section, suffix=" px", minimum=0, maximum=99999, singleStep=1)
|
|
130
|
+
self.range_max_spin_w = QSpinBox(self.controls_section, suffix=" px", minimum=0, maximum=99999, singleStep=1)
|
|
131
|
+
self.range_min_spin_h.setToolTip("Lowest candidate dimension to test.")
|
|
132
|
+
self.range_max_spin_h.setToolTip("Highest candidate dimension to test.")
|
|
133
|
+
self.range_min_spin_w.setToolTip("Lowest candidate dimension to test.")
|
|
134
|
+
self.range_max_spin_w.setToolTip("Highest candidate dimension to test.")
|
|
135
|
+
self.range_min_spin_h.valueChanged.connect(self.on_range_min_h_changed)
|
|
136
|
+
self.range_max_spin_h.valueChanged.connect(self.on_range_max_h_changed)
|
|
137
|
+
self.range_min_spin_w.valueChanged.connect(self.on_range_min_w_changed)
|
|
138
|
+
self.range_max_spin_w.valueChanged.connect(self.on_range_max_w_changed)
|
|
139
|
+
|
|
140
|
+
self.range_min_stack.addWidget(self.range_min_spin_h)
|
|
141
|
+
self.range_min_stack.addWidget(self.range_min_spin_w)
|
|
142
|
+
self.range_min_stack.setCurrentWidget(self.range_min_spin_h)
|
|
143
|
+
|
|
144
|
+
self.range_max_stack.addWidget(self.range_max_spin_h)
|
|
145
|
+
self.range_max_stack.addWidget(self.range_max_spin_w)
|
|
146
|
+
self.range_max_stack.setCurrentWidget(self.range_max_spin_h)
|
|
147
|
+
|
|
131
148
|
range_layout = self.make_vgroup(
|
|
132
|
-
"Range",
|
|
149
|
+
"Range",
|
|
150
|
+
self.range_min_stack,
|
|
151
|
+
self.range_max_stack,
|
|
152
|
+
parent=self.controls_section,
|
|
153
|
+
stretch=False,
|
|
133
154
|
)
|
|
134
155
|
|
|
135
156
|
self.step_spin = QDoubleSpinBox(
|
|
@@ -163,7 +184,7 @@ class GetNativeTab(TabContainer, IconReloadMixin):
|
|
|
163
184
|
|
|
164
185
|
self.kernels_metrics_layout = QVBoxLayout()
|
|
165
186
|
self.kernels_metrics_layout.addLayout(kernels_layout)
|
|
166
|
-
self.kernels_metrics_layout.addSpacing(self.
|
|
187
|
+
self.kernels_metrics_layout.addSpacing(self.range_max_stack.height() + 4)
|
|
167
188
|
self.kernels_metrics_layout.addLayout(metrics_layout)
|
|
168
189
|
self.kernels_metrics_layout.addStretch()
|
|
169
190
|
|
|
@@ -237,14 +258,22 @@ class GetNativeTab(TabContainer, IconReloadMixin):
|
|
|
237
258
|
self._last_dimension = 1
|
|
238
259
|
self._last_base_parity = 1
|
|
239
260
|
with (
|
|
240
|
-
QSignalBlocker(self.
|
|
241
|
-
QSignalBlocker(self.
|
|
261
|
+
QSignalBlocker(self.range_min_stack),
|
|
262
|
+
QSignalBlocker(self.range_max_stack),
|
|
263
|
+
QSignalBlocker(self.range_min_spin_h),
|
|
264
|
+
QSignalBlocker(self.range_max_spin_h),
|
|
265
|
+
QSignalBlocker(self.range_min_spin_w),
|
|
266
|
+
QSignalBlocker(self.range_max_spin_w),
|
|
242
267
|
QSignalBlocker(self.step_spin),
|
|
243
268
|
QSignalBlocker(self.kernels_cb),
|
|
244
269
|
QSignalBlocker(self.metrics_cb),
|
|
245
270
|
):
|
|
246
|
-
self.
|
|
247
|
-
self.
|
|
271
|
+
self.range_min_stack.setCurrentWidget(self.range_min_spin_h)
|
|
272
|
+
self.range_max_stack.setCurrentWidget(self.range_max_spin_h)
|
|
273
|
+
self.range_min_spin_h.setValue(int(self.api.current_voutput.vs_output.clip.height * LOW_RATE))
|
|
274
|
+
self.range_max_spin_h.setValue(int(self.api.current_voutput.vs_output.clip.height * HIGH_RATE))
|
|
275
|
+
self.range_min_spin_w.setValue(int(self.api.current_voutput.vs_output.clip.width * LOW_RATE))
|
|
276
|
+
self.range_max_spin_w.setValue(int(self.api.current_voutput.vs_output.clip.width * HIGH_RATE))
|
|
248
277
|
self.step_spin.setValue(fallback(self.settings.local_.getnative.last_step, 1.0))
|
|
249
278
|
for k in self.settings.global_.kernels:
|
|
250
279
|
self.kernels_cb.addItem(k.pretty_string, k)
|
|
@@ -256,8 +285,10 @@ class GetNativeTab(TabContainer, IconReloadMixin):
|
|
|
256
285
|
def _set_saved_values(self) -> None:
|
|
257
286
|
with (
|
|
258
287
|
QSignalBlocker(self.dimension),
|
|
259
|
-
QSignalBlocker(self.
|
|
260
|
-
QSignalBlocker(self.
|
|
288
|
+
QSignalBlocker(self.range_min_spin_h),
|
|
289
|
+
QSignalBlocker(self.range_max_spin_h),
|
|
290
|
+
QSignalBlocker(self.range_min_spin_w),
|
|
291
|
+
QSignalBlocker(self.range_max_spin_w),
|
|
261
292
|
QSignalBlocker(self.step_spin),
|
|
262
293
|
QSignalBlocker(self.kernels_cb),
|
|
263
294
|
QSignalBlocker(self.metrics_cb),
|
|
@@ -268,11 +299,15 @@ class GetNativeTab(TabContainer, IconReloadMixin):
|
|
|
268
299
|
if (d := self.settings.local_.getnative.last_base_parity) is not None:
|
|
269
300
|
self.base_parity.index = d
|
|
270
301
|
|
|
271
|
-
if (range_min := self.settings.local_.getnative.
|
|
272
|
-
self.
|
|
302
|
+
if (range_min := self.settings.local_.getnative.last_min_h_range) is not None:
|
|
303
|
+
self.range_min_spin_h.setValue(range_min)
|
|
304
|
+
if (range_max := self.settings.local_.getnative.last_max_h_range) is not None:
|
|
305
|
+
self.range_max_spin_h.setValue(range_max)
|
|
273
306
|
|
|
274
|
-
if (
|
|
275
|
-
self.
|
|
307
|
+
if (range_min := self.settings.local_.getnative.last_min_w_range) is not None:
|
|
308
|
+
self.range_min_spin_w.setValue(range_min)
|
|
309
|
+
if (range_max := self.settings.local_.getnative.last_max_w_range) is not None:
|
|
310
|
+
self.range_max_spin_w.setValue(range_max)
|
|
276
311
|
|
|
277
312
|
if (step := self.settings.local_.getnative.last_step) is not None:
|
|
278
313
|
self.step_spin.setValue(step)
|
|
@@ -288,8 +323,10 @@ class GetNativeTab(TabContainer, IconReloadMixin):
|
|
|
288
323
|
def snapshot_ui_values(self) -> None:
|
|
289
324
|
self.settings.local_.getnative.last_dimension = self.dimension.index
|
|
290
325
|
self.settings.local_.getnative.last_base_parity = self.base_parity.index
|
|
291
|
-
self.settings.local_.getnative.
|
|
292
|
-
self.settings.local_.getnative.
|
|
326
|
+
self.settings.local_.getnative.last_max_h_range = self.range_max_spin_h.value()
|
|
327
|
+
self.settings.local_.getnative.last_min_h_range = self.range_min_spin_h.value()
|
|
328
|
+
self.settings.local_.getnative.last_max_w_range = self.range_max_spin_w.value()
|
|
329
|
+
self.settings.local_.getnative.last_min_w_range = self.range_min_spin_w.value()
|
|
293
330
|
self.settings.local_.getnative.last_step = self.step_spin.value()
|
|
294
331
|
self.settings.local_.getnative.last_kernel = resolve_kernel(self.kernels_cb.currentText())
|
|
295
332
|
self.settings.local_.getnative.last_metric = self.metrics_cb.currentText()
|
|
@@ -314,48 +351,72 @@ class GetNativeTab(TabContainer, IconReloadMixin):
|
|
|
314
351
|
return clip.height if self.dimension.index == 1 else clip.width
|
|
315
352
|
|
|
316
353
|
def update_limits(self) -> None:
|
|
317
|
-
|
|
354
|
+
clip = self.api.current_voutput.vs_output.clip
|
|
355
|
+
with (
|
|
356
|
+
QSignalBlocker(self.range_min_spin_h),
|
|
357
|
+
QSignalBlocker(self.range_max_spin_h),
|
|
358
|
+
QSignalBlocker(self.range_min_spin_w),
|
|
359
|
+
QSignalBlocker(self.range_max_spin_w),
|
|
360
|
+
):
|
|
361
|
+
self.range_min_spin_h.setRange(1, clip.height - 1)
|
|
362
|
+
self.range_max_spin_h.setRange(2, clip.height)
|
|
363
|
+
self.range_min_spin_w.setRange(1, clip.width - 1)
|
|
364
|
+
self.range_max_spin_w.setRange(2, clip.width)
|
|
318
365
|
|
|
319
|
-
|
|
320
|
-
|
|
321
|
-
self.range_min_spin.setMaximum(max_dim - 1)
|
|
322
|
-
self.range_max_spin.setMaximum(max_dim)
|
|
366
|
+
self.range_max_spin_h.setMinimum(self.range_min_spin_h.value() + 1)
|
|
367
|
+
self.range_min_spin_h.setMaximum(self.range_max_spin_h.value() - 1)
|
|
323
368
|
|
|
324
|
-
|
|
325
|
-
|
|
326
|
-
|
|
369
|
+
self.range_max_spin_w.setMinimum(self.range_min_spin_w.value() + 1)
|
|
370
|
+
self.range_min_spin_w.setMaximum(self.range_max_spin_w.value() - 1)
|
|
371
|
+
|
|
372
|
+
def on_range_min_h_changed(self, value: int) -> None:
|
|
373
|
+
clip = self.api.current_voutput.vs_output.clip
|
|
374
|
+
w_val = get_w(value, clip, 1)
|
|
375
|
+
self.range_max_spin_h.setMinimum(value + 1)
|
|
376
|
+
with QSignalBlocker(self.range_min_spin_w), QSignalBlocker(self.range_max_spin_w):
|
|
377
|
+
self.range_min_spin_w.setValue(w_val)
|
|
378
|
+
self.range_max_spin_w.setMinimum(w_val + 1)
|
|
327
379
|
|
|
328
|
-
|
|
329
|
-
|
|
380
|
+
def on_range_max_h_changed(self, value: int) -> None:
|
|
381
|
+
clip = self.api.current_voutput.vs_output.clip
|
|
382
|
+
w_val = get_w(value, clip, 1)
|
|
383
|
+
self.range_min_spin_h.setMaximum(value - 1)
|
|
384
|
+
with QSignalBlocker(self.range_min_spin_w), QSignalBlocker(self.range_max_spin_w):
|
|
385
|
+
self.range_max_spin_w.setValue(w_val)
|
|
386
|
+
self.range_min_spin_w.setMaximum(w_val - 1)
|
|
330
387
|
|
|
331
|
-
def
|
|
332
|
-
self.
|
|
388
|
+
def on_range_min_w_changed(self, value: int) -> None:
|
|
389
|
+
clip = self.api.current_voutput.vs_output.clip
|
|
390
|
+
h_val = get_h(value, clip, 1)
|
|
391
|
+
self.range_max_spin_w.setMinimum(value + 1)
|
|
392
|
+
with QSignalBlocker(self.range_min_spin_h), QSignalBlocker(self.range_max_spin_h):
|
|
393
|
+
self.range_min_spin_h.setValue(h_val)
|
|
394
|
+
self.range_max_spin_h.setMinimum(h_val + 1)
|
|
333
395
|
|
|
334
|
-
def
|
|
335
|
-
|
|
396
|
+
def on_range_max_w_changed(self, value: int) -> None:
|
|
397
|
+
clip = self.api.current_voutput.vs_output.clip
|
|
398
|
+
h_val = get_h(value, clip, 1)
|
|
399
|
+
self.range_min_spin_w.setMaximum(value - 1)
|
|
400
|
+
with QSignalBlocker(self.range_min_spin_h), QSignalBlocker(self.range_max_spin_h):
|
|
401
|
+
self.range_max_spin_h.setValue(h_val)
|
|
402
|
+
self.range_min_spin_h.setMaximum(h_val - 1)
|
|
336
403
|
|
|
337
404
|
def on_dimension_segment_changed(self, index: int) -> None:
|
|
338
405
|
if self._last_dimension == index:
|
|
339
406
|
return
|
|
340
407
|
|
|
341
|
-
clip = self.api.current_voutput.vs_output.clip
|
|
342
408
|
self._last_dimension = index
|
|
343
409
|
|
|
344
410
|
match self.dimension.index:
|
|
345
411
|
case 1:
|
|
346
|
-
|
|
412
|
+
self.range_max_stack.setCurrentWidget(self.range_max_spin_h)
|
|
413
|
+
self.range_min_stack.setCurrentWidget(self.range_min_spin_h)
|
|
347
414
|
case 0:
|
|
348
|
-
|
|
415
|
+
self.range_max_stack.setCurrentWidget(self.range_max_spin_w)
|
|
416
|
+
self.range_min_stack.setCurrentWidget(self.range_min_spin_w)
|
|
349
417
|
case _:
|
|
350
418
|
raise ValueError("Invalid dimension")
|
|
351
419
|
|
|
352
|
-
with QSignalBlocker(self.range_min_spin), QSignalBlocker(self.range_max_spin):
|
|
353
|
-
v_min = self.range_min_spin.value()
|
|
354
|
-
v_max = self.range_max_spin.value()
|
|
355
|
-
self.update_limits()
|
|
356
|
-
self.range_min_spin.setValue(func(v_min, clip, 1))
|
|
357
|
-
self.range_max_spin.setValue(func(v_max, clip, 1))
|
|
358
|
-
|
|
359
420
|
def on_base_parity_segment_changed(self, index: int) -> None:
|
|
360
421
|
self._last_base_parity = index
|
|
361
422
|
|
|
@@ -364,8 +425,8 @@ class GetNativeTab(TabContainer, IconReloadMixin):
|
|
|
364
425
|
|
|
365
426
|
clip = self.api.current_voutput.vs_output.clip
|
|
366
427
|
|
|
367
|
-
start = self.
|
|
368
|
-
stop = self.
|
|
428
|
+
start = self.range_min_stack.current.value()
|
|
429
|
+
stop = self.range_max_stack.current.value()
|
|
369
430
|
step_f = self.step_spin.value()
|
|
370
431
|
|
|
371
432
|
if step_f.is_integer():
|
|
@@ -142,8 +142,10 @@ class GetNativeLocalSettings(BaseModel):
|
|
|
142
142
|
|
|
143
143
|
last_dimension: int | None = None
|
|
144
144
|
last_base_parity: int | None = None
|
|
145
|
-
|
|
146
|
-
|
|
145
|
+
last_min_h_range: int | None = None
|
|
146
|
+
last_max_h_range: int | None = None
|
|
147
|
+
last_min_w_range: int | None = None
|
|
148
|
+
last_max_w_range: int | None = None
|
|
147
149
|
last_step: float | None = None
|
|
148
150
|
last_kernel: PydanticKernel | None = None
|
|
149
151
|
last_metric: str | None = None
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|