Compare commits

...

3 Commits
main ... pyside

  1. 2
      build_utils/waf/virtenv.py
  2. 8
      noisicaa/audioproc/engine/plugin_host_process_test.py
  3. 6
      noisicaa/builtin_nodes/beat_track/node_ui.py
  4. 6
      noisicaa/builtin_nodes/beat_track/track_ui.py
  5. 2
      noisicaa/builtin_nodes/control_track/node_ui.py
  6. 6
      noisicaa/builtin_nodes/control_track/track_ui.py
  7. 8
      noisicaa/builtin_nodes/custom_csound/node_ui.py
  8. 4
      noisicaa/builtin_nodes/custom_csound/node_ui_test.py
  9. 4
      noisicaa/builtin_nodes/cv_mapper/node_ui.py
  10. 6
      noisicaa/builtin_nodes/instrument/node_ui.py
  11. 6
      noisicaa/builtin_nodes/metronome/node_ui.py
  12. 8
      noisicaa/builtin_nodes/midi_cc_to_cv/node_ui.py
  13. 4
      noisicaa/builtin_nodes/midi_cc_to_cv/node_ui_test.py
  14. 8
      noisicaa/builtin_nodes/midi_looper/node_ui.py
  15. 2
      noisicaa/builtin_nodes/midi_looper/node_ui_test.py
  16. 6
      noisicaa/builtin_nodes/midi_monitor/node_ui.py
  17. 4
      noisicaa/builtin_nodes/midi_source/node_ui.py
  18. 4
      noisicaa/builtin_nodes/midi_velocity_mapper/node_ui.py
  19. 8
      noisicaa/builtin_nodes/mixer/node_ui.py
  20. 8
      noisicaa/builtin_nodes/oscilloscope/node_ui.py
  21. 4
      noisicaa/builtin_nodes/pianoroll/processor_messages.py
  22. 6
      noisicaa/builtin_nodes/pianoroll_track/node_ui.py
  23. 10
      noisicaa/builtin_nodes/pianoroll_track/track_ui.py
  24. 6
      noisicaa/builtin_nodes/pianoroll_track/track_ui_test.py
  25. 2
      noisicaa/builtin_nodes/sample_track/node_ui.py
  26. 8
      noisicaa/builtin_nodes/sample_track/track_ui.py
  27. 6
      noisicaa/builtin_nodes/score_track/node_ui.py
  28. 10
      noisicaa/builtin_nodes/score_track/track_ui.py
  29. 8
      noisicaa/builtin_nodes/step_sequencer/node_ui.py
  30. 10
      noisicaa/ui/audio_thread_profiler.py
  31. 8
      noisicaa/ui/base_dial.py
  32. 4
      noisicaa/ui/control_value_connector.py
  33. 8
      noisicaa/ui/control_value_dial.py
  34. 6
      noisicaa/ui/device_list.py
  35. 6
      noisicaa/ui/dynamic_layout.py
  36. 8
      noisicaa/ui/editor_app.py
  37. 5
      noisicaa/ui/editor_app_test.py
  38. 16
      noisicaa/ui/editor_window.py
  39. 6
      noisicaa/ui/flowlayout.py
  40. 8
      noisicaa/ui/gain_slider.py
  41. 18
      noisicaa/ui/graph/base_node.py
  42. 5
      noisicaa/ui/graph/base_node_test.py
  43. 16
      noisicaa/ui/graph/canvas.py
  44. 14
      noisicaa/ui/graph/canvas_test.py
  45. 4
      noisicaa/ui/graph/generic_node.py
  46. 6
      noisicaa/ui/graph/plugin_node.py
  47. 10
      noisicaa/ui/graph/toolbox.py
  48. 2
      noisicaa/ui/graph/track_node.py
  49. 2
      noisicaa/ui/graph/view.py
  50. 12
      noisicaa/ui/instrument_library.py
  51. 4
      noisicaa/ui/instrument_list.py
  52. 4
      noisicaa/ui/instrument_list_test.py
  53. 8
      noisicaa/ui/int_dial.py
  54. 4
      noisicaa/ui/load_history.py
  55. 6
      noisicaa/ui/misc.py
  56. 4
      noisicaa/ui/mute_button.py
  57. 8
      noisicaa/ui/object_list_editor.py
  58. 18
      noisicaa/ui/open_project_dialog.py
  59. 12
      noisicaa/ui/piano.py
  60. 6
      noisicaa/ui/piano_test.py
  61. 20
      noisicaa/ui/pianoroll.py
  62. 6
      noisicaa/ui/pianoroll_test.py
  63. 10
      noisicaa/ui/pipeline_perf_monitor.py
  64. 12
      noisicaa/ui/player_state.py
  65. 8
      noisicaa/ui/project_debugger.py
  66. 8
      noisicaa/ui/project_registry.py
  67. 2
      noisicaa/ui/project_registry_test.py
  68. 12
      noisicaa/ui/project_view.py
  69. 6
      noisicaa/ui/project_view_test.py
  70. 12
      noisicaa/ui/property_connector.py
  71. 22
      noisicaa/ui/qled.py
  72. 16
      noisicaa/ui/qprogressindicator.py
  73. 10
      noisicaa/ui/render_dialog.py
  74. 4
      noisicaa/ui/session_helpers.py
  75. 6
      noisicaa/ui/settings_dialog.py
  76. 14
      noisicaa/ui/slots.py
  77. 17
      noisicaa/ui/stat_monitor.py
  78. 6
      noisicaa/ui/svg_symbol.py
  79. 12
      noisicaa/ui/track_list/base_track_editor.py
  80. 18
      noisicaa/ui/track_list/editor.py
  81. 15
      noisicaa/ui/track_list/editor_test.py
  82. 12
      noisicaa/ui/track_list/measured_track_editor.py
  83. 8
      noisicaa/ui/track_list/time_line.py
  84. 14
      noisicaa/ui/track_list/time_view_mixin.py
  85. 6
      noisicaa/ui/track_list/toolbox.py
  86. 14
      noisicaa/ui/track_list/tools.py
  87. 4
      noisicaa/ui/track_list/track_editor_tests.py
  88. 10
      noisicaa/ui/track_list/view.py
  89. 8
      noisicaa/ui/transfer_function_editor.py
  90. 2
      noisicaa/ui/transfer_function_editor_test.py
  91. 8
      noisicaa/ui/ui_base.py
  92. 2
      noisicaa/ui/ui_process.py
  93. 8
      noisicaa/ui/vumeter.py
  94. 25
      noisidev/qttest.py
  95. 21
      noisidev/uitest.py

