physicsLab 1.4.7__tar.gz → 1.4.8__tar.gz

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

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

{physicslab-1.4.7 → physicslab-1.4.8}/physicsLab/__init__.py

@@ -29,8 +29,8 @@ if platform.system() == "Windows":
     if not os.path.exists(Experiment.FILE_HEAD):
         raise RuntimeError("The folder does not exist, try launching Physics-Lab-AR and try it out")
 else:
-    if not os.path.exists("physicsLabSav"):
-        os.mkdir("physicsLabSav")
+    if not os.path.exists(Experiment.FILE_HEAD):
+        os.mkdir(Experiment.FILE_HEAD)
 
 # 获取 Physics-Lab-AR 版本
 def get_Physics_Lab_AR_version() -> Optional[str]:

{physicslab-1.4.7 → physicslab-1.4.8}/physicsLab/circuit/elements/_elementBase.py

@@ -95,8 +95,6 @@ class CircuitBase(ElementBase, metaclass=CircuitMeta):
         if elementXYZ is True or _elementXYZ.is_elementXYZ() is True and elementXYZ is None:
             x, y, z = _elementXYZ.xyzTranslate(x, y, z, self.is_bigElement)
             self.is_elementXYZ = True
-            # if self.is_bigElement:
-            #     x, y, z = _elementXYZ.amend_big_Element(x, y, z)
 
         for _, self_list in stack_Experiment.top().elements_Position.items():
             if self in self_list:

{physicslab-1.4.7 → physicslab-1.4.8}/physicsLab/circuit/wire.py

@@ -2,7 +2,7 @@
 from physicsLab import errors
 from physicsLab.experiment import get_Experiment
 from physicsLab.experimentType import experimentType
-from physicsLab.typehint import WireDict, Optional
+from physicsLab.typehint import WireDict, Optional, Callable
 
 # 电学元件引脚类, 模电元件引脚无明确的输入输出之分, 因此用这个
 class Pin:
@@ -56,9 +56,12 @@ class Wire:
         if not isinstance(Source, Pin) or not isinstance(Target, Pin):
             raise TypeError
 
-        if Source.element_self.experiment != Target.element_self.experiment:
+        if Source.element_self.experiment is not Target.element_self.experiment:
             raise errors.ExperimentError("can't link wire in two experiment")
 
+        if Source == Target:
+            raise errors.ExperimentError()
+
         if color in ("black", "blue", "red", "green", "yellow"):
             color = {"black": "黑", "blue": "蓝", "red": "红", "green": "绿", "yellow": "黄"}[color]
         if color not in ('蓝', '绿', '黄', '红', '紫'):
@@ -101,7 +104,7 @@ class Wire:
         }
 
 # 检查函数参数是否是导线
