physicsLab 1.6.0__tar.gz → 1.6.2__tar.gz

{physicslab-1.6.0 → physicslab-1.6.2}/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 Goodenough
+Copyright (c) 2024 Arendelle
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

{physicslab-1.6.0 → physicslab-1.6.2}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.1
 Name: physicsLab
-Version: 1.6.0
-Summary: Python API for Physics-Lab-AR
+Version: 1.6.2
+Summary: Python API for Quantum-Physics App
 Home-page: https://github.com/GoodenoughPhysicsLab/physicsLab
 Author: Arendelle
 Author-email: 2381642961@qq.com

{physicslab-1.6.0 → physicslab-1.6.2}/physicsLab/Experiment.py

@@ -24,7 +24,7 @@ from .savTemplate import Generate
 from .enums import ExperimentType
 from .typehint import Union, Optional, List, Dict, numType, Self
 
-class _StackExperiment:
+class _ExperimentStack:
     data: List["Experiment"] = []
 
     def __new__(cls):
@@ -52,7 +52,7 @@ class _StackExperiment:
 
 def get_current_experiment() -> "Experiment":
     ''' 获取当前正在操作的存档 '''
-    return _StackExperiment.top()
+    return _ExperimentStack.top()
 
 # TODO: 将Experiment作为基类, 子类为三大类型的实验?
 class Experiment:
@@ -61,8 +61,7 @@ class Experiment:
         SAV_ROOT_DIR = os.environ["PHYSICSLAB_HOME_PATH"]
     else:
         if platform.system() == "Windows":
-            from getpass import getuser
-            SAV_ROOT_DIR = f"C:/Users/{getuser()}/AppData/LocalLow/CIVITAS/Quantum Physics/Circuit"
+            SAV_ROOT_DIR = os.path.join(plAR.WIN_PLAR_HOME_DIR, "Circuit")
         else:
             SAV_ROOT_DIR = "physicsLabSav"
 
@@ -103,7 +102,7 @@ class Experiment:
                 return element
         raise errors.ExperimentError
 
-    def __read_CameraSave(self, camera_save: str) -> None:
+    def _read_CameraSave(self, camera_save: str) -> None:
         self.CameraSave = json.loads(camera_save)
         temp = eval(f"({self.CameraSave['VisionCenter']})")
         self.VisionCenter: _tools.position = _tools.position(temp[0], temp[2], temp[1]) # x, z, y
@@ -112,7 +111,7 @@ class Experiment:
 
     def __open(self) -> None:
         self.is_opened = True
-        self.__read_CameraSave(self.PlSav["Experiment"]["CameraSave"])
+        self._read_CameraSave(self.PlSav["Experiment"]["CameraSave"])
 
         if self.PlSav["Summary"] is None:
             self.PlSav["Summary"] = savTemplate.Circuit["Summary"]
@@ -155,7 +154,7 @@ class Experiment:
             or not isinstance(path_load_mode, Experiment.PathLoadMode):
             raise TypeError
 
-        _StackExperiment.push(self)
+        _ExperimentStack.push(self)
 
         # 直接通过文件路径进行导入
         if path_load_mode == Experiment.PathLoadMode.file_name \
@@ -166,7 +165,7 @@ class Experiment:
             self.SAV_PATH = os.path.abspath(sav_name)
 
             if not os.path.exists(self.SAV_PATH):
-                _StackExperiment.pop()
+                _ExperimentStack.pop()
                 raise errors.ExperimentNotExistError(f"{self.SAV_PATH} not found")
 
             _temp = _open_sav(self.SAV_PATH)
@@ -191,7 +190,7 @@ class Experiment:
             filename = search_experiment(sav_name)
 
             if filename is None:
-                _StackExperiment.pop()
+                _ExperimentStack.pop()
                 raise errors.ExperimentNotExistError(f'No such experiment "{sav_name}"')
 
             self.SAV_PATH = os.path.join(Experiment.SAV_ROOT_DIR, filename)
@@ -281,7 +280,7 @@ class Experiment:
             if os.path.exists(path.replace(".sav", ".jpg")): # 用存档生成的实验无图片，因此可能删除失败
                 os.remove(path.replace(".sav", ".jpg"))
 
-        _StackExperiment.push(self)
+        _ExperimentStack.push(self)
 
         self.__crt(sav_name, experiment_type)
         return self