2
build_utils/waf/virtenv.py

@ -244,7 +244,7 @@ def configure(ctx):
sys_mgr.check_package(RUNTIME, 'fluid-soundfont-gm')
# Qt
pip_mgr.check_package(RUNTIME, 'PyQt5')
pip_mgr.check_package(RUNTIME, 'PySide2', version='>=5.13')
# TODO: get my changes upstream and use regular quamash package from pip.
pip_mgr.check_package(RUNTIME, 'Quamash', source='git+https://github.com/odahoda/quamash.git#egg=quamash')
sys_mgr.check_package(BUILD, 'libqt4-dev')

8
noisicaa/audioproc/engine/plugin_host_process_test.py

@ -26,9 +26,9 @@ import mmap
import os
import uuid
from PyQt5 import QtCore
from PyQt5 import QtGui
from PyQt5 import QtWidgets
from PySide2 import QtCore
from PySide2 import QtGui
from PySide2 import QtWidgets
import posix_ipc
from noisidev import unittest
@ -48,7 +48,7 @@ logger = logging.getLogger(__name__)
class Window(QtWidgets.QMainWindow):
closed = QtCore.pyqtSignal()
closed = QtCore.Signal()
def closeEvent(self, event):
self.closed.emit()

6
noisicaa/builtin_nodes/beat_track/node_ui.py

@ -24,9 +24,9 @@ from typing import Any
import logging
import os.path
from PyQt5.QtCore import Qt
from PyQt5 import QtWidgets
from PyQt5 import QtSvg
from PySide2.QtCore import Qt
from PySide2 import QtWidgets
from PySide2 import QtSvg
from noisicaa.constants import DATA_DIR
from noisicaa import core

6
noisicaa/builtin_nodes/beat_track/track_ui.py

@ -23,9 +23,9 @@
import logging
from typing import Any
from PyQt5.QtCore import Qt
from PyQt5 import QtCore
from PyQt5 import QtGui
from PySide2.QtCore import Qt
from PySide2 import QtCore
from PySide2 import QtGui
from noisicaa.core.typing_extra import down_cast
from noisicaa import audioproc

2
noisicaa/builtin_nodes/control_track/node_ui.py

@ -24,7 +24,7 @@ from typing import Any
import logging
import os.path
from PyQt5 import QtSvg
from PySide2 import QtSvg
from noisicaa.constants import DATA_DIR
from noisicaa.ui.graph import track_node

6
noisicaa/builtin_nodes/control_track/track_ui.py

@ -24,9 +24,9 @@ import fractions
import logging
from typing import Any, List, Tuple
from PyQt5.QtCore import Qt
from PyQt5 import QtCore
from PyQt5 import QtGui
from PySide2.QtCore import Qt
from PySide2 import QtCore
from PySide2 import QtGui
from noisicaa.core.typing_extra import down_cast
from noisicaa import audioproc

8
noisicaa/builtin_nodes/custom_csound/node_ui.py

@ -24,10 +24,10 @@ import logging
import os.path
from typing import cast, Any, Dict, Iterator, Callable
from PyQt5.QtCore import Qt
from PyQt5 import QtCore
from PyQt5 import QtGui
from PyQt5 import QtWidgets
from PySide2.QtCore import Qt
from PySide2 import QtCore
from PySide2 import QtGui
from PySide2 import QtWidgets
from noisicaa import constants
from noisicaa import core

4
noisicaa/builtin_nodes/custom_csound/node_ui_test.py

@ -20,8 +20,8 @@
#
# @end:license
from PyQt5.QtCore import Qt
from PyQt5 import QtWidgets
from PySide2.QtCore import Qt
from PySide2 import QtWidgets
from noisidev import uitest
from noisicaa import node_db

