Skip to content

Commit ffc0294

Browse files
ferdnycferdnyc
committed
properties_tableview: Format, unused vars
1 parent 7fd836b commit ffc0294

File tree

1 file changed

+54
-28
lines changed

1 file changed

+54
-28
lines changed

‎src/windows/models/properties_model.py

+54-28
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,21 @@
3030
from operator import itemgetter
3131

3232
from PyQt5.QtCore import QMimeData, Qt, QLocale, QTimer
33-
from PyQt5.QtGui import *
33+
from PyQt5.QtGui import (
34+
QStandardItemModel, QStandardItem,
35+
QPixmap, QColor,
36+
)
3437

3538
from classes import updates
3639
from classes import info
37-
from classes.query import Clip, Transition, Effect, File
40+
from classes.query import Clip, Transition, Effect
3841
from classes.logger import log
3942
from classes.app import get_app
4043
import openshot
4144

4245
import json
4346

47+
4448
class ClipStandardItemModel(QStandardItemModel):
4549
def __init__(self, parent=None):
4650
QStandardItemModel.__init__(self)
@@ -128,7 +132,6 @@ def update_item_timeout(self):
128132
# Append to selected items
129133
self.selected.append((e, item_type))
130134

131-
132135
# Update frame # from timeline
133136
self.update_frame(get_app().window.preview_thread.player.Position(), reload_model=False)
134137

@@ -199,7 +202,6 @@ def remove_keyframe(self, item):
199202

200203
# Determine what was changed
201204
property = self.model.item(item.row(), 0).data()
202-
property_name = property[1]["name"]
203205
property_type = property[1]["type"]
204206
closest_point_x = property[1]["closest_point_x"]
205207
property_type = property[1]["type"]
@@ -228,7 +230,10 @@ def remove_keyframe(self, item):
228230
# Determine type of keyframe (normal or color)
229231
keyframe_list = []
230232
if property_type == "color":
231-
keyframe_list = [c.data[property_key]["red"], c.data[property_key]["blue"], c.data[property_key]["green"]]
233+
keyframe_list = [
234+
c.data[property_key]["red"],
235+
c.data[property_key]["blue"],
236+
c.data[property_key]["green"]]
232237
else:
233238
keyframe_list = [c.data[property_key]]
234239