@@ -302,7 +301,7 @@ class Experiment:
             or not isinstance(experiment_type, ExperimentType):
             raise TypeError
 
-        _StackExperiment.push(self)
+        _ExperimentStack.push(self)
 
         filename = search_experiment(sav_name)
         if filename is not None:
@@ -384,7 +383,7 @@ class Experiment:
         if not no_pop:
             self.is_opened = False
             self.is_crted = False
-            _StackExperiment.pop()
+            _ExperimentStack.pop()
 
         self.__write()
 
@@ -438,11 +437,11 @@ class Experiment:
         if os.path.exists(self.SAV_PATH.replace(".sav", ".jpg")): # 用存档生成的实验无图片，因此可能删除失败
             os.remove(self.SAV_PATH.replace(".sav", ".jpg"))
 
-        _StackExperiment.pop()
+        _ExperimentStack.pop()
 
     def exit(self) -> None:
         ''' 立刻退出对该存档的操作, 对该存档的任何改动都会失效 '''
-        _StackExperiment.pop()
+        _ExperimentStack.pop()
 
     def entitle(self, sav_name: str) -> Self:
         ''' 对存档名进行重命名 '''

{physicslab-1.6.0 → physicslab-1.6.2}/physicsLab/_element_base.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 import copy
 
-from physicsLab.typehint import numType, Self
+from physicsLab.typehint import numType, Self, final
 from physicsLab import _tools
 
 class ElementBase:
@@ -34,6 +34,7 @@ class ElementBase:
 
         return self
 
+    @final
     def get_position(self) -> tuple:
         ''' 获取原件的坐标 '''
         assert hasattr(self, '_position')

physicslab-1.6.2/physicsLab/celestial/_element.py

@@ -0,0 +1 @@
+# -*- coding: utf-8 -*-

physicslab-1.6.2/physicsLab/celestial/_experiment.py

@@ -0,0 +1 @@
+# -*- coding: utf-8 -*-

{physicslab-1.6.0 → physicslab-1.6.2}/physicsLab/celestial/_planetbase.py

@@ -1,7 +1,8 @@
+# -*- coding: utf-8 -*-
 from physicsLab import _tools
 from physicsLab import errors
 from physicsLab._element_base import ElementBase
-from physicsLab.typehint import numType, Self, final
+from physicsLab.typehint import numType, Self, override, final
 from physicsLab.enums import ExperimentType
 from physicsLab.Experiment import get_current_experiment
 
@@ -47,6 +48,7 @@ class PlanetBase(ElementBase, metaclass=_PlanetMeta):
         self.data: dict = data
 
     @final
+    @override
     def set_position(self, x: numType, y: numType, z: numType) -> Self:
         ''' 设置位置坐标 '''
         if not isinstance(x, (int, float)) or \

{physicslab-1.6.0 → physicslab-1.6.2}/physicsLab/celestial/planets.py

@@ -265,7 +265,19 @@ class Blackhole(PlanetBase):
 class Fantasy_Star(PlanetBase):
     def __init__(self, x: numType, y: numType, z: numType) -> None:
         self.data = {
-            "Identifier": Generate, "Model": "Fantasy Star", "Override": None, "Name": "幻想恒星", "Parent": None, "Type": 0, "Changed": False, "Extras": {}, "Radius": 651325.063, "RadiusVisible": 4.353841, "RotationPeriod": 0.0, "RotationPhase": 0.0, "AxialTilt": 0.0, "Mass": 2762263.0, "OrbitType": 0, "OrbitEstimation": 3, "Density": 2.3866187453169605, "Gravity": 434.5711132851481, "Luminosity": 3.719063854941033, "Temperature": 8284.134151462116, "Albedo": 0.0, "PowerAbsorbtion": 0.0, "PlanetariumBalance": 0.0, "Position": Generate, "Velocity": Generate, "Acceleration": Generate, "Period": 0.0, "Eccentricity": "NaN", "OmegaUC": 0.0, "OmegaLC": "NaN", "Inclination": "NaN", "Phase": 0.0, "PhaseCurrent": "NaN", "AxisSemi": "NaN", "Perihelion": "NaN", "Aphelion": "NaN", "LeavingKepler": False}
+            "Identifier": Generate, "Model": "Fantasy Star", "Override": None,
+            "Name": "幻想恒星", "Parent": None, "Type": 0, "Changed": False,
+            "Extras": {}, "Radius": 651325.063, "RadiusVisible": 4.353841,
+            "RotationPeriod": 0.0, "RotationPhase": 0.0, "AxialTilt": 0.0,
+            "Mass": 2762263.0, "OrbitType": 0, "OrbitEstimation": 3,
+            "Density": 2.3866187453169605, "Gravity": 434.5711132851481,
+            "Luminosity": 3.719063854941033, "Temperature": 8284.134151462116,
+            "Albedo": 0.0, "PowerAbsorbtion": 0.0, "PlanetariumBalance": 0.0,
+            "Position": Generate, "Velocity": Generate, "Acceleration": Generate,
+            "Period": 0.0, "Eccentricity": "NaN", "OmegaUC": 0.0, "OmegaLC": "NaN",
+            "Inclination": "NaN", "Phase": 0.0, "PhaseCurrent": "NaN", "AxisSemi": "NaN",
+            "Perihelion": "NaN", "Aphelion": "NaN", "LeavingKepler": False
+        }
 
 class Moon(PlanetBase):
     def __init__(self, x: numType, y: numType, z: numType) -> None:

{physicslab-1.6.0 → physicslab-1.6.2}/physicsLab/chart.py

@@ -1,7 +1,8 @@
+# -*- coding: utf-8 -*-
 import base64
 
 from physicsLab import errors
-from physicsLab.experiment import Experiment
+from physicsLab.Experiment import Experiment
 from physicsLab.circuit.elements import CircuitBase
 from physicsLab.typehint import TypedDict, Self, List, Optional
 

physicslab-1.6.2/physicsLab/circuit/_element.py

@@ -0,0 +1 @@
+# -*- coding: utf-8 -*-

physicslab-1.6.2/physicsLab/circuit/_experiment.py

@@ -0,0 +1 @@
+# -*- coding: utf-8 -*-

{physicslab-1.6.0 → physicslab-1.6.2}/physicsLab/circuit/elements/_circuitbase.py

@@ -10,7 +10,7 @@ import physicsLab.circuit.elementXYZ as _elementXYZ
 from physicsLab.enums import ExperimentType
 from physicsLab._tools import roundData, randString
 from physicsLab.Experiment import Experiment, get_current_experiment
-from physicsLab.typehint import Optional, Self, numType, CircuitElementData, Generate, final
+from physicsLab.typehint import Optional, Self, numType, CircuitElementData, Generate, override, final
 
 # electricity class's metaClass
 class CircuitMeta(type):
@@ -70,6 +70,7 @@ class CircuitBase(ElementBase, metaclass=CircuitMeta):
                 f"({self._position.x}, {self._position.y}, {self._position.z}, " \
                 f"elementXYZ={self.is_elementXYZ})"
 