4
noisicaa/builtin_nodes/cv_mapper/node_ui.py

@ -23,8 +23,8 @@
import logging
from typing import Any
from PyQt5.QtCore import Qt
from PyQt5 import QtWidgets
from PySide2.QtCore import Qt
from PySide2 import QtWidgets
from noisicaa import core
from noisicaa import music

6
noisicaa/builtin_nodes/instrument/node_ui.py

@ -24,9 +24,9 @@ import logging
import os.path
from typing import Any
from PyQt5.QtCore import Qt
from PyQt5 import QtGui
from PyQt5 import QtWidgets
from PySide2.QtCore import Qt
from PySide2 import QtGui
from PySide2 import QtWidgets
from noisicaa import constants
from noisicaa import core

6
noisicaa/builtin_nodes/metronome/node_ui.py

@ -24,9 +24,9 @@ import logging
import os.path
from typing import Any
from PyQt5.QtCore import Qt
from PyQt5 import QtGui
from PyQt5 import QtWidgets
from PySide2.QtCore import Qt
from PySide2 import QtGui
from PySide2 import QtWidgets
from noisicaa import constants
from noisicaa import core

8
noisicaa/builtin_nodes/midi_cc_to_cv/node_ui.py

@ -24,10 +24,10 @@ import logging
import math
from typing import cast, Any, Dict, List, Tuple
from PyQt5.QtCore import Qt
from PyQt5 import QtCore
from PyQt5 import QtGui
from PyQt5 import QtWidgets
from PySide2.QtCore import Qt
from PySide2 import QtCore
from PySide2 import QtGui
from PySide2 import QtWidgets
from noisicaa import core
from noisicaa import music

4
noisicaa/builtin_nodes/midi_cc_to_cv/node_ui_test.py

@ -20,8 +20,8 @@
#
# @end:license
from PyQt5.QtCore import Qt
from PyQt5 import QtWidgets
from PySide2.QtCore import Qt
from PySide2 import QtWidgets
from noisidev import uitest
from . import node_ui

8
noisicaa/builtin_nodes/midi_looper/node_ui.py

@ -25,10 +25,10 @@ import logging
import os.path
from typing import Any, Dict, List
from PyQt5.QtCore import Qt
from PyQt5 import QtCore
from PyQt5 import QtGui
from PyQt5 import QtWidgets
from PySide2.QtCore import Qt
from PySide2 import QtCore
from PySide2 import QtGui
from PySide2 import QtWidgets
from noisicaa import constants
from noisicaa import core

2
noisicaa/builtin_nodes/midi_looper/node_ui_test.py

@ -20,7 +20,7 @@
#
# @end:license
from PyQt5 import QtWidgets
from PySide2 import QtWidgets
from noisidev import uitest
from noisicaa import audioproc

6
noisicaa/builtin_nodes/midi_monitor/node_ui.py

@ -24,9 +24,9 @@ import logging
import os.path
from typing import Any, Dict
from PyQt5.QtCore import Qt
from PyQt5 import QtGui
from PyQt5 import QtWidgets
from PySide2.QtCore import Qt
from PySide2 import QtGui
from PySide2 import QtWidgets
from noisicaa import constants
from noisicaa import core

4
noisicaa/builtin_nodes/midi_source/node_ui.py

@ -23,8 +23,8 @@
import logging
from typing import Any
from PyQt5.QtCore import Qt
from PyQt5 import QtWidgets
from PySide2.QtCore import Qt
from PySide2 import QtWidgets
from noisicaa import core
from noisicaa import value_types

4
noisicaa/builtin_nodes/midi_velocity_mapper/node_ui.py

@ -23,8 +23,8 @@
import logging
from typing import Any
from PyQt5.QtCore import Qt
from PyQt5 import QtWidgets
from PySide2.QtCore import Qt
from PySide2 import QtWidgets
from noisicaa import core
from noisicaa import music

8
noisicaa/builtin_nodes/mixer/node_ui.py

@ -23,10 +23,10 @@
import logging
from typing import cast, Any, Dict
from PyQt5.QtCore import Qt
from PyQt5 import QtCore
from PyQt5 import QtGui
from PyQt5 import QtWidgets
from PySide2.QtCore import Qt
from PySide2 import QtCore
from PySide2 import QtGui
from PySide2 import QtWidgets
from noisicaa import core
from noisicaa import music

8
noisicaa/builtin_nodes/oscilloscope/node_ui.py

@ -26,10 +26,10 @@ import os.path
import time
from typing import Any, Dict, List, Iterable
from PyQt5.QtCore import Qt
from PyQt5 import QtCore
from PyQt5 import QtGui
from PyQt5 import QtWidgets
from PySide2.QtCore import Qt
from PySide2 import QtCore
from PySide2 import QtGui
from PySide2 import QtWidgets
from noisicaa import constants
from noisicaa import core

4
noisicaa/builtin_nodes/pianoroll/processor_messages.py

