physicsLab 1.4.6__tar.gz → 1.4.8__tar.gz

{physicsLab-1.4.6 → physicslab-1.4.8}/PKG-INFO

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

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

@@ -17,8 +17,8 @@ from .element import *
 # `physicsLab`自定义异常类
 from .errors import *
 # 模块化电路
-from .unit.wires import *
-from physicsLab import unit
+from .lib.wires import *
+from physicsLab import lib
 from physicsLab import music
 
 # 检测操作系统
@@ -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]:
@@ -61,7 +61,7 @@ __all__ = [
 
     # errors.py
     "OpenExperimentError", "WireColorError", "WireNotFoundError", "bitLengthError",
-    "experimentExistError", "ExperimentTypeError", "getElementError", "crtExperimentFailError",
+    "experimentExistError", "ExperimentTypeError", "ElementNotFound", "crtExperimentFailError",
     "ExperimentError", "set_warning_status", "WarningError", "ElementNotExistError",
 
     # experiment.py
@@ -89,7 +89,7 @@ __all__ = [
     "Resistance_Law", "Solenoid",
 
     # unionElements
-    "unit", "music",
+    "lib", "music",
 
     # wires.py
     "crt_Wires", "del_Wires",

{physicsLab-1.4.6 → physicslab-1.4.8}/physicsLab/circuit/elementXYZ.py

@@ -24,25 +24,22 @@ def is_elementXYZ() -> bool:
     return get_Experiment().is_elementXYZ
 
 # 物实坐标系x, y, z单位1
-_xUnit: numType = 0.16
-_yUnit: numType = 0.08
-_zUnit: numType = 0.1
+_X_UNIT: float = 0.16
+_Y_UNIT: float = 0.08
+_Z_UNIT: float = 0.1
 # big_element坐标修正
-_yAmend = 0.045
+_Y_AMEND = 0.045
 
-# 元件坐标系原点
-_xOrigin, _yOrigin, _zOrigin = 0, 0, 0
-
-### end define ###
-
-# 将元件坐标系转换为物实支持的坐标系
 def xyzTranslate(x: numType, y: numType, z: numType, is_bigElement: bool = False):
+    ''' 将元件坐标系转换为物实支持的坐标系 '''
     if get_Experiment().ExperimentType != experimentType.Circuit:
         raise errors.ExperimentTypeError
 
-    x *= _xUnit
-    y *= _yUnit
-    z *= _zUnit
+    _xOrigin, _yOrigin, _zOrigin = get_OriginPosition()
+
+    x *= _X_UNIT
+    y *= _Y_UNIT
+    z *= _Z_UNIT
     # 修改元件坐标系原点
     x += _xOrigin
     y += _yOrigin
@@ -51,21 +48,23 @@ def xyzTranslate(x: numType, y: numType, z: numType, is_bigElement: bool = False
         x, y, z = amend_big_Element(x, y, z)
     return x, y, z
 
-# 将物实支持的坐标系转换为元件坐标系
 def translateXYZ(x: numType, y: numType, z: numType, is_bigElement: bool = False):
+    ''' 将物实支持的坐标系转换为元件坐标系 '''
     if get_Experiment().ExperimentType != experimentType.Circuit:
         raise errors.ExperimentTypeError
 
-    x /= _xUnit
-    y /= _yUnit
-    z /= _zUnit
+    _xOrigin, _yOrigin, _zOrigin = get_OriginPosition()
+
+    x /= _X_UNIT
+    y /= _Y_UNIT
+    z /= _Z_UNIT
     # 修改元件坐标系原点
     x -= _xOrigin
     y -= _yOrigin
     z -= _zOrigin
     # 修改大体积逻辑电路原件的坐标
     if is_bigElement:
-        y -= _yAmend
+        y -= _Y_AMEND
     return x, y, z
 
 # 设置元件坐标系原点O，输入值为物实坐标系
@@ -81,11 +80,11 @@ def set_O(x: numType, y: numType, z: numType) -> None:
 
 # 修正bigElement的坐标
 def amend_big_Element(x: numType, y: numType, z: numType):
-    return x, y + _yAmend, z
+    return x, y + _Y_AMEND, z
 
 # 获取坐标原点
 def get_OriginPosition() -> position:
-    return position(_xOrigin, _yOrigin, _zOrigin)
+    return get_Experiment().elementXYZ_origin_position
 
 # 输入"x" 返回_xUnit
 # 输入"y", "z" 返回_yUnit, _zUnit
@@ -94,9 +93,9 @@ def get_xyzUnit(*args):
         raise TypeError
 
     index = {
-        "x": _xUnit,
-        "y": _yUnit,
-        "z": _zUnit
+        "x": _X_UNIT,
+        "y": _Y_UNIT,
+        "z": _Z_UNIT
     }
     if len(args) == 1:
         return index[args[0]]

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

@@ -2,20 +2,18 @@
 import inspect
 
 from physicsLab import errors
+from physicsLab import _tools
 from physicsLab.circuit import wire
 from physicsLab.elementBase import ElementBase
 import physicsLab.circuit.elementXYZ as _elementXYZ
 
 from physicsLab.experimentType import experimentType
 from physicsLab.typehint import Optional, Self, numType
-from physicsLab._tools import roundData, randString, position
+from physicsLab._tools import roundData, randString
 from physicsLab.experiment import Experiment, stack_Experiment
 
 # electricity class's metaClass
 class CircuitMeta(type):
-    # element index
-    __index = 1
-
     def __call__(cls,
                  x: numType = 0,
                  y: numType = 0,
@@ -31,6 +29,7 @@ class CircuitMeta(type):
         ):
             raise TypeError('illegal argument')
         _Expe: Experiment = stack_Experiment.top()
+        self.experiment = _Expe
 
         if _Expe.ExperimentType != experimentType.Circuit:
             raise errors.ExperimentTypeError
@@ -40,9 +39,9 @@ class CircuitMeta(type):
             cls.is_bigElement = property(lambda self: False) # 2体积元件
 
         x, y, z = roundData(x, y, z) # type: ignore -> result type: tuple
-        self._position = position(x, y, z) # type: ignore -> define _arguments in metaclass
+        self._position = _tools.position(x, y, z) # type: ignore -> define _arguments in metaclass
         # 元件坐标系
-        if elementXYZ is True or (_elementXYZ.is_elementXYZ() is True and elementXYZ is None):
+        if elementXYZ is True or _elementXYZ.is_elementXYZ() is True and elementXYZ is None:
             x, y, z = _elementXYZ.xyzTranslate(x, y, z)
             self.is_elementXYZ = True
 
@@ -51,7 +50,7 @@ class CircuitMeta(type):
         if self.is_elementXYZ and self.is_bigElement:
             x, y, z = _elementXYZ.amend_big_Element(x, y, z)
 
-        self._arguments["Identifier"] = f"pl{CircuitBase.__index}"
+        self._arguments["Identifier"] = randString(32)
         # x, z, y 物实采用欧拉坐标系
         self._arguments["Position"] = f"{x},{z},{y}"
 
@@ -61,17 +60,14 @@ class CircuitMeta(type):
         else:
             _Expe.elements_Position[self._position] = [self]
         self.set_Rotation()
-        # 通过元件生成顺序来索引元件
-        self._index = CircuitMeta.__index
+
         _Expe.Elements.append(self)
-        # 元件index索引加1
-        CircuitMeta.__index += 1
+
         return self
 
 # 所有电学元件的父类
 class CircuitBase(ElementBase, metaclass=CircuitMeta):
     def __repr__(self) -> str:
-        #TODO Simple_Instrument 的__repr__方法参数更多
         return f"{self.__class__.__name__}" \
                f"({self._position.x}, {self._position.y}, {self._position.z}, {self.is_elementXYZ})"
 
@@ -82,7 +78,7 @@ class CircuitBase(ElementBase, metaclass=CircuitMeta):
                 isinstance(yRotation, (int, float)) and
                 isinstance(zRotation, (int, float))
         ):
-            raise RuntimeError('illegal argument')
+            raise TypeError
 
         self._arguments["Rotation"] = f"{roundData(xRotation)},{roundData(zRotation)},{roundData(yRotation)}"
         return self
@@ -90,26 +86,29 @@ class CircuitBase(ElementBase, metaclass=CircuitMeta):
     # 重新设置元件的坐标
     def set_Position(self, x: numType, y: numType, z: numType, elementXYZ: Optional[bool] = None) -> Self:
         if not (isinstance(x, (int, float)) and isinstance(y, (int, float)) and isinstance(z, (int, float))):
-            raise RuntimeError('illegal argument')
+            raise TypeError
         x, y, z = roundData(x, y, z) # type: ignore -> result type: tuple
 
+        self._position = _tools.position(x, y, z)
+
         #元件坐标系
-        if elementXYZ is True or (_elementXYZ.is_elementXYZ() is True and elementXYZ is None):
-            x, y, z = _elementXYZ.xyzTranslate(x, y, z)
+        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
 
-        del stack_Experiment.top().elements_Position[self._position]
-        self._position = position(x, y, z) # type: ignore -> define _arguments in metaclass
+        for _, self_list in stack_Experiment.top().elements_Position.items():
+            if self in self_list:
+                self_list.remove(self)
+
         self._arguments['Position'] = f"{x},{z},{y}" # type: ignore -> define _arguments in metaclass
-        stack_Experiment.top().elements_Position[self._position] = self
-        return self
 
-    # 格式化坐标参数，主要避免浮点误差
-    def format_Position(self) -> tuple:
-        if not isinstance(self._position, tuple) or self._position.__len__() != 3:
-            raise RuntimeError("Position must be a tuple of length three but gets some other value")
-        self._position = position(*roundData(self._position.x, self._position.y, self._position.z))
-        return self._position
+        _Expe = stack_Experiment.top()
+        if self._position in _Expe.elements_Position.keys():
+            _Expe.elements_Position[self._position].append(self)
+        else:
+            _Expe.elements_Position[self._position] = [self]
+
+        return self
 
     # 获取原件的坐标
     def get_Position(self) -> tuple:
@@ -117,7 +116,7 @@ class CircuitBase(ElementBase, metaclass=CircuitMeta):
 
     # 获取元件的index（每创建一个元件，index就加1）
     def get_Index(self) -> int:
-        return self._index # type: ignore -> define self._index in metaclass
+        return self.experiment.Elements.index(self) + 1
 
     # 获取子类的类型（也就是ModelID）
     @property

{physicsLab-1.4.6 → 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:
@@ -28,7 +28,7 @@ class Pin:
     def export_str(self) -> str:
         pin_name = self._get_pin_name_of_class()
         if pin_name is None:
-            raise RuntimeError("Pin is not belong to any element")
+            raise errors.ExperimentError("Pin is not belong to any element")
         return f"e{self.element_self.get_Index()}.{pin_name}"
 
     def _get_pin_name_of_class(self) -> Optional[str]:
@@ -56,6 +56,12 @@ class Wire:
         if not isinstance(Source, Pin) or not isinstance(Target, Pin):
             raise TypeError
 
+        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 ('蓝', '绿', '黄', '红', '紫'):
@@ -98,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.6 → physicslab-1.4.8}/physicsLab/element.py

@@ -9,76 +9,84 @@ 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, z: numType = 0, elementXYZ: Optional[bool] = None
+def crt_Element(name: str,
+                x: numType = 0,
+                y: numType = 0,
+                z: numType = 0,
+                elementXYZ: Optional[bool] = None,
+                *args,
+                **kwargs
 ) -> CircuitBase:
+    ''' 创建原件，本质上仍然是实例化 '''
     if not (isinstance(name, str)
             and isinstance(x, (int, float))
             and isinstance(y, (int, float))
             and isinstance(z, (int, float))
     ):
-        raise RuntimeError("Wrong parameter type")
+        raise TypeError
 
     name = name.strip()
-    # 元件坐标系
-    if elementXYZ is True or (_elementXYZ.is_elementXYZ() is True and elementXYZ is None):
-        x, y, z = _elementXYZ.xyzTranslate(x, y, z)
     x, y, z = _tools.roundData(x, y, z) # type: ignore
     if (name == '555 Timer'):
-        return elements.NE555(x, y, z)
+        return elements.NE555(x, y, z, elementXYZ)
     elif (name == '8bit Input'):
-        return elements.eight_bit_Input(x, y, z)
+        return elements.eight_bit_Input(x, y, z, elementXYZ)
     elif (name == '8bit Display'):
-        return elements.eight_bit_Display(x, y, z)
+        return elements.eight_bit_Display(x, y, z, elementXYZ)
     else:
-        return eval(f"elements.{name.replace(' ', '_').replace('-', '_')}({x},{y},{z})")
-
-# 获取对应坐标的self
-def get_Element(
-    x: NnumType=None, y: NnumType=None, z: NnumType=None, *, index: NnumType=None
+        return eval(f"elements.{name.replace(' ', '_').replace('-', '_')}"
+                    f"({x}, {y}, {z}, {elementXYZ}, *{args}, **{kwargs})")
+
+def get_Element(x: Optional[numType] = None,
+                y: Optional[numType] = None,
+                z: Optional[numType] = None,
+                *,
+                index: Optional[numType] = None,
+                **kwargs
 ) -> Union[CircuitBase, List[CircuitBase]]:
+    ''' 获取对应坐标的id '''
     # 通过坐标索引元件
-    def position_Element(x: numType, y: numType, z: numType):
+    def position_get(x: numType, y: numType, z: numType):
         if not (
             isinstance(x, (int, float))
             and isinstance(y, (int, float))
             and isinstance(z, (int, float))
         ):
-            raise TypeError('illegal argument')
+            raise TypeError
 
         position = _tools.roundData(x, y, z)
         if position not in _Expe.elements_Position.keys():
-            raise errors.ElementNotExistError(f"{position} do not exist")
+            if "defualt" in kwargs:
+                return kwargs["defualt"]
+            raise errors.ElementNotFound(f"{position} do not exist")
 
         result: list = _Expe.elements_Position[position]
         return result[0] if len(result) == 1 else result
 
     # 通过index（元件生成顺序）索引元件
-    def index_Element(index: int):
+    def index_get(index: int):
         if not isinstance(index, int):
             raise TypeError
 
         if 0 < index <= len(_Expe.Elements):
             return _Expe.Elements[index - 1]
         else:
-            raise errors.getElementError
+            if "defualt" in kwargs:
+                return kwargs["defualt"]
+            raise errors.ElementNotFound
 
     _Expe = stack_Experiment.top()
     if None not in [x, y, z]:
-        return position_Element(x, y, z)
+        return position_get(x, y, z)
     elif index is not None:
-        return index_Element(index)
+        return index_get(index)
     else:
         raise TypeError
 
-# 删除原件
 def del_Element(
         self: CircuitBase # self是物实三大实验支持的所有元件
 ) -> None:
-
+    ''' 删除原件 '''
     if not isinstance(self, CircuitBase):
         raise TypeError
 

{physicsLab-1.4.6 → physicslab-1.4.8}/physicsLab/errors.py

@@ -60,7 +60,7 @@ class ExperimentTypeError(Exception):
         return "The type of experiment does not match the element"
 
 # 用于get_Element 获取元件引用失败
-class getElementError(Exception):
+class ElementNotFound(Exception):
     def __str__(self):
         return "Index out of range"
 

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

@@ -13,7 +13,6 @@ from .savTemplate import Generate
 from .experimentType import experimentType
 from .typehint import Union, Optional, List, Dict, numType, Self
 
-# 最新被操作的存档
 class stack_Experiment:
     data: List["Experiment"] = []
 
@@ -40,36 +39,41 @@ class stack_Experiment:
         cls.data.pop()
         return res
 
-# 获取当前正在操作的存档
 def get_Experiment() -> "Experiment":
+    ''' 获取当前正在操作的存档 '''
     return stack_Experiment.top()
 
-# 实验（存档）类
 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
         self.is_open: bool = False
         self.is_crt: bool = False
         self.is_read: bool = False
-        self.is_elementXYZ: bool = False
 
         self.FileName: Optional[str] = None # 存档的文件名
         self.SavPath: Optional[str] = None # 存档的完整路径, 为 f"{experiment.FILE_HEAD}/{self.FileName}"
         # 通过坐标索引元件
         self.elements_Position: Dict[tuple, list] = {}  # key: self._position, value: List[self...]
         # 通过index（元件生成顺序）索引元件
-        self.Elements: list = [] # List[CircuitBase]
+        from .circuit.elements._elementBase import CircuitBase
+        self.Elements: List[CircuitBase] = []
 
         if sav_name is not None:
             self.open_or_crt(sav_name)
 
-    # 通过_arguments["Identifier"]获取元件
     def get_element_from_identifier(self, identifier: str):
+        ''' 通过_arguments["Identifier"]获取元件 '''
         for element in self.Elements:
             if element._arguments["Identifier"] == identifier:
                 return element
@@ -93,6 +97,9 @@ class Experiment:
             self.PlSav["Summary"] = savTemplate.Circuit["Summary"]
 
         if self.ExperimentType == experimentType.Circuit:
+            self.is_elementXYZ: bool = False
+            # 元件坐标系的坐标原点
+            self.elementXYZ_origin_position: _tools.position = _tools.position(0, 0, 0)
             self.Wires: set = set() # Set[Wire] # 存档对应的导线
             # 存档对应的StatusSave, 存放实验元件，导线（如果是电学实验的话）
             self.StatusSave: dict = {"SimulationSpeed": 1.0, "Elements": Generate, "Wires": Generate}
@@ -105,8 +112,8 @@ class Experiment:
         elif self.ExperimentType == experimentType.Electromagnetism:
             self.StatusSave: dict = {"SimulationSpeed": 1.0, "Elements": []}
 
-    # 打开一个指定的sav文件 (支持输入本地实验的名字或sav文件名)
     def open(self, sav_name : str) -> Self:
+        ''' 打开一个指定的sav文件 (支持输入本地实验的名字或sav文件名) '''
         if self.is_open_or_crt:
             raise errors.experimentExistError
         self.is_open_or_crt = True
@@ -147,6 +154,9 @@ class Experiment:
         self.SavPath = f"{Experiment.FILE_HEAD}/{self.FileName}"
 
         if self.ExperimentType == experimentType.Circuit:
+            self.is_elementXYZ: bool = False
+            # 元件坐标系的坐标原点
+            self.elementXYZ_origin_position: _tools.position = _tools.position(0, 0, 0)
             self.PlSav: dict = copy.deepcopy(savTemplate.Circuit)
             self.Wires: set = set() # Set[Wire] # 存档对应的导线
             # 存档对应的StatusSave, 存放实验元件，导线（如果是电学实验的话）
@@ -181,12 +191,15 @@ class Experiment:
 
         self.entitle(sav_name)
 
-    # 创建存档，输入为存档名 sav_name: 存档名; experiment_type: 实验类型; force_crt: 不论实验是否已经存在,强制创建
     def crt(self,
             sav_name: str,
             experiment_type: experimentType = experimentType.Circuit,
             force_crt: bool=False
     ) -> Self:
+        ''' 创建存档，输入为存档名 sav_name: 存档名;
+            experiment_type: 实验类型;
+            force_crt: 不论实验是否已经存在,强制创建
+        '''
         if self.is_open_or_crt:
             raise errors.experimentExistError
         self.is_open_or_crt = True
@@ -208,11 +221,11 @@ class Experiment:
         self.__crt(sav_name, experiment_type)
         return self
 
-    # 先尝试打开实验, 若失败则创建实验
     def open_or_crt(self,
                     savName: str,
                     experimentType: experimentType = experimentType.Circuit
     ) -> Self:
+        ''' 先尝试打开实验, 若失败则创建实验 '''
         if self.is_open_or_crt:
             raise errors.experimentExistError
         self.is_open_or_crt = True
@@ -230,8 +243,8 @@ class Experiment:
             self.__crt(savName, experimentType)
         return self
 
-    # 读取实验已有状态
     def read(self) -> Self:
+        ''' 读取实验已有状态 '''
         if self.SavPath is None: # 是否已.open()或.crt()
             raise TypeError
         if self.is_read:
@@ -279,34 +292,47 @@ class Experiment:
             obj.set_Rotation(r_x, r_y, r_z)
             obj._arguments['Identifier'] = element['Identifier']
             from .circuit.elements.logicCircuit import Logic_Input, eight_bit_Input
-            # 如果obj是逻辑输入
+            from .circuit.elements.basicCircuit import Simple_Switch, SPDT_Switch, DPDT_Switch, Air_Switch
+
             if isinstance(obj, Logic_Input) and element['Properties'].get('开关') == 1:
                 obj.set_highLevel()
-            # 如果obj是8位输入器
+
             elif isinstance(obj, eight_bit_Input):
                 obj._arguments['Statistics'] = element['Statistics']
                 obj._arguments['Properties']['十进制'] = element['Properties']['十进制']
 
+            elif isinstance(obj, Simple_Switch) and element["Properties"]["开关"] == 1:
+                obj.turn_on_switch()
+
+            elif isinstance(obj, Air_Switch) and element["Properties"]["开关"] == 1:
+                obj.turn_on_switch()
+
+            elif isinstance(obj, SPDT_Switch) or isinstance(obj, DPDT_Switch):
+                if element["Properties"]["开关"] == 1:
+                    obj.left_turn_on_switch()
+                elif element["Properties"]["开关"] == 2:
+                    obj.right_turn_on_switch()
+
         # 导线
         if self.ExperimentType == experimentType.Circuit:
             from .circuit.wire import Wire, Pin
-            self.Wires = [
-                Wire(
-                    Pin(self.get_element_from_identifier(wire_dict["Source"]), wire_dict["SourcePin"]),
-                    Pin(self.get_element_from_identifier(wire_dict["Target"]), wire_dict["TargetPin"]),
-                    wire_dict["ColorName"][0] # e.g. "蓝"
+            for wire_dict in status_sav['Wires']:
+                self.Wires.add(
+                    Wire(
+                        Pin(self.get_element_from_identifier(wire_dict["Source"]), wire_dict["SourcePin"]),
+                        Pin(self.get_element_from_identifier(wire_dict["Target"]), wire_dict["TargetPin"]),
+                        wire_dict["ColorName"][0] # e.g. "蓝"
+                    )
                 )
-                for wire_dict in status_sav['Wires']
-            ]
 
         return self
 
-    # 以物实存档的格式导出实验
     def write(self,
               extra_filepath: Optional[str] = None,
               ln: bool = False,
               no_pop: bool = False
     ) -> Self:
+        ''' 以物实存档的格式导出实验 '''
         def _format_StatusSave(stringJson: str) -> str:
             stringJson = stringJson.replace( # format element json
                 "{\\\"ModelID', '\n      {\\\"ModelID"
@@ -331,17 +357,14 @@ class Experiment:
         self.PlSav["Experiment"]["CreationDate"] = int(time.time() * 1000)
         self.PlSav["Summary"]["CreationDate"] = int(time.time() * 1000)
 
-        self.CameraSave["VisionCenter"] = \
-            f"{self.VisionCenter.x},{self.VisionCenter.z},{self.VisionCenter.y}"
-        self.CameraSave["TargetRotation"] = \
-            f"{self.TargetRotation.x},{self.TargetRotation.z},{self.TargetRotation.y}"
+        self.CameraSave["VisionCenter"] = f"{self.VisionCenter.x},{self.VisionCenter.z},{self.VisionCenter.y}"
+        self.CameraSave["TargetRotation"] = f"{self.TargetRotation.x},{self.TargetRotation.z},{self.TargetRotation.y}"
         self.PlSav["Experiment"]["CameraSave"] = json.dumps(self.CameraSave)
 
         self.StatusSave["Elements"] = [a_element._arguments for a_element in self.Elements]
         if self.ExperimentType == experimentType.Circuit:
             self.StatusSave["Wires"] = [a_wire.release() for a_wire in self.Wires]
-        self.PlSav["Experiment"]["StatusSave"] = \
-            json.dumps(self.StatusSave, ensure_ascii=False, separators=(',', ': '))
+        self.PlSav["Experiment"]["StatusSave"] = json.dumps(self.StatusSave, ensure_ascii=False, separators=(',', ': '))
 
         context: str = json.dumps(self.PlSav, indent=2, ensure_ascii=False, separators=(',', ': '))
         if ln:
@@ -375,8 +398,8 @@ class Experiment:
 
         return self
 
-    # 删除存档
     def delete(self, warning_status: Optional[bool]=None) -> None:
+        ''' 删除存档 '''
         if self.SavPath is None:
             raise TypeError
 
@@ -399,12 +422,12 @@ class Experiment:
 
         stack_Experiment.pop()
 
-    # 退出实验而不进行任何操作
     def exit(self) -> None:
+        ''' 退出实验而不进行任何操作 '''
         stack_Experiment.pop()
 
-    # 对存档名进行重命名
     def entitle(self, sav_name: str) -> Self:
+        ''' 对存档名进行重命名 '''
         if not isinstance(sav_name, str):
             raise TypeError
 
@@ -413,8 +436,8 @@ class Experiment:
 
         return self
 
-    # 使用notepad打开改存档
     def show(self) -> Self:
+        ''' 使用notepad打开改存档 '''
         if self.SavPath is None:
             raise TypeError
 
@@ -424,15 +447,15 @@ class Experiment:
         os.popen(f'notepad {self.SavPath}')
         return self
 
-    # 生成与发布实验有关的存档内容
     def publish(self, title: Optional[str] = None, introduction: Optional[str] = None) -> Self:
-        # 发布实验时输入实验介绍
+        ''' 生成与发布实验有关的存档内容 '''
         def introduce_Experiment(introduction: Union[str, None]) -> None:
+            '''  发布实验时输入实验介绍 '''
             if introduction is not None:
                 self.PlSav['Summary']['Description'] = introduction.split('\n')
 
-        # 发布实验时输入实验标题
         def name_Experiment(title: Union[str, None]) -> None:
+            ''' 发布实验时输入实验标题 '''
             if title is not None:
                 self.PlSav['Summary']['Subject'] = title
 
@@ -441,10 +464,6 @@ class Experiment:
 
         return self
 
-    # 设置实验者的视角
-    # x, y, z : 实验者观察的坐标
-    # distance: 实验者到(x, y, z)的距离
-    # rotation: 实验者观察的角度
     def observe(self,
                 x: Optional[numType] = None,
                 y: Optional[numType] = None,
@@ -454,6 +473,11 @@ class Experiment:
                 rotation_y: Optional[numType] = None,
                 rotation_z: Optional[numType] = None
     ) -> Self:
+        ''' 设置实验者的视角
+            x, y, z : 实验者观察的坐标
+            distance: 实验者到(x, y, z)的距离
+            rotation: 实验者观察的角度
+        '''
         if self.SavPath is None:
             raise TypeError
 
@@ -493,16 +517,16 @@ class Experiment:
 
         return self
 
-    # 与物实示波器图表有关的支持
     def graph(self) -> Self:
+        ''' 与物实示波器图表有关的支持 '''
         if self.SavPath is None:
             raise TypeError
 
         pass
         return self
 
-    # 以physicsLab代码的形式导出实验
     def export(self, output_path: str = "temp.pl.py", sav_name: str = "temp") -> Self:
+        ''' 以physicsLab代码的形式导出实验 '''
         if self.SavPath is None:
             raise TypeError
 
@@ -519,8 +543,56 @@ class Experiment:
 
         return self
 
-# 仅供with时使用
+    def merge(self,
+              other: "Experiment",
+              x: numType = 0,
+              y: numType = 0,
+              z: numType = 0,
+              elementXYZ: Optional[bool] = None
+    ) -> Self:
+        ''' 合并另一实验
+            x, y, z, elementXYZ为重新设置要合并的实验的坐标系原点在self的坐标系的位置
+        '''
+        if self.SavPath is None:
+            raise TypeError
+        if other.SavPath is None:
+            raise TypeError
+
+        if self is other:
+            return self
+
+        identifier_to_element: dict = {}
+
+        for a_element in other.Elements:
+            a_element = copy.deepcopy(a_element, memo={id(a_element.experiment): self})
+            e_x, e_y, e_z = a_element.get_Position()
+            if self.ExperimentType == experimentType.Circuit:
+                from .circuit.elementXYZ import xyzTranslate, translateXYZ
+                if elementXYZ and not a_element.is_elementXYZ:
+                    e_x, e_y, e_z = translateXYZ(e_x, e_y, e_z, a_element.is_bigElement)
+                elif not elementXYZ and a_element.is_elementXYZ:
+                    e_x, e_y, e_z = xyzTranslate(e_x, e_y, e_z, a_element.is_bigElement)
+            a_element.set_Position(e_x + x, e_y + y, e_z + z, elementXYZ)
+            # set_Position已处理与elements_Position有关的操作
+            self.Elements.append(a_element)
+
+            identifier_to_element[a_element._arguments["Identifier"]] = a_element
+
+        if self.ExperimentType == experimentType.Circuit and other.ExperimentType == experimentType.Circuit:
+            for a_wire in other.Wires:
+                a_wire = copy.deepcopy(
+                    a_wire, memo={
+                        id(a_wire.Source.element_self):
+                            identifier_to_element[a_wire.Source.element_self._arguments["Identifier"]],
+                        id(a_wire.Target.element_self):
+                            identifier_to_element[a_wire.Target.element_self._arguments["Identifier"]],
+                })
+                self.Wires.add(a_wire)
+
+        return self
+
 class experiment:
+    ''' 仅提供通过with操作存档 '''
     def __init__(self,
                  sav_name: str, # 实验名(非存档文件名)
                  read: bool = False, # 是否读取存档原有状态
@@ -555,7 +627,6 @@ class experiment:
         self.force_crt = force_crt
         self.is_exit = is_exit
 
-    # 上下文管理器，搭配with使用
     def __enter__(self) -> Experiment:
         if not self.force_crt:
             self._Experiment: Experiment = Experiment().open_or_crt(self.savName, self.experimentType)
@@ -587,15 +658,15 @@ class experiment:
             self._Experiment.delete()
             return
 
-# 获取所有物实存档的文件名
 def getAllSav() -> List[str]:
+    ''' 获取所有物实存档的文件名 '''
     from os import walk
     savs = [i for i in walk(Experiment.FILE_HEAD)][0]
     savs = savs[savs.__len__() - 1]
     return [aSav for aSav in savs if aSav.endswith('sav')]
 
-# 打开一个存档, 返回存档对应的dict
 def _open_sav(sav_name) -> Optional[dict]:
+    ''' 打开一个存档, 返回存档对应的dict '''
     def encode_sav(path: str, encoding: str) -> Optional[dict]:
         try:
             with open(path, encoding=encoding) as f:
@@ -621,8 +692,8 @@ def _open_sav(sav_name) -> Optional[dict]:
             encoding = chardet.detect(f.read())["encoding"]
         return encode_sav(f"{Experiment.FILE_HEAD}/{sav_name}", encoding)
 
-# 检测实验是否存在，输入为存档名，若存在则返回存档对应的文件名，若不存在则返回None
 def search_Experiment(sav_name: str) -> Optional[str]:
+    '''  检测实验是否存在, 输入为存档名, 若存在则返回存档对应的文件名, 若不存在则返回None'''
     for aSav in getAllSav():
         sav = _open_sav(aSav)
         if sav["InternalName"] == sav_name:

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

@@ -9,12 +9,11 @@ from enum import Enum, unique
 from physicsLab import errors
 from physicsLab.circuit import elements
 from physicsLab._tools import roundData
-from physicsLab.unit import crt_Wires, D_WaterLamp
+from physicsLab.lib import crt_Wires, D_WaterLamp
 from physicsLab.typehint import Optional, Union, List, Iterator, Dict, Self, numType
 
 def _format_velocity(velocity: float) -> float:
     velocity = min(1, velocity)
-    velocity = max(0.05, velocity)
 
     return velocity
 
@@ -120,6 +119,8 @@ class Midi:
 
         # 使用pygame播放midi
         def sound_by_pygame() -> bool:
+            import os
+            os.environ['PYGAME_HIDE_SUPPORT_PROMPT'] = '1'
             try:
                 from pygame import mixer, time
             except ImportError:
@@ -186,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
@@ -220,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
@@ -236,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"
 
@@ -295,9 +306,9 @@ class Midi:
 
         return self
 
-# 音符类
 # TODO 增加更多的设置pitch的方法 -> 参考Simple_Instrument
 class Note:
+    ''' 音符类 '''
     def __init__(self,
                  time: int, # 间隔多少时间才播放此Note
                  playTime: int = 1,  # 音符发出声音的时长 暂时不支持相关机制
@@ -328,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
@@ -382,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存储的数据结构
@@ -435,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:
@@ -474,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
@@ -519,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():
@@ -545,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:
@@ -558,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]
@@ -585,15 +614,16 @@ 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()
 
         if not (
-                isinstance(x, (int, float)) or
-                isinstance(y, (int, float)) or
-                isinstance(z, (int, float)) or
+                isinstance(x, (int, float)) and
+                isinstance(y, (int, float)) and
+                isinstance(z, (int, float)) and
                 isinstance(musicArray, Piece)
         ):
             raise TypeError
@@ -602,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)
@@ -659,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
@@ -673,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.6 → physicslab-1.4.8}/physicsLab.egg-info/PKG-INFO

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

{physicsLab-1.4.6 → physicslab-1.4.8}/physicsLab.egg-info/SOURCES.txt

@@ -29,9 +29,9 @@ physicsLab/circuit/elements/logicCircuit.py
 physicsLab/circuit/elements/otherCircuit.py
 physicsLab/electromagnetism/__init__.py
 physicsLab/electromagnetism/elements.py
+physicsLab/lib/__init__.py
+physicsLab/lib/_unionClassHead.py
+physicsLab/lib/logic.py
+physicsLab/lib/wires.py
 physicsLab/music/__init__.py
-physicsLab/music/music.py
-physicsLab/unit/__init__.py
-physicsLab/unit/_unionClassHead.py
-physicsLab/unit/logic.py
-physicsLab/unit/wires.py
+physicsLab/music/music.py

{physicsLab-1.4.6 → physicslab-1.4.8}/setup.py

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