svp: add interval field to CurveGenerator

SoulMelody · Jul 2, 2024 · 4cbff29 · 4cbff29
1 parent b4d56d9
commit 4cbff29
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/libresvip/plugins/svp/param_expression.py b/libresvip/plugins/svp/param_expression.py
@@ -4,7 +4,7 @@
 import dataclasses
 import enum
 import operator
-from typing import TYPE_CHECKING, Union
+from typing import TYPE_CHECKING, Optional, Union
 
 from libresvip.model.point import Point
 from libresvip.utils.search import find_last_index
@@ -20,6 +20,8 @@
 if TYPE_CHECKING:
     from collections.abc import Callable, Iterable
 
+    import portion
+
     from libresvip.core.time_sync import TimeSynchronizer
 
     from .model import SVNote
@@ -110,6 +112,7 @@ class CurveGenerator(ParamExpression):
     _point_list: dataclasses.InitVar[Iterable[Point]]
     _interpolation: dataclasses.InitVar[Callable[[float], float]]
     _base_value: dataclasses.InitVar[int] = 0
+    interval: Optional[portion.Interval] = None
 
     def __post_init__(
         self,
@@ -136,7 +139,7 @@ def __post_init__(
         self.base_value = _base_value
 
     def value_at_ticks(self, ticks: int) -> float:
-        if len(self.point_list) == 0:
+        if len(self.point_list) == 0 or (self.interval is not None and ticks not in self.interval):
             return self.base_value
         index = find_last_index(self.point_list, lambda point: point.x <= ticks)
         if index == -1:

diff --git a/libresvip/plugins/svp/synthv_parser.py b/libresvip/plugins/svp/synthv_parser.py
@@ -293,21 +293,21 @@ def parse_pitch_curve(
             instant_interval = RangeInterval(
                 [
                     (
-                        note.onset,
-                        note.onset + note.duration,
+                        position_to_ticks(note.onset),
+                        position_to_ticks(note.onset + note.duration),
                     )
                     for note in sv_notes
                     if note.instant_mode is True
                 ]
             )
             pitch_diff_expr += CurveGenerator(
+                interval=instant_interval.interval,
                 _point_list=[
                     Point(
                         position_to_ticks(point.offset),
                         round(point.value),
                     )
                     for point in self.instant_pitch.points.root
-                    if point.offset in instant_interval
                 ],
                 _interpolation=self.parse_interpolation(self.instant_pitch.mode),
             )