+    @final
     def set_rotation(
             self,
             x_r: numType = 0,
@@ -86,7 +87,7 @@ class CircuitBase(ElementBase, metaclass=CircuitMeta):
         self.data["Rotation"] = f"{x_r},{z_r},{y_r}"
         return self
 
-    @final
+    @override
     def set_position(self, x: numType, y: numType, z: numType, elementXYZ: Optional[bool] = None) -> Self:
         ''' 设置原件的位置
         '''
@@ -108,17 +109,20 @@ class CircuitBase(ElementBase, metaclass=CircuitMeta):
 
         return super().set_position(x, y, z)
 
-    # 获取元件的index（每创建一个元件，index就加1）
+    @final
     def get_index(self) -> int:
+        ''' 获取元件的index (每创建一个元件, index就加1) '''
         return self.experiment.Elements.index(self) + 1
 
     @property
+    @final
     def modelID(self) -> str:
         ''' 存档的modelID '''
         assert not isinstance(self.data['ModelID'], type(Generate))
         return self.data['ModelID']
 
     @classmethod
+    @final
     def _get_property(cls) -> list:
         res: list = []
         for name, _ in inspect.getmembers(cls, lambda i: isinstance(i, property)):
@@ -126,6 +130,7 @@ class CircuitBase(ElementBase, metaclass=CircuitMeta):
 
         return res
 
+    @final
     def rename(self, name: str) -> Self:
         ''' 重命名元件
             @param name: 将元件重命名为name

{physicslab-1.6.0 → physicslab-1.6.2}/physicsLab/circuit/elements/artificialCircuit.py

@@ -7,7 +7,7 @@ class NE555(CircuitBase):
     ''' 555定时器 '''
     is_bigElement = True
 
-    def __init__(self, x: numType, y: numType, z: numType, elementXYZ: Optional[bool] = None):
+    def __init__(self, x: numType, y: numType, z: numType, elementXYZ: Optional[bool] = None) -> None:
         self.data: CircuitElementData = {
             "ModelID": "555 Timer", "Identifier": Generate, "IsBroken": False,
             "IsLocked": False, "Properties": {"高电平": 3.0, "低电平": 0.0, "锁定": 1.0},
@@ -52,7 +52,7 @@ class NE555(CircuitBase):
 
 class Basic_Capacitor(TwoPinMixIn):
     ''' 电容 '''
-    def __init__(self, x: numType, y: numType, z: numType, elementXYZ: Optional[bool] = None):
+    def __init__(self, x: numType, y: numType, z: numType, elementXYZ: Optional[bool] = None) -> None:
         self.data: CircuitElementData = {
             "ModelID": "Basic Capacitor", "Identifier": Generate,
             "IsBroken": False, "IsLocked": False,
@@ -64,7 +64,7 @@ class Basic_Capacitor(TwoPinMixIn):
 
 class Basic_Inductor(TwoPinMixIn):
     ''' 电感 '''
-    def __init__(self, x: numType, y: numType, z: numType, elementXYZ: Optional[bool] = None):
+    def __init__(self, x: numType, y: numType, z: numType, elementXYZ: Optional[bool] = None) -> None:
         self.data: CircuitElementData = {
             "ModelID": "Basic Inductor", "Identifier": Generate,
             "IsBroken": False, "IsLocked": False,
@@ -77,7 +77,7 @@ class Basic_Inductor(TwoPinMixIn):
 
 class Basic_Diode(TwoPinMixIn):
     ''' 二极管 '''
-    def __init__(self, x: numType, y: numType, z: numType, elementXYZ: Optional[bool] = None):
+    def __init__(self, x: numType, y: numType, z: numType, elementXYZ: Optional[bool] = None) -> None:
         self.data: CircuitElementData = {
             "ModelID": "Basic Diode", "Identifier": Generate,
             "IsBroken": False, "IsLocked": False,
@@ -91,7 +91,7 @@ class Basic_Diode(TwoPinMixIn):
 
 class Light_Emitting_Diode(TwoPinMixIn):
     ''' 发光二极管 '''
-    def __init__(self, x: numType, y: numType, z: numType, elementXYZ: Optional[bool] = None):
+    def __init__(self, x: numType, y: numType, z: numType, elementXYZ: Optional[bool] = None) -> None:
         self.data: CircuitElementData = {
             "ModelID": "Light-Emitting Diode", "Identifier": Generate,
             "IsBroken": False, "IsLocked": False,
@@ -105,7 +105,7 @@ class Light_Emitting_Diode(TwoPinMixIn):
 
 class Ground_Component(CircuitBase):
     ''' 接地元件 '''
-    def __init__(self, x: numType, y: numType, z: numType, elementXYZ: Optional[bool] = None):
+    def __init__(self, x: numType, y: numType, z: numType, elementXYZ: Optional[bool] = None) -> None:
         self.data: CircuitElementData = {
             "ModelID": "Ground Component", "Identifier": Generate,
             "IsBroken": False, "IsLocked": False, "Properties": {"锁定": 1.0},
@@ -120,7 +120,7 @@ class Ground_Component(CircuitBase):
 
 class Transformer(CircuitBase):
     ''' 理想变压器 '''
-    def __init__(self, x: numType, y: numType, z: numType, elementXYZ: Optional[bool] = None):
+    def __init__(self, x: numType, y: numType, z: numType, elementXYZ: Optional[bool] = None) -> None:
         self.data: CircuitElementData = {
             "ModelID": "Transformer", "Identifier": Generate,
             "IsBroken": False, "IsLocked": False,
@@ -151,7 +151,7 @@ class Transformer(CircuitBase):
 
 class Tapped_Transformer(CircuitBase):
     ''' 中心抽头变压器 '''
-    def __init__(self, x: numType, y: numType, z: numType, elementXYZ: Optional[bool] = None):
+    def __init__(self, x: numType, y: numType, z: numType, elementXYZ: Optional[bool] = None) -> None:
         self.data: CircuitElementData = {
             "ModelID": "Tapped Transformer", "Identifier": Generate,
             "IsBroken": False, "IsLocked": False,
@@ -184,7 +184,7 @@ class Tapped_Transformer(CircuitBase):
 
 class Mutual_Inductor(CircuitBase):
     ''' 理想互感 '''
-    def __init__(self, x: numType, y: numType, z: numType, elementXYZ: Optional[bool] = None):
+    def __init__(self, x: numType, y: numType, z: numType, elementXYZ: Optional[bool] = None) -> None:
         self.data: CircuitElementData = {
             "ModelID": "Mutual Inductor", "Identifier": Generate,
             "IsBroken": False, "IsLocked": False,
@@ -213,7 +213,7 @@ class Mutual_Inductor(CircuitBase):
 
 class Rectifier(CircuitBase):
     ''' 全波整流器 '''
-    def __init__(self, x: numType, y: numType, z: numType, elementXYZ: Optional[bool] = None):
+    def __init__(self, x: numType, y: numType, z: numType, elementXYZ: Optional[bool] = None) -> None:
         self.data: CircuitElementData = {
             "ModelID": "Rectifier", "Identifier": Generate,
             "IsBroken": False, "IsLocked": False,
@@ -241,7 +241,7 @@ class Rectifier(CircuitBase):
 
 class Transistor(CircuitBase):
     ''' 三极管 '''
-    def __init__(self, x: numType, y: numType, z: numType, elementXYZ: Optional[bool] = None):
+    def __init__(self, x: numType, y: numType, z: numType, elementXYZ: Optional[bool] = None) -> None:
         self.data: CircuitElementData = {
             "ModelID": "Transistor", "Identifier": Generate,
             "IsBroken": False, "IsLocked": False,
@@ -265,7 +265,7 @@ class Transistor(CircuitBase):
 
 class Comparator(CircuitBase):
     ''' 比较器 '''
-    def __init__(self, x: numType, y: numType, z: numType, elementXYZ: Optional[bool] = None):
+    def __init__(self, x: numType, y: numType, z: numType, elementXYZ: Optional[bool] = None) -> None:
         self.data: CircuitElementData = {
             "ModelID": "Comparator", "Identifier": Generate,
             "IsBroken": False, "IsLocked": False,
@@ -289,7 +289,7 @@ class Comparator(CircuitBase):
 
 class Operational_Amplifier(CircuitBase):
     ''' 运算放大器 '''
-    def __init__(self, x: numType, y: numType, z: numType, elementXYZ: Optional[bool] = None):
+    def __init__(self, x: numType, y: numType, z: numType, elementXYZ: Optional[bool] = None) -> None:
         self.data: CircuitElementData = {
             "ModelID": "Operational Amplifier", "Identifier": Generate,
             "IsBroken": False, "IsLocked": False,
@@ -314,7 +314,7 @@ class Operational_Amplifier(CircuitBase):
 
 class Relay_Component(CircuitBase):
     ''' 继电器 '''
-    def __init__(self, x: numType, y: numType, z: numType, elementXYZ: Optional[bool] = None):
+    def __init__(self, x: numType, y: numType, z: numType, elementXYZ: Optional[bool] = None) -> None:
         self.data: CircuitElementData = {
             "ModelID": "Relay Component", "Identifier": Generate,
             "IsBroken": False, "IsLocked": False,
@@ -348,7 +348,7 @@ class Relay_Component(CircuitBase):
 
 class N_MOSFET(CircuitBase):
     ''' N-MOSFET '''
-    def __init__(self, x: numType, y: numType, z: numType, elementXYZ: Optional[bool] = None):
+    def __init__(self, x: numType, y: numType, z: numType, elementXYZ: Optional[bool] = None) -> None:
         self.data: CircuitElementData = {
             "ModelID": "N-MOSFET", "Identifier": Generate, "IsBroken": False,
             "IsLocked": False, "Properties": {"PNP": 1.0, "放大系数": 0.027,
@@ -396,7 +396,7 @@ class P_MOSFET(CircuitBase):
 
 class _source_electricity(TwoPinMixIn):
     """ 波形发生器基类 """
-    def __init__(self, x: numType, y: numType, z: numType, elementXYZ: Optional[bool] = None):
+    def __init__(self, x: numType, y: numType, z: numType, elementXYZ: Optional[bool] = None) -> None:
         self.data: CircuitElementData = {
             "ModelID": Generate, "Identifier": Generate, "IsBroken": False, "IsLocked": False,
             "Properties": {"电压": 3.0, "内阻": 0.5, "频率": 20000.0, "偏移": 0.0,
@@ -407,30 +407,30 @@ class _source_electricity(TwoPinMixIn):
 
 class Sinewave_Source(_source_electricity):
     ''' 正弦波发生器 '''
-    def __init__(self, x: numType, y: numType, z: numType, elementXYZ: Optional[bool] = None):
+    def __init__(self, x: numType, y: numType, z: numType, elementXYZ: Optional[bool] = None) -> None:
         super().__init__(x, y, z, elementXYZ)
         self.data["ModelID"] = "Sinewave Source"
 
 class Square_Source(_source_electricity):
     ''' 方波发生器 '''
-    def __init__(self, x: numType, y: numType, z: numType, elementXYZ: Optional[bool] = None):
+    def __init__(self, x: numType, y: numType, z: numType, elementXYZ: Optional[bool] = None) -> None:
         super().__init__(x, y, z, elementXYZ)
         self.data["ModelID"] = "Square Source"
 
 class Triangle_Source(_source_electricity):
     ''' 三角波发生器 '''
-    def __init__(self, x: numType, y: numType, z: numType, elementXYZ: Optional[bool] = None):
+    def __init__(self, x: numType, y: numType, z: numType, elementXYZ: Optional[bool] = None) -> None:
         super().__init__(x, y, z, elementXYZ)
         self.data["ModelID"] = "Triangle Source"
 
 class Sawtooth_Source(_source_electricity):
     ''' 锯齿波发生器 '''
-    def __init__(self, x: numType, y: numType, z: numType, elementXYZ: Optional[bool] = None):
+    def __init__(self, x: numType, y: numType, z: numType, elementXYZ: Optional[bool] = None) -> None:
         super().__init__(x, y, z, elementXYZ)
         self.data["ModelID"] = "Sawtooth Source"
 
 class Pulse_Source(_source_electricity):
     ''' 尖峰波发生器 '''
-    def __init__(self, x: numType, y: numType, z: numType, elementXYZ: Optional[bool] = None):
+    def __init__(self, x: numType, y: numType, z: numType, elementXYZ: Optional[bool] = None) -> None:
         super().__init__(x, y, z, elementXYZ)
         self.data["ModelID"] = "Pulse Source"

{physicslab-1.6.0 → physicslab-1.6.2}/physicsLab/circuit/elements/basicCircuit.py

@@ -5,7 +5,7 @@ from physicsLab.typehint import Optional, numType, CircuitElementData, Self, Gen
 
 class _switch_Base(CircuitBase):
     ''' 开关基类 '''
-    def __init__(self, x: numType, y: numType, z: numType, elementXYZ: Optional[bool] = None):
+    def __init__(self, x: numType, y: numType, z: numType, elementXYZ: Optional[bool] = None) -> None:
         self.data: CircuitElementData = {
             "ModelID": Generate, "Identifier": Generate, "IsBroken": False,
             "IsLocked": False, "Properties": {"开关": 0, "锁定": 1.0},
@@ -21,7 +21,7 @@ class _switch_Base(CircuitBase):
 
 class Simple_Switch(_switch_Base, TwoPinMixIn):
     ''' 简单开关 '''
-    def __init__(self, x: numType, y: numType, z: numType, elementXYZ: Optional[bool] = None):
+    def __init__(self, x: numType, y: numType, z: numType, elementXYZ: Optional[bool] = None) -> None:
         super().__init__(x, y, z, elementXYZ)
         self.data["ModelID"] = "Simple Switch"
 
@@ -40,7 +40,7 @@ class Simple_Switch(_switch_Base, TwoPinMixIn):
 
 class SPDT_Switch(_switch_Base):
     ''' 单刀双掷开关 '''
-    def __init__(self, x: numType, y: numType, z: numType, elementXYZ: Optional[bool] = None):
+    def __init__(self, x: numType, y: numType, z: numType, elementXYZ: Optional[bool] = None) -> None:
         super().__init__(x, y, z, elementXYZ)
         self.data["ModelID"] = "SPDT Switch"
 
@@ -78,7 +78,7 @@ class SPDT_Switch(_switch_Base):
 
 class DPDT_Switch(_switch_Base):
     ''' 双刀双掷开关 '''
-    def __init__(self, x: numType, y: numType, z: numType, elementXYZ: Optional[bool] = None):
+    def __init__(self, x: numType, y: numType, z: numType, elementXYZ: Optional[bool] = None) -> None:
         super().__init__(x, y, z, elementXYZ)
         self.data["ModelID"] = "DPDT Switch"
 
@@ -128,7 +128,7 @@ class DPDT_Switch(_switch_Base):
 
 class Push_Switch(TwoPinMixIn):
     ''' 按钮开关 '''
-    def __init__(self, x: numType, y: numType, z: numType, elementXYZ: Optional[bool] = None):
+    def __init__(self, x: numType, y: numType, z: numType, elementXYZ: Optional[bool] = None) -> None:
         self.data: CircuitElementData = {
             "ModelID": "Push Switch", "Identifier": Generate,
             "IsBroken": False, "IsLocked": False,
@@ -140,7 +140,7 @@ class Push_Switch(TwoPinMixIn):
 
 class Air_Switch(TwoPinMixIn):
     ''' 空气开关 '''
-    def __init__(self, x: numType, y: numType, z: numType, elementXYZ: Optional[bool] = None):
+    def __init__(self, x: numType, y: numType, z: numType, elementXYZ: Optional[bool] = None) -> None:
         self.data: CircuitElementData = {
             "ModelID": "Air Switch", "Identifier": Generate,
             "IsBroken": False, "IsLocked": False,
@@ -170,7 +170,7 @@ class Air_Switch(TwoPinMixIn):
 
 class Incandescent_Lamp(TwoPinMixIn):
     ''' 白炽灯泡 '''
-    def __init__(self, x: numType, y: numType, z: numType, elementXYZ: Optional[bool] = None):
+    def __init__(self, x: numType, y: numType, z: numType, elementXYZ: Optional[bool] = None) -> None:
         self.data: CircuitElementData = {
             "ModelID": "Incandescent Lamp", "Identifier": Generate,
             "IsBroken": False, "IsLocked": False,
@@ -185,7 +185,7 @@ class Incandescent_Lamp(TwoPinMixIn):
 
 class Battery_Source(TwoPinMixIn):
     ''' 一节电池 '''
-    def __init__(self, x: numType, y: numType, z: numType, elementXYZ: Optional[bool] = None):
+    def __init__(self, x: numType, y: numType, z: numType, elementXYZ: Optional[bool] = None) -> None:
         self.data: CircuitElementData = {
             "ModelID": "Battery Source", "Identifier": Generate,
             "IsBroken": False, "IsLocked": False,
@@ -197,7 +197,7 @@ class Battery_Source(TwoPinMixIn):
 
 class Student_Source(CircuitBase):
     ''' 学生电源 '''
-    def __init__(self, x: numType, y: numType, z: numType, elementXYZ: Optional[bool] = None):
+    def __init__(self, x: numType, y: numType, z: numType, elementXYZ: Optional[bool] = None) -> None:
         self.data: CircuitElementData = {
             "ModelID": "Student Source", "Identifier": Generate,
             "IsBroken": False, "IsLocked": False,
@@ -229,7 +229,7 @@ class Student_Source(CircuitBase):
 
 class Resistor(TwoPinMixIn):
     ''' 电阻 '''
-    def __init__(self, x: numType, y: numType, z: numType, elementXYZ: Optional[bool] = None):
+    def __init__(self, x: numType, y: numType, z: numType, elementXYZ: Optional[bool] = None) -> None:
         self.data: CircuitElementData = {
             "ModelID": "Resistor", "Identifier": Generate,
             "IsBroken": False, "IsLocked": False,
@@ -250,7 +250,7 @@ class Resistor(TwoPinMixIn):
 
 class Fuse_Component(TwoPinMixIn):
     ''' 保险丝 '''
-    def __init__(self, x: numType, y: numType, z: numType, elementXYZ: Optional[bool] = None):
+    def __init__(self, x: numType, y: numType, z: numType, elementXYZ: Optional[bool] = None) -> None:
         self.data: CircuitElementData = {
             "ModelID": "Fuse Component", "Identifier": Generate,
             "IsBroken": False, "IsLocked": False,
@@ -263,7 +263,7 @@ class Fuse_Component(TwoPinMixIn):
 
 class Slide_Rheostat(CircuitBase):
     ''' 滑动变阻器 '''
-    def __init__(self, x: numType, y: numType, z: numType, elementXYZ: Optional[bool] = None):
+    def __init__(self, x: numType, y: numType, z: numType, elementXYZ: Optional[bool] = None) -> None:
         self.data: CircuitElementData = {
             "ModelID": "Slide Rheostat", "Identifier": Generate,
             "IsBroken": False, "IsLocked": False,
@@ -295,7 +295,7 @@ class Slide_Rheostat(CircuitBase):
 
 class Multimeter(TwoPinMixIn):
     ''' 多用电表 '''
-    def __init__(self, x: numType, y: numType, z: numType, elementXYZ: Optional[bool] = None):
+    def __init__(self, x: numType, y: numType, z: numType, elementXYZ: Optional[bool] = None) -> None:
         self.data: CircuitElementData = {
             "ModelID": "Multimeter", "Identifier": Generate,
             "IsBroken": False, "IsLocked": False,
@@ -309,7 +309,7 @@ class Multimeter(TwoPinMixIn):
 
 class Galvanometer(CircuitBase):
     ''' 灵敏电流计 '''
-    def __init__(self, x: numType, y: numType, z: numType, elementXYZ: Optional[bool] = None):
+    def __init__(self, x: numType, y: numType, z: numType, elementXYZ: Optional[bool] = None) -> None:
         self.data: CircuitElementData = {
             "ModelID": "Galvanometer", "Identifier": Generate,
             "IsBroken": False, "IsLocked": False,
@@ -334,7 +334,7 @@ class Galvanometer(CircuitBase):
 
 class Microammeter(CircuitBase):
     ''' 微安表 '''
-    def __init__(self, x: numType, y: numType, z: numType, elementXYZ: Optional[bool] = None):
+    def __init__(self, x: numType, y: numType, z: numType, elementXYZ: Optional[bool] = None) -> None:
         self.data: CircuitElementData = {
             "ModelID": "Microammeter", "Identifier": Generate,
             "IsBroken": False, "IsLocked": False,
@@ -359,7 +359,7 @@ class Microammeter(CircuitBase):
 
 class Electricity_Meter(CircuitBase):
     ''' 电能表 '''
-    def __init__(self, x: numType, y: numType, z: numType, elementXYZ: Optional[bool] = None):
+    def __init__(self, x: numType, y: numType, z: numType, elementXYZ: Optional[bool] = None) -> None:
         self.data: CircuitElementData = {
             "ModelID": "Electricity Meter", "Identifier": Generate,
             "IsBroken": False, "IsLocked": False,
@@ -388,7 +388,7 @@ class Electricity_Meter(CircuitBase):
 
 class Resistance_Box(CircuitBase):
     ''' 电阻箱 '''
-    def __init__(self, x: numType, y: numType, z: numType, elementXYZ: Optional[bool] = None):
+    def __init__(self, x: numType, y: numType, z: numType, elementXYZ: Optional[bool] = None) -> None:
         self.data: CircuitElementData = {
             "ModelID": "Resistance Box", "Identifier": Generate,
             "IsBroken": False, "IsLocked": False,
@@ -420,7 +420,7 @@ class Resistance_Box(CircuitBase):
 
 class Simple_Ammeter(CircuitBase):
     ''' 直流安培表 '''
-    def __init__(self, x: numType, y: numType, z: numType, elementXYZ: Optional[bool] = None):
+    def __init__(self, x: numType, y: numType, z: numType, elementXYZ: Optional[bool] = None) -> None:
         self.data: CircuitElementData = {
             "ModelID": "Simple Ammeter", "Identifier": Generate,
             "IsBroken": False, "IsLocked": False,
@@ -446,7 +446,7 @@ class Simple_Ammeter(CircuitBase):
 
 class Simple_Voltmeter(CircuitBase):
     ''' 直流电压表 '''
-    def __init__(self, x: numType, y: numType, z: numType, elementXYZ: Optional[bool] = None):
+    def __init__(self, x: numType, y: numType, z: numType, elementXYZ: Optional[bool] = None) -> None:
         self.data: CircuitElementData = {
             "ModelID": "Simple Voltmeter", "Identifier": Generate,
             "IsBroken": False, "IsLocked": False,