-def _check_typeWire(func: callable):
+def _check_typeWire(func: Callable):
     def result(SourcePin: Pin, TargetPin: Pin, *args, **kwargs) -> None:
         if not (
                 isinstance(SourcePin, Pin) and

{physicslab-1.4.7 → physicslab-1.4.8}/physicsLab/element.py

@@ -9,8 +9,6 @@ from physicsLab.experiment import stack_Experiment
 from physicsLab.typehint import numType, Optional, Union, List
 from physicsLab.circuit.elements._elementBase import CircuitBase
 
-NnumType = Optional[numType]
-
 def crt_Element(name: str,
                 x: numType = 0,
                 y: numType = 0,
@@ -39,11 +37,11 @@ def crt_Element(name: str,
         return eval(f"elements.{name.replace(' ', '_').replace('-', '_')}"
                     f"({x}, {y}, {z}, {elementXYZ}, *{args}, **{kwargs})")
 
-def get_Element(x: NnumType=None,
-                y: NnumType=None,
-                z: NnumType=None,
+def get_Element(x: Optional[numType] = None,
+                y: Optional[numType] = None,
+                z: Optional[numType] = None,
                 *,
-                index: NnumType=None,
+                index: Optional[numType] = None,
                 **kwargs
 ) -> Union[CircuitBase, List[CircuitBase]]:
     ''' 获取对应坐标的id '''

{physicslab-1.4.7 → physicslab-1.4.8}/physicsLab/experiment.py

@@ -45,10 +45,15 @@ def get_Experiment() -> "Experiment":
 
 class Experiment:
     ''' 实验（存档）类 '''
-    FILE_HEAD = "physicsLabSav"
     if platform.system() == "Windows":
         from getpass import getuser
         FILE_HEAD = f"C:/Users/{getuser()}/AppData/LocalLow/CIVITAS/Quantum Physics/Circuit"
+    else:
+        _home = os.environ.get('PHYSICSLAB_HOME_PATH')
+        if _home is None:
+            FILE_HEAD = "physicsLabSav"
+        else:
+            FILE_HEAD = f"{_home}/physicsLabSav"
 
     def __init__(self, sav_name: Optional[str] = None) -> None:
         self.is_open_or_crt: bool = False

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

@@ -14,7 +14,6 @@ from physicsLab.typehint import Optional, Union, List, Iterator, Dict, Self, num
 
 def _format_velocity(velocity: float) -> float:
     velocity = min(1, velocity)
-    velocity = max(0.05, velocity)
 
     return velocity
 
@@ -188,31 +187,35 @@ class Midi:
         return self
 
     # 返回 [Note(...), Chord(...), ...]
-    def _get_notes_list(self, div_time: numType, max_notes: Optional[int]) -> List[Union["Note", "Chord"]]:
-        res: List[Union[Note, Chord]] = []
+    def _get_notes_list(self,
+                        div_time: numType, max_notes: Optional[int],
+                        is_fix_strange_note: bool = False,
+                        ) -> List[Union["Note", "Chord"]]:
 
+        res: List[Union[Note, Chord]] = []
         wait_time: int = 0
         len_res: int = 0
+
         for msg in self.messages:
-            if msg.type == "note_on": # type: ignore -> Message/MetaMessage must have attr type
+            if msg.type == "note_on":
+                velocity: float = _format_velocity(msg.velocity / 127) # 音符的响度
+                ins: int = self.channels[msg.channel]
+
+                if velocity == 0 or (is_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)
 
-                velocity = _format_velocity(msg.velocity / 127) # 音符的响度
-
                 if note_time != 0 or len(res) == 0:
                     if note_time == 0:
                         note_time = 1
-                    res.append(
-                        Note(note_time,
-                             instrument=self.channels[msg.channel],
-                             pitch=msg.note, velocity=velocity)
-                    )
+                    res.append(Note(time=note_time, instrument=ins, pitch=msg.note, velocity=velocity))
                 else:
                     # res[-1]是`Note`或`Chord`且在赋值之后一定是Chord, 此时Note的time的值不重要(因为和弦的音符是同时播放的)
-                    res[-1] = res[-1].append(
-                        Note(time=1, instrument=self.channels[msg.channel], pitch=msg.note, velocity=velocity)
-                    )
+                    res[-1] = res[-1].append(Note(time=1, instrument=ins, pitch=msg.note, velocity=velocity))
                 wait_time = 0
             elif msg.time != 0:
                 wait_time += msg.time
@@ -222,9 +225,15 @@ class Midi:
 
         return res
 
-    # 转换为physicsLab的piece类
-    def to_piece(self, div_time: numType = 100, max_notes: Optional[int] = 800) -> "Piece":
-        return Piece(self._get_notes_list(div_time, max_notes))
+    def to_piece(self,
+                 div_time: numType = 100,
+                 max_notes: Optional[int] = 800,
+                 is_optimize: bool = True, # 是否将多个音符优化为和弦
+                 is_fix_strange_note: bool = False, # 是否修正一些奇怪的音符
+                 ) -> "Piece":
+        ''' 转换为Piece类 '''
+        return Piece(self._get_notes_list(div_time, max_notes, is_fix_strange_note),
+                     is_optimize=is_optimize)
 
     ''' *.pl.py文件:
         pl即为 physicsLab file
@@ -238,8 +247,8 @@ class Midi:
         而且是个Py文件, 大家想要自己修改也是很方便的
     '''
 
-    # 导出一个 .mido.py 文件
     def write_midopy(self, path: str="temp.mido.py") -> Self:
+        ''' 导出一个 .mido.py 文件 '''
         if not path.endswith(".mido.py"):
             path += ".mido.py"
 
@@ -297,9 +306,9 @@ class Midi:
 
         return self
 
-# 音符类
 # TODO 增加更多的设置pitch的方法 -> 参考Simple_Instrument
 class Note:
+    ''' 音符类 '''
     def __init__(self,
                  time: int, # 间隔多少时间才播放此Note
                  playTime: int = 1,  # 音符发出声音的时长 暂时不支持相关机制
@@ -330,8 +339,8 @@ class Note:
     def append(self, other: "Note") -> "Chord":
         return Chord(self, other, time=self.time)
 
-# 和弦类
 class Chord:
+    ''' 和弦类 '''
     def __init__(self, *notes: Note, time: int) -> None:
         if len(notes) < 1 or time < 1:
             raise TypeError
@@ -384,30 +393,50 @@ class Chord:
                 x: numType = 0,
                 y: numType = 0,
                 z: numType = 0,
-                elementXYZ: Optional[bool] = None
-    ) -> elements.Simple_Instrument:
+                elementXYZ: Optional[bool] = None,
+                is_optimize: bool = True,
+                ) -> elements.Simple_Instrument:
         # 元件坐标系，如果输入坐标不是元件坐标系就强转为元件坐标系
         if not (elementXYZ is True or (_elementXYZ.is_elementXYZ() is True and elementXYZ is None)):
             x, y, z = _elementXYZ.translateXYZ(x, y, z)
         x, y, z = roundData(x, y, z) # type: ignore -> result type: tuple
 
-        first_ins = None # 第一个音符
-        for delta_z, ins in enumerate(self.ins_notes):
-            notes: List[Note] = self.ins_notes[ins]
-            temp: elements.Simple_Instrument = elements.Simple_Instrument(
-                x, y, z + delta_z, elementXYZ=True,instrument=ins,
-                pitch=notes[0].pitch, is_ideal_model=True, velocity=self._get_velocity(notes, is_average=True)
-            ).set_Rotation(0, 0, 0)
-            if first_ins is None:
-                first_ins = temp
-            else:
-                temp.i - first_ins.i
-                temp.o - first_ins.o
+        first_ins: Optional[elements.Simple_Instrument] = None # 第一个音符
+        if is_optimize:
+            for delta_z, ins in enumerate(self.ins_notes):
+                notes: List[Note] = self.ins_notes[ins]
+                temp: elements.Simple_Instrument = elements.Simple_Instrument(
+                    x, y, z + delta_z, elementXYZ=True,instrument=ins,
+                    pitch=notes[0].pitch, is_ideal_model=True, velocity=self._get_velocity(notes, is_average=True)
+                ).set_Rotation(0, 0, 0)
+
+                if first_ins is None:
+                    first_ins = temp
+                else:
+                    temp.i - first_ins.i
+                    temp.o - first_ins.o
 
-            for a_note in notes:
-                temp.add_note(a_note.pitch) # type: ignore
+                for a_note in notes:
+                    temp.add_note(a_note.pitch)
+        else:
+            delta_z = 0
+            for ins, notes in self.ins_notes.items():
+                for a_note in notes:
+                    temp = elements.Simple_Instrument(
+                        x, y, z + delta_z, elementXYZ=True,instrument=ins,
+                        pitch=a_note.pitch, is_ideal_model=True, velocity=a_note.velocity
+                    ).set_Rotation(0, 0, 0)
+
+                    if first_ins is None:
+                        first_ins = temp
+                    else:
+                        temp.i - first_ins.i
+                        temp.o - first_ins.o
 
-        return first_ins # type: ignore -> first_ins 不会是None
+                    delta_z += 1
+
+        assert first_ins is not None
+        return first_ins
 
 # 循环类，用于创建一段循环的音乐片段
 # TODO: 完善Loop存储的数据结构
@@ -437,38 +466,36 @@ class Loop:
     def __next__(self):
         pass
 
-# 乐曲类
+class Rest_symbol:
+    ''' 休止符 '''
+    __singleton: Optional[Self] = None
+    def __new__(cls) -> Self:
+        if cls.__singleton is None:
+            cls.__singleton = super().__new__(cls)
+        return cls.__singleton
+
 class Piece:
+    ''' 乐曲类 '''
     def __init__(self,
                  notes: Optional[List[Union[Note, Chord]]] = None, # TODO: support Loop
-                 # 设置整个音轨的默认参数 Track global variable
-                 instrument: int = 0, # 演奏的乐器，暂时只支持传入数字
-                 pitch: int = 60, # 音高/音调
-                 bpm: int = 100, # 节奏
-                 volume: float = 1.0 # 音量/响度
-    ) -> None:
-        if not (
-                isinstance(instrument, int) and
-                isinstance(pitch, int) and
-                isinstance(bpm, int) and
-                0 < volume <= 1
-        ) or (
-            ( not isinstance(notes, (list, Loop))
+                 is_optimize: bool = True, # 是否将多个音符优化为和弦
+                 ) -> None:
+        if (
+            ( not isinstance(notes, list)
             or not all(isinstance(val, (Note, Chord)) for val in notes) )
             and notes is not None
         ):
             raise TypeError
 
-        if notes is None:
-            notes = []
+        self.is_optimize = is_optimize
 
-        self.instrument = instrument
-        self.pitch = pitch
-        self.bpm = bpm
-        self.volume = volume
-        self.notes: List[Optional[Union[Note, Chord]]] = []
-        for a_note in notes:
-            self.append(a_note)
+        # self.notes会将Note与Chord中用time表示的休止符展开为Rest_symbol
+        if notes is None:
+            self.notes = []
+        else:
+            self.notes: List[Union[Note, Chord, Rest_symbol]] = []
+            for a_note in notes:
+                self.append(a_note)
 
     # 向Piece类添加数据成员
     def append(self, other: Union[Note, Chord]) -> Self:
@@ -476,7 +503,7 @@ class Piece:
             raise TypeError
 
         while other.time > 1:
-            self.notes.append(None)
+            self.notes.append(Rest_symbol())
             other.time -= 1
         self.notes.append(other)
         return self
@@ -521,7 +548,7 @@ class Piece:
          # 500_000 / 100, 500_000是Midi.tempo的默认数字，100是self.bpm的默认数字
         track.append(mido.MetaMessage("set_tempo", tempo=self.bpm * 5000, time=0))
         for a_note in self.notes:
-            if a_note is None:
+            if isinstance(a_note, Rest_symbol):
                 none_counter += 1
             elif isinstance(a_note, Chord):
                 for note_list in a_note.ins_notes.values():
@@ -547,7 +574,7 @@ class Piece:
 
     # 将Piece转换为物实对应的电路
     def release(self, x: numType = 0, y: numType = 0, z: numType = 0, elementXYZ = None) -> "Player":
-        return Player(self, x, y, z, elementXYZ)
+        return Player(self, x, y, z, elementXYZ, self.is_optimize)
 
     # Piece中所有Notes与Chord的数量
     def count_notes(self) -> int:
@@ -560,7 +587,7 @@ class Piece:
     def __len__(self) -> int:
         return len(self.notes)
 
-    def __getitem__(self, item: int) -> Optional[Union[Note, Chord]]:
+    def __getitem__(self, item: int) -> Union[Note, Chord, Rest_symbol]:
         if not isinstance(item, int):
             raise TypeError
         return self.notes[item]
@@ -587,8 +614,9 @@ class Player:
                  x: numType = 0,
                  y: numType = 0,
                  z: numType = 0,
-                 elementXYZ = None
-    ) -> None:
+                 elementXYZ = None,
+                 is_optimize: bool = True,
+                 ) -> None:
         from physicsLab.element import count_Elements
         count_elements_start: int = count_Elements()
 
@@ -604,9 +632,9 @@ class Player:
             x, y, z = _elementXYZ.translateXYZ(x, y, z)
 
         # 给乐器增加休止符
-        while musicArray.notes[-1] is None:
+        while isinstance(musicArray.notes[-1], Rest_symbol):
             musicArray.notes.pop()
-        while musicArray.notes[0] is None:
+        while isinstance(musicArray.notes[0], Rest_symbol):
             musicArray.notes.pop(0)
 
         len_musicArray: int = len(musicArray)
@@ -661,7 +689,7 @@ class Player:
         # main
         xcor, ycor = -1, 0
         for a_note in musicArray:
-            if a_note is None:
+            if isinstance(a_note, Rest_symbol):
                 xcor += 1
                 if xcor == side:
                     xcor = 0
@@ -675,7 +703,7 @@ class Player:
                 xcor = 0
                 ycor += 2
             if isinstance(a_note, Chord):
-                ins = a_note.release(1 + x + xcor,  4 + y + ycor, z, elementXYZ=True)
+                ins = a_note.release(1 + x + xcor,  4 + y + ycor, z, elementXYZ=True, is_optimize=is_optimize)
             elif isinstance(a_note, Note):
                 ins = elements.Simple_Instrument(
                     1 + x + xcor, 4 + y + ycor, z, pitch=a_note.pitch,

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

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

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

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