physicsLab 1.4.8__tar.gz → 1.4.9__tar.gz

{physicslab-1.4.8 → physicslab-1.4.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: physicsLab
-Version: 1.4.8
+Version: 1.4.9
 Summary: Python API for Physics-Lab-AR
 Home-page: https://gitee.com/script2000/physicsLab
 Author: Goodenough

{physicslab-1.4.8 → physicslab-1.4.9}/physicsLab/music/music.py

@@ -76,12 +76,10 @@ class Midi:
         else:
             self.midifile: str = midifile
 
-        self.channels: List[int] = [0] * 16
-        self.tempo: int = 500_000
         self.messages: mido.MidiTrack = self.__get_midi_messages()
 
-    # 使用mido打开一个midi文件并获取其tracks
     def __get_midi_messages(self) -> mido.MidiTrack:
+        ''' 使用mido打开一个midi文件并获取其messages '''
         self._midifile = mido.MidiFile(self.midifile, clip=True)
         wait_time: numType = 0
         res = mido.MidiTrack()
@@ -93,10 +91,6 @@ class Midi:
             elif msg.time != 0:
                 wait_time += msg.time
 
-            if msg.type == "program_change":
-                self.channels[msg.channel] = msg.program
-            if msg.type == "set_tempo":
-                self.tempo = msg.tempo
         return res
 
     # 播放midi类存储的信息
@@ -176,8 +170,8 @@ class Midi:
 
         return self
 
-    # 将time重设为原来的num倍
     def set_tempo(self, num: numType = 1) -> Self:
+        ''' 将time重设为原来的num倍 '''
         if not isinstance(num, (int, float)):
             raise TypeError
 
@@ -188,26 +182,39 @@ class Midi:
 
     # 返回 [Note(...), Chord(...), ...]
     def _get_notes_list(self,
-                        div_time: numType, max_notes: Optional[int],
-                        is_fix_strange_note: bool = False,
+                        div_time: Optional[numType],
+                        max_notes: Optional[int],
+                        fix_strange_note: bool = False,
                         ) -> List[Union["Note", "Chord"]]:
 
         res: List[Union[Note, Chord]] = []
         wait_time: int = 0
         len_res: int = 0
+        channels: List[int] = [0] * 16
+        tempo: int = 500_000
+        _div_time = div_time
 
         for msg in self.messages:
+            if msg.type == "program_change":
+                channels[msg.channel] = msg.program
+            if msg.type == "set_tempo":
+                tempo = msg.tempo
+                if div_time is None:
+                    _div_time = mido.second2tick(0.11, self._midifile.ticks_per_beat, tempo)
+
             if msg.type == "note_on":
                 velocity: float = _format_velocity(msg.velocity / 127) # 音符的响度
-                ins: int = self.channels[msg.channel]
+                ins: int = channels[msg.channel]
 
-                if velocity == 0 or (is_fix_strange_note and ins == 0 and velocity >= 0.85):
+                if velocity == 0 or (fix_strange_note and ins == 0 and velocity >= 0.85):
                     if msg.time != 0:
                         wait_time += msg.time
                     continue
 
                 len_res += 1
-                note_time = round((msg.time + wait_time) / div_time)
+                if _div_time is None:
+                    raise RuntimeError("find some error in midifile, please manually pass in the div_time parameter")
+                note_time = round((msg.time + wait_time) / _div_time)
 
                 if note_time != 0 or len(res) == 0:
                     if note_time == 0:
@@ -226,13 +233,14 @@ class Midi:
         return res
 
     def to_piece(self,
-                 div_time: numType = 100,
+                 div_time: Optional[numType] = None,
                  max_notes: Optional[int] = 800,
                  is_optimize: bool = True, # 是否将多个音符优化为和弦
-                 is_fix_strange_note: bool = False, # 是否修正一些奇怪的音符
+                 fix_strange_note: bool = False, # 是否修正一些奇怪的音符
                  ) -> "Piece":
         ''' 转换为Piece类 '''
-        return Piece(self._get_notes_list(div_time, max_notes, is_fix_strange_note),
+
+        return Piece(self._get_notes_list(div_time, max_notes, fix_strange_note),
                      is_optimize=is_optimize)
 
     ''' *.pl.py文件:
@@ -256,8 +264,11 @@ class Midi:
             f.write(f"import os\n"
                     f"os.environ['PYGAME_HIDE_SUPPORT_PROMPT'] = '1'\n"
                     f"from mido import MidiFile, MidiTrack, MetaMessage, Message\n"
-                    f"mid = MidiFile()\n"
-                    f"track = {str(self.messages)}\n"
+                    f"mid = MidiFile(type={self._midifile.type}, "
+                    f"ticks_per_beat={self._midifile.ticks_per_beat}, "
+                    f"charset='{self._midifile.charset}', "
+                    f"clip={self._midifile.clip})\n"
+                    f"track = {self.messages}\n"
                     f"mid.tracks.append(track)\n"
                     f"mid.save(\"temp.mid\")\n"
                     f"from physicsLab.music import Midi\n"
@@ -265,27 +276,28 @@ class Midi:
 
         return self
 
-    # 以 .mid 的形式导出, read_midi已经在Midi的__init__中实现
     def write_midi(self, midipath: str = "temp.mid") -> Self:
+        """ 导出一个 .mid 文件 """
         if not isinstance(midipath, str):
             raise TypeError
         if not midipath.endswith(".mid"):
             midipath += ".mid"
 
-        mid = mido.MidiFile()
+        mid = mido.MidiFile(ticks_per_beat=self._midifile.ticks_per_beat,
+                            type=self._midifile.type,
+                            charset=self._midifile.charset)
         mid.tracks.append(self.messages)
         mid.save(midipath)
 
         return self
 
-    # 以.pl.py的格式导出, div_time: midi的time的单位长度与Note的time的单位长度不同，支持用户手动调整
-    # max_notes: 最大的音符数，因为物实没法承受过多的元件
     def write_plpy(self,
                   filepath: str = "temp.pl.py",
-                  div_time: numType = 100,
-                  max_notes: Optional[int] = 800,
+                  div_time: numType = 100, # midi的time的单位长度与Note的time的单位长度不同，支持用户手动调整
+                  max_notes: Optional[int] = 800, # 最大的音符数，因为物实没法承受过多的元件
                   sav_name: str = "temp" # 产生的存档的名字, 也可直接在生成.pl.py中修改
     ) -> Self:
+        ''' 以.pl.py的格式导出 '''
         if not (isinstance(div_time, (int, float)) or
                 isinstance(max_notes, int)) and max_notes is not None:
            raise TypeError

{physicslab-1.4.8 → physicslab-1.4.9}/physicsLab.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: physicsLab
-Version: 1.4.8
+Version: 1.4.9
 Summary: Python API for Physics-Lab-AR
 Home-page: https://gitee.com/script2000/physicsLab
 Author: Goodenough

{physicslab-1.4.8 → physicslab-1.4.9}/setup.py

@@ -3,7 +3,7 @@ import setuptools
 
 setuptools.setup(
     name="physicsLab",
-    version="1.4.8",
+    version="1.4.9",
     license="MIT",
     author="Goodenough",
     author_email="2381642961@qq.com",