@@ -304,7 +309,11 @@ def color_update(self, item, new_color, interpolation=-1, interpolation_details=
304309
log.info("color update: %s" % c.data)
305310

306311
# Loop through each keyframe (red, blue, and green)
307-
for color, new_value in [("red", new_color.red()), ("blue", new_color.blue()), ("green", new_color.green())]:
312+
for color, new_value in [
313+
("red", new_color.red()),
314+
("blue", new_color.blue()),
315+
("green", new_color.green()),
316+
]:
308317

309318
# Keyframe
310319
# Loop through points, find a matching points on this frame
@@ -317,7 +326,9 @@ def color_update(self, item, new_color, interpolation=-1, interpolation_details=
317326
clip_updated = True
318327
# Update point
319328
point["co"]["Y"] = new_value
320-
log.info("updating point: co.X = %s to value: %s" % (point["co"]["X"], float(new_value)))
329+
log.info(
330+
"updating point: co.X = %s to value: %s"
331+
% (point["co"]["X"], float(new_value)))
321332
break
322333

323334
elif interpolation > -1 and point["co"]["X"] == previous_point_x:
@@ -330,7 +341,9 @@ def color_update(self, item, new_color, interpolation=-1, interpolation_details=
330341
point["handle_right"]["X"] = interpolation_details[0]
331342
point["handle_right"]["Y"] = interpolation_details[1]
332343

333-
log.info("updating interpolation mode point: co.X = %s to %s" % (point["co"]["X"], interpolation))
344+
log.info(
345+
"updating interpolation mode point: co.X = %s to %s"
346+
% (point["co"]["X"], interpolation))
334347
log.info("use interpolation preset: %s" % str(interpolation_details))
335348

336349
elif interpolation > -1 and point["co"]["X"] == closest_point_x:
@@ -343,14 +356,18 @@ def color_update(self, item, new_color, interpolation=-1, interpolation_details=
343356
point["handle_left"]["X"] = interpolation_details[2]
344357
point["handle_left"]["Y"] = interpolation_details[3]
345358

346-
log.info("updating interpolation mode point: co.X = %s to %s" % (point["co"]["X"], interpolation))
359+
log.info(
360+
"updating interpolation mode point: co.X = %s to %s"
361+
% (point["co"]["X"], interpolation))
347362
log.info("use interpolation preset: %s" % str(interpolation_details))
348363

349364
# Create new point (if needed)
350365
if not found_point:
351366
clip_updated = True
352367
log.info("Created new point at X=%s" % self.frame_number)
353-
c.data[property_key][color]["Points"].append({'co': {'X': self.frame_number, 'Y': new_value}, 'interpolation': 1})
368+
c.data[property_key][color]["Points"].append({
369+
'co': {'X': self.frame_number, 'Y': new_value},
370+
'interpolation': 1})
354371

355372
# Reduce # of clip properties we are saving (performance boost)
356373
c.data = {property_key: c.data[property_key]}
@@ -377,7 +394,6 @@ def value_updated(self, item, interpolation=-1, value=None, interpolation_detail
377394

378395
# Determine what was changed
379396
property = self.model.item(item.row(), 0).data()
380-
property_name = property[1]["name"]
381397
closest_point_x = property[1]["closest_point_x"]
382398
previous_point_x = property[1]["previous_point_x"]
383399
property_type = property[1]["type"]
@@ -387,7 +403,7 @@ def value_updated(self, item, interpolation=-1, value=None, interpolation_detail
387403
# Get value (if any)
388404
if item.text():
389405
# Set and format value based on property type
390-
if value != None:
406+
if value is not None:
391407
# Override value
392408
new_value = value
393409
elif property_type == "string":
@@ -408,8 +424,9 @@ def value_updated(self, item, interpolation=-1, value=None, interpolation_detail
408424
else:
409425
new_value = None
410426

411-
log.info("%s for %s changed to %s at frame %s with interpolation: %s at closest x: %s" % (property_key, clip_id, new_value, self.frame_number, interpolation, closest_point_x))
412-
427+
log.info(
428+
"%s for %s changed to %s at frame %s with interpolation: %s at closest x: %s"
429+
% (property_key, clip_id, new_value, self.frame_number, interpolation, closest_point_x))
413430

414431
# Find this clip
415432
c = None
@@ -443,9 +460,11 @@ def value_updated(self, item, interpolation=-1, value=None, interpolation_detail
443460
found_point = True
444461
clip_updated = True
445462
# Update or delete point
446-
if new_value != None:
463+
if new_value is not None:
447464
point["co"]["Y"] = float(new_value)
448-
log.info("updating point: co.X = %s to value: %s" % (point["co"]["X"], float(new_value)))
465+
log.info(
466+
"updating point: co.X = %s to value: %s"
467+
% (point["co"]["X"], float(new_value)))
449468
else:
450469
point_to_delete = point
451470
break
@@ -460,7 +479,9 @@ def value_updated(self, item, interpolation=-1, value=None, interpolation_detail
460479
point["handle_right"]["X"] = interpolation_details[0]
461480
point["handle_right"]["Y"] = interpolation_details[1]
462481

463-
log.info("updating interpolation mode point: co.X = %s to %s" % (point["co"]["X"], interpolation))
482+
log.info(
483+
"updating interpolation mode point: co.X = %s to %s"
484+
% (point["co"]["X"], interpolation))
464485
log.info("use interpolation preset: %s" % str(interpolation_details))
465486

466487
elif interpolation > -1 and point["co"]["X"] == closest_point_x:
@@ -473,7 +494,9 @@ def value_updated(self, item, interpolation=-1, value=None, interpolation_detail
473494
point["handle_left"]["X"] = interpolation_details[2]
474495
point["handle_left"]["Y"] = interpolation_details[3]
475496

476-
log.info("updating interpolation mode point: co.X = %s to %s" % (point["co"]["X"], interpolation))
497+
log.info(
498+
"updating interpolation mode point: co.X = %s to %s"
499+
% (point["co"]["X"], interpolation))
477500
log.info("use interpolation preset: %s" % str(interpolation_details))
478501

479502
# Delete point (if needed)
@@ -483,10 +506,12 @@ def value_updated(self, item, interpolation=-1, value=None, interpolation_detail
483506
c.data[property_key]["Points"].remove(point_to_delete)
484507

485508
# Create new point (if needed)
486-
elif not found_point and new_value != None:
487-
clip_updated = True
488-
log.info("Created new point at X=%s" % self.frame_number)
489-
c.data[property_key]["Points"].append({'co': {'X': self.frame_number, 'Y': new_value}, 'interpolation': 1})
509+
elif not found_point and new_value is not None:
510+
clip_updated = True
511+
log.info("Created new point at X=%s" % self.frame_number)
512+
c.data[property_key]["Points"].append({
513+
'co': {'X': self.frame_number, 'Y': new_value},
514+
'interpolation': 1})
490515

491516
if not clip_updated:
492517
# If no keyframe was found, set a basic property
@@ -579,7 +604,6 @@ def update_model(self, filter=""):
579604
# Add Headers
580605
self.model.setHorizontalHeaderLabels([_("Property"), _("Value")])
581606

582-
583607
# Loop through properties, and build a model
584608
for property in all_properties.items():
585609
label = property[1]["name"]
@@ -591,15 +615,14 @@ def update_model(self, filter=""):
591615
keyframe = property[1]["keyframe"]
592616
points = property[1]["points"]
593617
interpolation = property[1]["interpolation"]
594-
closest_point_x = property[1]["closest_point_x"]
595618
choices = property[1]["choices"]
596619

597620
# Adding Transparency to translation file
598-
transparency_label = _("Transparency")
621+
transparency_label = _("Transparency") # noqa
599622

600623
selected_choice = None
601624
if choices:
602-
selected_choice = [c for c in choices if c["selected"] == True][0]["name"]
625+
selected_choice = [c for c in choices if c["selected"] is True][0]["name"]
603626

604627
# Hide filtered out properties
605628
if filter and filter.lower() not in _(label).lower():
@@ -688,7 +711,11 @@ def update_model(self, filter=""):
688711
if readonly or type == "color" or choices or label == "Track":
689712
col.setFlags(Qt.ItemIsEnabled)
690713
else:
691-
col.setFlags(Qt.ItemIsSelectable | Qt.ItemIsEnabled | Qt.ItemIsUserCheckable | Qt.ItemIsEditable)
714+
col.setFlags(
715+
Qt.ItemIsSelectable
716+
| Qt.ItemIsEnabled
717+
| Qt.ItemIsUserCheckable
718+
| Qt.ItemIsEditable)
692719
row.append(col)
693720

694721
# Append ROW to MODEL (if does not already exist in model)
@@ -795,7 +822,6 @@ def update_model(self, filter=""):
795822
# Add Headers
796823
self.model.setHorizontalHeaderLabels([_("Property"), _("Value")])
797824

798-
799825
# Done updating model
800826
self.ignore_update_signal = False
801827

0 commit comments

Comments
 (0)