refactor: split drumpy in the app and the measurements

pyproject.toml

@@ -1,9 +1,13 @@
 [tool.poetry]
-name = "src"
+name = "drumpy"
 version = "0.1.0"
 description = ""
-authors = ["mouwrice <mauricevanwassenhove@gmail.com>"]
-readme = "README.md"
+authors = ["mouwrice <mauricevanwassenhove@fastmail.com>"]
+packages = [ { include = "drumpy", from = "src" } ]
+
+[build-system]
+requires = ["poetry-core"]
+build-backend = "poetry.core.masonry.api"
 
 [tool.poetry.dependencies]
 python = "~3.11"
@@ -22,6 +26,4 @@ scikit-image = "^0.22.0"
 pre-commit = "^3.6.1"
 line-profiler-pycharm = "^1.1.0"
 
-[build-system]
-requires = ["poetry-core"]
-build-backend = "poetry.core.masonry.api"
+

src/app/camera_display.py → src/drumpy/app/camera_display.py

@@ -1,8 +1,8 @@
 import pygame.time
 from pygame import Surface
 
-from app.video_source import VideoSource, Source
-from tracker.mediapipe_pose import MediaPipePose
+from drumpy.app.video_source import VideoSource, Source
+from drumpy.mediapipe_pose import MediaPipePose
 
 
 class VideoDisplay:

src/app/fps_display.py → src/drumpy/app/fps_display.py

@@ -2,7 +2,7 @@
 from pygame_gui import UIManager
 from pygame_gui.elements import UILabel
 
-from tracker.mediapipe_pose import MediaPipePose
+from drumpy.mediapipe_pose import MediaPipePose
 
 
 class FPSDisplay(UILabel):

src/app/graphs/latency_graph.py → src/drumpy/app/graphs/latency_graph.py

@@ -4,8 +4,8 @@
 import pygame
 from pygame_gui.elements import UIImage
 
-from app.graphs.ui_constants import GRAPH_FRAME_RANGE
-from tracker.mediapipe_pose import MediaPipePose
+from drumpy.app.graphs.ui_constants import GRAPH_FRAME_RANGE
+from drumpy.mediapipe_pose import MediaPipePose
 
 
 def plot_latency_graph(

src/app/graphs/marker_location_graph.py → src/drumpy/app/graphs/marker_location_graph.py

@@ -6,8 +6,8 @@
 from numpy import ndarray, dtype
 from pygame_gui.elements import UIImage
 
-from app.graphs.ui_constants import GRAPH_FRAME_RANGE
-from tracker.mediapipe_pose import MediaPipePose
+from drumpy.app.graphs.ui_constants import GRAPH_FRAME_RANGE
+from drumpy.mediapipe_pose import MediaPipePose
 
 
 def plot_marker_location_graph(

src/app/graphs/marker_location_graphs.py → src/drumpy/app/graphs/marker_location_graphs.py

@@ -2,9 +2,9 @@
 
 import pygame
 
-from app.graphs.marker_location_graph import MarkerLocationGraph
-from drum_tracking.mediapipe_markers import Marker
-from tracker.mediapipe_pose import MediaPipePose
+from drumpy.app.graphs.marker_location_graph import MarkerLocationGraph
+from drumpy.drum.mediapipe_markers import Marker
+from drumpy.mediapipe_pose import MediaPipePose
 
 
 class MarkerLocationGraphs:

src/app/main.py → src/drumpy/app/main.py

@@ -4,12 +4,12 @@
 import pygame.camera
 from pygame_gui import UIManager
 
-from app.camera_display import VideoDisplay
-from app.fps_display import FPSDisplay
-from app.graphs.latency_graph import LatencyGraph
-from app.graphs.marker_location_graphs import MarkerLocationGraphs
-from app.video_source import CameraSource, VideoFileSource, Source
-from tracker.mediapipe_pose import MediaPipePose, LandmarkerModel
+from drumpy.app.camera_display import VideoDisplay
+from drumpy.app.fps_display import FPSDisplay
+from drumpy.app.graphs.latency_graph import LatencyGraph
+from drumpy.app.graphs.marker_location_graphs import MarkerLocationGraphs
+from drumpy.app.video_source import CameraSource, VideoFileSource, Source
+from drumpy.mediapipe_pose import MediaPipePose, LandmarkerModel
 
 
 class App:

src/drum_tracking/drum.py → src/drumpy/drum/drum.py

@@ -3,8 +3,8 @@
 import numpy as np
 import numpy.typing as npt
 
-from src.sound import Sound, SoundState
-from src.util import print_float_array
+from drumpy.drum.sound import Sound, SoundState
+from drumpy.util import print_float_array
 
 
 class DrumPresets:

src/drum_tracking/foot.py → src/drumpy/drum/foot.py

@@ -1,7 +1,7 @@
 import numpy as np
 
-from src.tracker.marker import Marker
-from src.tracker.marker_tracker import MarkerTracker
+from drumpy.drum.marker import Marker
+from drumpy.drum.marker_tracker import MarkerTracker
 
 
 class Foot:

src/drum_tracking/hand.py → src/drumpy/drum/hand.py

@@ -1,7 +1,7 @@
 import numpy as np
 
-from src.tracker.marker import Marker
-from src.tracker.marker_tracker import MarkerTracker
+from drumpy.drum.marker import Marker
+from drumpy.drum.marker_tracker import MarkerTracker
 
 
 class Hand:

src/drum_tracking/marker_tracker.py → src/drumpy/drum/marker_tracker.py

@@ -3,7 +3,7 @@
 import numpy as np
 import numpy.typing as npt
 
-from src.drum import Drum
+from drumpy.drum.drum import Drum
 
 
 class MarkerTracker:

src/drum_tracking/sound.py → src/drumpy/drum/sound.py

@@ -5,7 +5,7 @@
 import pygame
 from termcolor import cprint
 
-from src.util import print_float_array
+from drumpy.util import print_float_array
 
 
 class SoundState(Enum):

src/tracker/mediapipe_pose.py → src/drumpy/mediapipe_pose.py

@@ -15,7 +15,7 @@
 )
 from numpy import ndarray, dtype
 
-from measure.csv_utils.csv_object import CSVWriter
+from drumpy.trajectory_file import TrajectoryFile
 
 
 class LandmarkerModel(Enum):
@@ -98,7 +98,7 @@ def __init__(
                 if log_file is not None
                 else f"./data/mediapipe_{self.model.name}_{time.strftime('%Y-%m-%d_%H-%M-%S')}.csv"
             )
-            self.csv_writer = CSVWriter(self.log_file)
+            self.csv_writer = TrajectoryFile(self.log_file)
 
     def result_callback(
         self, result: PoseLandmarkerResult, image: Image, timestamp_ms: int

src/measure/csv_utils/csv_object.py → src/drumpy/trajectory_file.py

@@ -1,7 +1,7 @@
 import csv
 
 
-class CSVWriter:
+class TrajectoryFile:
     """
     Class to read and write the captured data to a CSV file.
     """