@ -20,14 +20,14 @@
#
# @end:license
from typing import Interable
from typing import Iterable
from noisicaa import audioproc
from noisicaa.builtin_nodes import processor_message_registry_pb2
from . import processor_messages_pb2
def emit_events(node_id: str, midi: Interable[bytes]) -> audioproc.ProcessorMessage:
def emit_events(node_id: str, midi: Iterable[bytes]) -> audioproc.ProcessorMessage:
msg = audioproc.ProcessorMessage(node_id=node_id)
pb = msg.Extensions[processor_message_registry_pb2.pianoroll_emit_events]
pb.midi.extend(midi)

6
noisicaa/builtin_nodes/pianoroll_track/node_ui.py

@ -24,9 +24,9 @@ import logging
import os.path
from typing import Any
from PyQt5.QtCore import Qt
from PyQt5 import QtSvg
from PyQt5 import QtWidgets
from PySide2.QtCore import Qt
from PySide2 import QtSvg
from PySide2 import QtWidgets
from noisicaa import core
from noisicaa import music

10
noisicaa/builtin_nodes/pianoroll_track/track_ui.py

@ -26,10 +26,10 @@ import logging
import os.path
from typing import Any, Dict, List, Set, Sequence, Tuple
from PyQt5.QtCore import Qt
from PyQt5 import QtCore
from PyQt5 import QtGui
from PyQt5 import QtWidgets
from PySide2.QtCore import Qt
from PySide2 import QtCore
from PySide2 import QtGui
from PySide2 import QtWidgets
from noisicaa.core.typing_extra import down_cast
from noisicaa import constants
@ -514,7 +514,7 @@ class EditVelocityTool(PianoRollToolMixin, tools.ToolBase):
class SegmentEditor(
slots.SlotContainer, core.AutoCleanupMixin, ui_base.ProjectMixin, QtWidgets.QWidget):
playNotes = QtCore.pyqtSignal(pianoroll.PlayNotes)
playNotes = QtCore.Signal(pianoroll.PlayNotes)
xOffset, setXOffset, xOffsetChanged = slots.slot(int, 'xOffset', default=0)
yOffset, setYOffset, yOffsetChanged = slots.slot(int, 'yOffset', default=0)

6
noisicaa/builtin_nodes/pianoroll_track/track_ui_test.py

@ -20,9 +20,9 @@
#
# @end:license
from PyQt5.QtCore import Qt
from PyQt5 import QtCore
from PyQt5 import QtWidgets
from PySide2.QtCore import Qt
from PySide2 import QtCore
from PySide2 import QtWidgets
from noisidev import uitest
from noisicaa import audioproc

2
noisicaa/builtin_nodes/sample_track/node_ui.py

@ -24,7 +24,7 @@ from typing import Any
import logging
import os.path
from PyQt5 import QtSvg
from PySide2 import QtSvg
from noisicaa.constants import DATA_DIR
from noisicaa.ui.graph import track_node

8
noisicaa/builtin_nodes/sample_track/track_ui.py

@ -26,10 +26,10 @@ import functools
import logging
from typing import Any, List, Tuple, Sequence
from PyQt5.QtCore import Qt
from PyQt5 import QtCore
from PyQt5 import QtGui
from PyQt5 import QtWidgets
from PySide2.QtCore import Qt
from PySide2 import QtCore
from PySide2 import QtGui
from PySide2 import QtWidgets
from noisicaa.core.typing_extra import down_cast
from noisicaa import audioproc

6
noisicaa/builtin_nodes/score_track/node_ui.py

@ -24,9 +24,9 @@ import logging
import os.path
from typing import Any
from PyQt5.QtCore import Qt
from PyQt5 import QtSvg
from PyQt5 import QtWidgets
from PySide2.QtCore import Qt
from PySide2 import QtSvg
from PySide2 import QtWidgets
from noisicaa import core
from noisicaa import music

10
noisicaa/builtin_nodes/score_track/track_ui.py

@ -23,11 +23,11 @@
import logging
from typing import Any, List, Tuple
from PyQt5.QtCore import Qt
from PyQt5 import QtCore
from PyQt5 import QtGui
from PyQt5 import QtWidgets
from PyQt5 import QtSvg
from PySide2.QtCore import Qt
from PySide2 import QtCore
from PySide2 import QtGui
from PySide2 import QtWidgets
from PySide2 import QtSvg
from noisicaa.core.typing_extra import down_cast
from noisicaa import audioproc

8
noisicaa/builtin_nodes/step_sequencer/node_ui.py

@ -25,10 +25,10 @@ import logging
import math
from typing import Any, Optional, Dict, List
from PyQt5.QtCore import Qt
from PyQt5 import QtCore
from PyQt5 import QtGui
from PyQt5 import QtWidgets
from PySide2.QtCore import Qt
from PySide2 import QtCore
from PySide2 import QtGui
from PySide2 import QtWidgets
from noisicaa import core
from noisicaa import music

10
noisicaa/ui/audio_thread_profiler.py

@ -24,11 +24,11 @@ import logging
import os.path
from typing import Any
from PyQt5.QtCore import Qt
from PyQt5 import QtCore
from PyQt5 import QtGui
from PyQt5 import QtSvg
from PyQt5 import QtWidgets
from PySide2.QtCore import Qt
from PySide2 import QtCore
from PySide2 import QtGui
from PySide2 import QtSvg
from PySide2 import QtWidgets
from noisicaa import constants
from . import ui_base

8
noisicaa/ui/base_dial.py

@ -24,10 +24,10 @@ import logging
import math
from typing import Optional, Union, Callable
from PyQt5.QtCore import Qt
from PyQt5 import QtCore
from PyQt5 import QtGui
from PyQt5 import QtWidgets
from PySide2.QtCore import Qt
from PySide2 import QtCore
from PySide2 import QtGui
from PySide2 import QtWidgets
from . import slots

4
noisicaa/ui/control_value_connector.py

@ -23,7 +23,7 @@
import logging
from typing import Any, Callable
from PyQt5 import QtCore
from PySide2 import QtCore
from noisicaa import core
from noisicaa import value_types
@ -77,7 +77,7 @@ class ControlValueConnector(
self.__generation = change.new_value.generation
self.setValue(change.new_value.value)
def connect(self, getter: QtCore.pyqtBoundSignal, setter: Callable[[float], None]) -> None:
def connect(self, getter: QtCore.SignalInstance, setter: Callable[[float], None]) -> None:
getter.connect(self.setValue)
setter(self.value())
self.valueChanged.connect(setter)

8
noisicaa/ui/control_value_dial.py

@ -24,10 +24,10 @@ import logging
import math
from typing import Optional
from PyQt5.QtCore import Qt
from PyQt5 import QtCore
from PyQt5 import QtGui
from PyQt5 import QtWidgets
from PySide2.QtCore import Qt
from PySide2 import QtCore
from PySide2 import QtGui
from PySide2 import QtWidgets
from . import slots
from . import base_dial

6
noisicaa/ui/device_list.py

@ -23,9 +23,9 @@
import logging
from typing import cast, Any, Dict, List
from PyQt5.QtCore import Qt
from PyQt5 import QtCore
from PyQt5 import QtWidgets
from PySide2.QtCore import Qt
from PySide2 import QtCore
from PySide2 import QtWidgets
from noisicaa.core.typing_extra import down_cast
from noisicaa import audioproc

6
noisicaa/ui/dynamic_layout.py

@ -24,9 +24,9 @@ import math
import logging
from typing import Any, List, Sequence, Iterator
from PyQt5.QtCore import Qt
from PyQt5 import QtCore
from PyQt5 import QtWidgets
from PySide2.QtCore import Qt
from PySide2 import QtCore
from PySide2 import QtWidgets
logger = logging.getLogger(__name__)

8
noisicaa/ui/editor_app.py

@ -31,10 +31,10 @@ import traceback
import types
from typing import Any, Optional, Callable, Sequence, List, Type
from PyQt5.QtCore import Qt
from PyQt5 import QtCore
from PyQt5 import QtGui
from PyQt5 import QtWidgets
from PySide2.QtCore import Qt
from PySide2 import QtCore
from PySide2 import QtGui
from PySide2 import QtWidgets
from noisicaa import audioproc
from noisicaa import instrument_db

5
noisicaa/ui/editor_app_test.py

@ -28,8 +28,8 @@ import sys
import time
import Cython
from PyQt5 import QtCore
from PyQt5 import QtWidgets
from PySide2 import QtCore
from PySide2 import QtWidgets
from noisidev import qttest
from noisidev import unittest
@ -79,6 +79,7 @@ class EditorAppTest(unittest_mixins.ProcessManagerMixin, qttest.QtTestCase):
async def cleanup_testcase(self):
if self.app is not None:
await self.app.cleanup()
self.app = None
if self.process is not None:
await self.process.cleanup()

16
noisicaa/ui/editor_window.py

@ -29,10 +29,10 @@ import traceback
import typing
from typing import cast, Any, Optional, Callable, Generator
from PyQt5.QtCore import Qt
from PyQt5 import QtCore
from PyQt5 import QtGui
from PyQt5 import QtWidgets
from PySide2.QtCore import Qt
from PySide2 import QtCore
from PySide2 import QtGui
from PySide2 import QtWidgets
from noisicaa import constants
from noisicaa.core import storage
@ -86,7 +86,7 @@ class SetupProgressWidget(QtWidgets.QWidget):
class ProjectTabPage(ui_base.CommonMixin, QtWidgets.QWidget):
currentPageChanged = QtCore.pyqtSignal(QtWidgets.QWidget)
currentPageChanged = QtCore.Signal(QtWidgets.QWidget)
def __init__(self, parent: QtWidgets.QTabWidget, **kwargs: Any) -> None:
super().__init__(parent=parent, **kwargs)
@ -271,9 +271,9 @@ class ProjectTabPage(ui_base.CommonMixin, QtWidgets.QWidget):
class EditorWindow(ui_base.CommonMixin, QtWidgets.QMainWindow):
# Could not figure out how to define a signal that takes either an instance
# of a specific class or None.
currentProjectChanged = QtCore.pyqtSignal(object)
playingChanged = QtCore.pyqtSignal(bool)
loopEnabledChanged = QtCore.pyqtSignal(bool)
currentProjectChanged = QtCore.Signal(object)
playingChanged = QtCore.Signal(bool)
loopEnabledChanged = QtCore.Signal(bool)
def __init__(self, **kwargs: Any) -> None:
super().__init__(**kwargs)

6
noisicaa/ui/flowlayout.py

@ -23,9 +23,9 @@
import functools
from typing import List
from PyQt5.QtCore import Qt
from PyQt5 import QtCore
from PyQt5 import QtWidgets
from PySide2.QtCore import Qt
from PySide2 import QtCore
from PySide2 import QtWidgets
class FlowLayout(QtWidgets.QLayout):

8
noisicaa/ui/gain_slider.py

@ -23,10 +23,10 @@
import logging
from typing import Optional, Callable
from PyQt5.QtCore import Qt
from PyQt5 import QtCore
from PyQt5 import QtGui
from PyQt5 import QtWidgets
from PySide2.QtCore import Qt
from PySide2 import QtCore
from PySide2 import QtGui
from PySide2 import QtWidgets
from noisicaa.ui import slots

18
noisicaa/ui/graph/base_node.py

@ -25,11 +25,11 @@ import logging
import os.path
from typing import cast, Any, Optional, Dict, List, Iterable
from PyQt5.QtCore import Qt
from PyQt5 import QtCore
from PyQt5 import QtGui
from PyQt5 import QtSvg
from PyQt5 import QtWidgets
from PySide2.QtCore import Qt
from PySide2 import QtCore
from PySide2 import QtGui
from PySide2 import QtSvg
from PySide2 import QtWidgets
from noisicaa import constants
from noisicaa import audioproc
@ -53,7 +53,7 @@ port_colors = {
class SelectColorAction(QtWidgets.QWidgetAction):
colorSelected = QtCore.pyqtSignal(value_types.Color)
colorSelected = QtCore.Signal(value_types.Color)
def __init__(self, parent: QtCore.QObject) -> None:
super().__init__(parent)
@ -62,7 +62,7 @@ class SelectColorAction(QtWidgets.QWidgetAction):
class ColorBox(QtWidgets.QWidget):
clicked = QtCore.pyqtSignal()
clicked = QtCore.Signal()
def __init__(self, color: value_types.Color, parent: QtWidgets.QWidget) -> None:
super().__init__(parent)
@ -152,8 +152,8 @@ class SelectColorWidget(QtWidgets.QWidget):
class NodeProps(QtCore.QObject):
contentRectChanged = QtCore.pyqtSignal(QtCore.QRectF)
canvasLayoutChanged = QtCore.pyqtSignal()
contentRectChanged = QtCore.Signal(QtCore.QRectF)
canvasLayoutChanged = QtCore.Signal()
class Title(QtWidgets.QGraphicsSimpleTextItem):

5
noisicaa/ui/graph/base_node_test.py

@ -20,14 +20,14 @@
#
# @end:license
from PyQt5 import QtCore
from PySide2 import QtCore
from noisidev import uitest
from noisicaa import value_types
from . import base_node
class NoteTest(uitest.ProjectMixin, uitest.UITestCase):
class NodeTest(uitest.ProjectMixin, uitest.UITestCase):
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
@ -46,6 +46,7 @@ class NoteTest(uitest.ProjectMixin, uitest.UITestCase):
async def cleanup_testcase(self):
if self.nitem is not None:
self.nitem.cleanup()
self.nitem = None
def _scaledSize(self, zoom):
return QtCore.QSize(

16
noisicaa/ui/graph/canvas.py

@ -24,10 +24,10 @@ import logging
import os.path
from typing import cast, Any, Optional, Iterator, Callable, Type, List, Dict, Set
from PyQt5.QtCore import Qt
from PyQt5 import QtCore
from PyQt5 import QtGui
from PyQt5 import QtWidgets
from PySide2.QtCore import Qt
from PySide2 import QtCore
from PySide2 import QtGui
from PySide2 import QtWidgets
from noisicaa import constants
from noisicaa import value_types
@ -56,7 +56,7 @@ node_cls_map.update(ui_registry.node_ui_cls_map)
# Something is odd with the QWidgetAction class. The usual way to use the
# ProjectMixin doesn't work here.
class SelectNodeAction(QtWidgets.QWidgetAction, ui_base.ProjectMixin):
nodeSelected = QtCore.pyqtSignal(str)
nodeSelected = QtCore.Signal(str)
def __init__(self, parent: QtCore.QObject, **kwargs: Any) -> None:
super().__init__(parent, **kwargs) # type: ignore
@ -501,8 +501,8 @@ class MiniMap(slots.SlotContainer, QtWidgets.QWidget):
QtCore.QRectF, 'contentRect')
visibleCanvasRect, setVisibleCanvasRect, visibleCanvasRectChanged = slots.slot(
QtCore.QRectF, 'visibleCanvasRect')
centerChanged = QtCore.pyqtSignal(QtCore.QPointF)
zoomStarted = QtCore.pyqtSignal(Zoom)
centerChanged = QtCore.Signal(QtCore.QPointF)
zoomStarted = QtCore.Signal(Zoom)
def __init__(self, *, scene: Scene, **kwargs: Any) -> None:
super().__init__(**kwargs)
@ -730,7 +730,7 @@ class Canvas(ui_base.ProjectMixin, slots.SlotContainer, QtWidgets.QGraphicsView)
visibleCanvasRect, setVisibleCanvasRect, visibleCanvasRectChanged = slots.slot(
QtCore.QRectF, 'visibleCanvasRect')
zoomStarted = QtCore.pyqtSignal(Zoom)
zoomStarted = QtCore.Signal(Zoom)
def __init__(self, **kwargs: Any) -> None:
super().__init__(**kwargs)

14
noisicaa/ui/graph/canvas_test.py

@ -22,9 +22,9 @@
from unittest import mock
from PyQt5.QtCore import Qt
from PyQt5 import QtCore
from PyQt5 import QtGui
from PySide2.QtCore import Qt
from PySide2 import QtCore
from PySide2 import QtGui
from noisidev import uitest
from . import canvas
@ -49,8 +49,8 @@ class CanvasTest(uitest.ProjectMixin, uitest.UITestCase):
self.canvas.zoomStarted.connect(sig)
evt = QtGui.QWheelEvent(
QtCore.QPointF(200, 100),
QtCore.QPointF(500, 300),
QtCore.QPoint(200, 100),
QtCore.QPoint(500, 300),
QtCore.QPoint(0, 10),
QtCore.QPoint(0, 120),
10, Qt.Vertical,
@ -69,8 +69,8 @@ class CanvasTest(uitest.ProjectMixin, uitest.UITestCase):
self.canvas.zoomStarted.connect(sig)
evt = QtGui.QWheelEvent(
QtCore.QPointF(200, 100),
QtCore.QPointF(500, 300),
QtCore.QPoint(200, 100),
QtCore.QPoint(500, 300),
QtCore.QPoint(0, -10),
QtCore.QPoint(0, -120),
10, Qt.Vertical,

4
noisicaa/ui/graph/generic_node.py

@ -23,8 +23,8 @@
import logging
from typing import Any, Optional, List
from PyQt5.QtCore import Qt
from PyQt5 import QtWidgets
from PySide2.QtCore import Qt
from PySide2 import QtWidgets
from noisicaa import core
from noisicaa import value_types

6
noisicaa/ui/graph/plugin_node.py

@ -24,9 +24,9 @@ import asyncio
import logging
from typing import Any, Optional
from PyQt5.QtCore import Qt
from PyQt5 import QtGui
from PyQt5 import QtWidgets
from PySide2.QtCore import Qt
from PySide2 import QtGui
from PySide2 import QtWidgets
from noisicaa import music
from noisicaa.ui import ui_base

10
noisicaa/ui/graph/toolbox.py

@ -26,9 +26,9 @@ import logging
import os.path
from typing import Any
from PyQt5 import QtCore
from PyQt5 import QtGui
from PyQt5 import QtWidgets
from PySide2 import QtCore
from PySide2 import QtGui
from PySide2 import QtWidgets
from noisicaa import constants
from noisicaa.ui import ui_base
@ -42,8 +42,8 @@ class Tool(enum.Enum):
class Toolbox(ui_base.ProjectMixin, QtWidgets.QWidget):
toolChanged = QtCore.pyqtSignal(Tool)
resetViewTriggered = QtCore.pyqtSignal()
toolChanged = QtCore.Signal(object) # TODO: should be 'Tool'
resetViewTriggered = QtCore.Signal()
def __init__(self, **kwargs: Any) -> None:
super().__init__(**kwargs)

2
noisicaa/ui/graph/track_node.py

@ -23,7 +23,7 @@
import logging
from typing import cast, Any
from PyQt5 import QtWidgets
from PySide2 import QtWidgets
from noisicaa import music
from . import base_node

2
noisicaa/ui/graph/view.py

@ -23,7 +23,7 @@
import logging
from typing import Any, Optional
from PyQt5 import QtWidgets
from PySide2 import QtWidgets
from noisicaa import music
from noisicaa.ui import ui_base

12
noisicaa/ui/instrument_library.py

@ -27,10 +27,10 @@ import random
import uuid
from typing import cast, Any, Optional, List
from PyQt5.QtCore import Qt
from PyQt5 import QtCore
from PyQt5 import QtGui
from PyQt5 import QtWidgets
from PySide2.QtCore import Qt
from PySide2 import QtCore
from PySide2 import QtGui
from PySide2 import QtWidgets
from noisicaa import constants
from noisicaa import instrument_db
@ -98,7 +98,7 @@ class FilterModel(QtCore.QSortFilterProxyModel):
class LibraryView(QtWidgets.QTreeView):
currentIndexChanged = QtCore.pyqtSignal(QtCore.QModelIndex)
currentIndexChanged = QtCore.Signal(QtCore.QModelIndex)
def __init__(self, parent: Optional[QtWidgets.QWidget] = None) -> None:
super().__init__(parent)
@ -123,7 +123,7 @@ class LibraryView(QtWidgets.QTreeView):
class InstrumentLibraryDialog(ui_base.CommonMixin, QtWidgets.QDialog):
instrumentChanged = QtCore.pyqtSignal(instrument_db.InstrumentDescription)
instrumentChanged = QtCore.Signal(instrument_db.InstrumentDescription)
def __init__(
self, parent: Optional[QtWidgets.QWidget] = None, selectButton: bool = False,

4
noisicaa/ui/instrument_list.py

@ -25,8 +25,8 @@ import logging
import pathlib
from typing import cast, Any, Optional, Iterator, List, Tuple
from PyQt5.QtCore import Qt
from PyQt5 import QtCore
from PySide2.QtCore import Qt
from PySide2 import QtCore
from noisicaa import instrument_db
from noisicaa import core

4
noisicaa/ui/instrument_list_test.py

@ -22,8 +22,8 @@
import os.path
from PyQt5.QtCore import Qt
from PyQt5 import QtCore
from PySide2.QtCore import Qt
from PySide2 import QtCore
from noisidev import uitest
from noisicaa import instrument_db

8
noisicaa/ui/int_dial.py

@ -24,10 +24,10 @@ import logging
import math
from typing import Optional
from PyQt5.QtCore import Qt
from PyQt5 import QtCore
from PyQt5 import QtGui
from PyQt5 import QtWidgets
from PySide2.QtCore import Qt
from PySide2 import QtCore
from PySide2 import QtGui
from PySide2 import QtWidgets
from . import slots
from . import base_dial

4
noisicaa/ui/load_history.py

@ -23,8 +23,8 @@
import math
from typing import List
from PyQt5.QtCore import Qt
from PyQt5 import QtWidgets, QtGui
from PySide2.QtCore import Qt
from PySide2 import QtWidgets, QtGui
class LoadHistoryWidget(QtWidgets.QWidget):

6
noisicaa/ui/misc.py

@ -20,9 +20,9 @@
#
# @end:license
from PyQt5 import QtCore
from PyQt5 import QtGui
from PyQt5 import QtWidgets
from PySide2 import QtCore
from PySide2 import QtGui
from PySide2 import QtWidgets
class QGraphicsGroup(QtWidgets.QGraphicsItem):

4
noisicaa/ui/mute_button.py

@ -22,8 +22,8 @@
import os.path
from PyQt5 import QtGui
from PyQt5 import QtWidgets
from PySide2 import QtGui
from PySide2 import QtWidgets
from noisicaa import constants

8
noisicaa/ui/object_list_editor.py

@ -25,10 +25,10 @@ import logging
import os.path
from typing import Any, Dict, List, Set, Sequence, Iterator, Callable, Generic, TypeVar
from PyQt5.QtCore import Qt
from PyQt5 import QtCore
from PyQt5 import QtGui
from PyQt5 import QtWidgets
from PySide2.QtCore import Qt
from PySide2 import QtCore
from PySide2 import QtGui
from PySide2 import QtWidgets
from noisicaa import constants
from noisicaa import core

18
noisicaa/ui/open_project_dialog.py

@ -27,10 +27,10 @@ import os.path
import random
from typing import Any, Dict, List
from PyQt5.QtCore import Qt
from PyQt5 import QtCore
from PyQt5 import QtGui
from PyQt5 import QtWidgets
from PySide2.QtCore import Qt
from PySide2 import QtCore
from PySide2 import QtGui
from PySide2 import QtWidgets
import humanize
from noisicaa import constants
@ -147,8 +147,8 @@ class ItemDelegate(QtWidgets.QAbstractItemDelegate):
class ProjectListView(QtWidgets.QListView):
numProjectsSelected = QtCore.pyqtSignal(int)
itemDoubleClicked = QtCore.pyqtSignal(project_registry_lib.Item)
numProjectsSelected = QtCore.Signal(int)
itemDoubleClicked = QtCore.Signal(project_registry_lib.Item)
def __init__(self, parent: QtWidgets.QWidget) -> None:
super().__init__(parent)
@ -358,9 +358,9 @@ class NewProjectDialog(ui_base.CommonMixin, QtWidgets.QDialog):
class OpenProjectDialog(ui_base.CommonMixin, QtWidgets.QWidget):
projectSelected = QtCore.pyqtSignal(project_registry_lib.Project)
createProject = QtCore.pyqtSignal(str)
debugProject = QtCore.pyqtSignal(project_registry_lib.Project)
projectSelected = QtCore.Signal(project_registry_lib.Project)
createProject = QtCore.Signal(str)
debugProject = QtCore.Signal(project_registry_lib.Project)
def __init__(self, **kwargs: Any) -> None:
super().__init__(**kwargs)

12
noisicaa/ui/piano.py

@ -23,10 +23,10 @@
import math
from typing import Dict
from PyQt5.QtCore import Qt
from PyQt5 import QtCore
from PyQt5 import QtGui
from PyQt5 import QtWidgets
from PySide2.QtCore import Qt
from PySide2 import QtCore
from PySide2 import QtGui
from PySide2 import QtWidgets