physicsLab 1.4.8__tar.gz → 1.4.10__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: physicsLab
-Version: 1.4.8
+Version: 1.4.10
 Summary: Python API for Physics-Lab-AR
 Home-page: https://gitee.com/script2000/physicsLab
 Author: Goodenough
@@ -15,5 +15,6 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: mido
 Requires-Dist: typing-extensions
+Requires-Dist: requests
 
 click "[there](https://gitee.com/script2000/physicsLab)" to show more information

{physicslab-1.4.8 → physicslab-1.4.10}/README.md

@@ -4,8 +4,12 @@
 
 ![输入图片说明](./cover.jpg)
 
+[![License](https://img.shields.io/badge/License-MIT-green.svg)](LICENSE)
+[![build](https://github.com/gaogaotiantian/viztracer/workflows/build/badge.svg)](https://github.com/GoodenoughPhysicsLab/physicsLab/actions)
+![support-version](https://img.shields.io/pypi/pyversions/viztracer)
+
 ## Introduction
-When conducting experiments in the physics laboratory, we may be troubled by issues such as untidy components, the need to repeatedly build certain circuits and perform tests, or the inability of components to float. These problems can be easily solved by changing the archive! However, manually changing the archive operation is cumbersome and has a high error rate. So I wrote ```PhysicsLab```and encapsulated some commonly used functions in it, allowing you to easily conduct experiments on real objects using ```Python```, and you don't even need to know where to save it on your computer
+In physics laboratories, we often struggle with organizing components, repeatedly setting up circuits for testing, and the inconvenience of components not being able to float. These issues can be easily addressed by modifying save files! However, manual modification of save files is cumbersome and prone to errors. That's why I created `physicsLab`, a package that encapsulates commonly used functionalities, allowing you to easily conduct experiments in the physics lab using Python, **without even knowing where the save files are stored on your computer!**
 
 ## Installation Tutorial
 1. Please ensure that your computer has [Python](https://www.python.org) (greater than or equal to 3.6) and [Physics Laboratory PC Version](https://www.turtlesim.com) (You can also contact developer [Jone Chen](https://gitee.com/civitasjohn))
@@ -13,7 +17,7 @@ When conducting experiments in the physics laboratory, we may be troubled by iss
 ```
 pip install physicsLab
 ```
-If you can```t wait to use some new features, the beta version can usually be found on Gitee
+If you can't wait to use some new features, the beta version can usually be found on Gitee
 
 ## Development environment
 Python 3.7.8, win7

physicslab-1.4.10/physicsLab/__init__.py

@@ -0,0 +1,47 @@
+# -*- coding: utf-8 -*-
+import os
+import platform
+
+# 颜色打印
+from ._colorUtils import close_color_print
+# 操作实验
+from .experiment import Experiment, experiment, search_Experiment, get_Experiment
+# 实验, 标签类型
+from .enums import *
+# 电学实验
+from .circuit import *
+# 天体物理实验
+from .celestial import *
+# 电与磁实验
+from .electromagnetism import *
+# 操作元件
+from .element import crt_Element, del_Element, count_Elements, get_Element, clear_Elements
+# `physicsLab`自定义异常类
+from .errors import *
+
+from .lib.wires import crt_Wires, del_Wires
+
+from physicsLab.plAR import *
+
+from physicsLab.web import *
+
+from physicsLab import lib
+from physicsLab import music
+
+# 检测操作系统
+# Win: 若存档对应文件夹不存在直接报错
+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(Experiment.FILE_HEAD):
+        os.mkdir(Experiment.FILE_HEAD)
+
+plAR_version = get_plAR_version()
+if plAR_version is not None:
+    _, mid, small = eval(f"({plAR_version.replace('.', ',')})")
+    if mid < 4 or mid == 4 and small < 7:
+        warning("the version of Physics-Lab-AR is less than v2.4.7")
+
+del os
+del platform

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

@@ -8,11 +8,11 @@ from physicsLab import errors
 from physicsLab._tools import position
 from physicsLab.typehint import numType
 from physicsLab.experiment import get_Experiment
-from physicsLab.experimentType import experimentType
+from physicsLab.enums import ExperimentType
 
 # 是否将全局设置为元件坐标系
 def set_elementXYZ(boolen: bool) -> None:
-    if get_Experiment().ExperimentType != experimentType.Circuit:
+    if get_Experiment().experiment_type != ExperimentType.Circuit:
         raise errors.ExperimentTypeError
     if not isinstance(boolen, bool):
         raise TypeError
@@ -31,8 +31,8 @@ _Z_UNIT: float = 0.1
 _Y_AMEND = 0.045
 
 def xyzTranslate(x: numType, y: numType, z: numType, is_bigElement: bool = False):
-    ''' 将元件坐标系转换为物实支持的坐标系 '''
-    if get_Experiment().ExperimentType != experimentType.Circuit:
+    ''' 将元件坐标系转换为物实的坐标系 '''
+    if get_Experiment().experiment_type != ExperimentType.Circuit:
         raise errors.ExperimentTypeError
 
     _xOrigin, _yOrigin, _zOrigin = get_OriginPosition()
@@ -49,8 +49,8 @@ def xyzTranslate(x: numType, y: numType, z: numType, is_bigElement: bool = False
     return x, y, z
 
 def translateXYZ(x: numType, y: numType, z: numType, is_bigElement: bool = False):
-    ''' 将物实支持的坐标系转换为元件坐标系 '''
-    if get_Experiment().ExperimentType != experimentType.Circuit:
+    ''' 将物实的坐标系转换为元件坐标系 '''
+    if get_Experiment().experiment_type != ExperimentType.Circuit:
         raise errors.ExperimentTypeError
 
     _xOrigin, _yOrigin, _zOrigin = get_OriginPosition()

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

@@ -7,7 +7,7 @@ from physicsLab.circuit import wire
 from physicsLab.elementBase import ElementBase
 import physicsLab.circuit.elementXYZ as _elementXYZ
 
-from physicsLab.experimentType import experimentType
+from physicsLab.enums import ExperimentType
 from physicsLab.typehint import Optional, Self, numType
 from physicsLab._tools import roundData, randString
 from physicsLab.experiment import Experiment, stack_Experiment
@@ -25,13 +25,15 @@ class CircuitMeta(type):
         if not (
                 isinstance(x, (float, int)) and
                 isinstance(y, (float, int)) and
-                isinstance(z, (float, int))
+                isinstance(z, (float, int)) and
+                (elementXYZ is None or isinstance(elementXYZ, bool))
         ):
-            raise TypeError('illegal argument')
+            raise TypeError
+
         _Expe: Experiment = stack_Experiment.top()
         self.experiment = _Expe
 
-        if _Expe.ExperimentType != experimentType.Circuit:
+        if _Expe.experiment_type != ExperimentType.Circuit:
             raise errors.ExperimentTypeError
 
         self.is_elementXYZ = False # 元件坐标系
@@ -71,8 +73,8 @@ class CircuitBase(ElementBase, metaclass=CircuitMeta):
         return f"{self.__class__.__name__}" \
                f"({self._position.x}, {self._position.y}, {self._position.z}, {self.is_elementXYZ})"
 
-    # 设置原件的角度
     def set_Rotation(self, xRotation: numType = 0, yRotation: numType = 0, zRotation: numType = 180) -> Self:
+        ''' 设置原件的角度 '''
         if not (
                 isinstance(xRotation, (int, float)) and
                 isinstance(yRotation, (int, float)) and

{physicslab-1.4.8 → physicslab-1.4.10}/physicsLab/circuit/elements/artificialCircuit.py

@@ -380,29 +380,29 @@ class _source_electricity(TwoPinMixIn):
 # 正弦波发生器
 class Sinewave_Source(_source_electricity):
     def __init__(self, x: numType = 0, y: numType = 0, z: numType = 0, elementXYZ: Optional[bool] = None):
-        super(Sinewave_Source, self).__init__(x, y, z, elementXYZ)
+        super().__init__(x, y, z, elementXYZ)
         self._arguments["ModelID"] = "Sinewave Source"
 
 # 方波发生器
 class Square_Source(_source_electricity):
     def __init__(self, x: numType = 0, y: numType = 0, z: numType = 0, elementXYZ: Optional[bool] = None):
-        super(Square_Source, self).__init__(x, y, z, elementXYZ)
+        super().__init__(x, y, z, elementXYZ)
         self._arguments["ModelID"] = "Square Source"
 
 # 三角波发生器
 class Triangle_Source(_source_electricity):
     def __init__(self, x: numType = 0, y: numType = 0, z: numType = 0, elementXYZ: Optional[bool] = None):
-        super(Triangle_Source, self).__init__(x, y, z, elementXYZ)
+        super().__init__(x, y, z, elementXYZ)
         self._arguments["ModelID"] = "Triangle Source"
 
 # 锯齿波发生器
 class Sawtooth_Source(_source_electricity):
     def __init__(self, x: numType = 0, y: numType = 0, z: numType = 0, elementXYZ: Optional[bool] = None):
-        super(Sawtooth_Source, self).__init__(x, y, z, elementXYZ)
+        super().__init__(x, y, z, elementXYZ)
         self._arguments["ModelID"] = "Sawtooth Source"
 
 # 尖峰波发生器
 class Pulse_Source(_source_electricity):
     def __init__(self, x: numType = 0, y: numType = 0, z: numType = 0, elementXYZ: Optional[bool] = None):
-        super(Pulse_Source, self).__init__(x, y, z, elementXYZ)
+        super().__init__(x, y, z, elementXYZ)
         self._arguments["ModelID"] = "Pulse Source"

{physicslab-1.4.8 → physicslab-1.4.10}/physicsLab/circuit/elements/basicCircuit.py

@@ -23,7 +23,7 @@ class _switch_Base(CircuitBase):
 # 简单开关
 class Simple_Switch(_switch_Base, TwoPinMixIn):
     def __init__(self, x: numType = 0, y: numType = 0, z: numType = 0, elementXYZ: Optional[bool] = None):
-        super(Simple_Switch, self).__init__(x, y, z, elementXYZ)
+        super().__init__(x, y, z, elementXYZ)
         self._arguments["ModelID"] = "Simple Switch"
 
     def __repr__(self) -> str:
@@ -42,7 +42,7 @@ class Simple_Switch(_switch_Base, TwoPinMixIn):
 # 单刀双掷开关
 class SPDT_Switch(_switch_Base):
     def __init__(self, x: numType = 0, y: numType = 0, z: numType = 0, elementXYZ: Optional[bool] = None):
-        super(SPDT_Switch, self).__init__(x, y, z, elementXYZ)
+        super().__init__(x, y, z, elementXYZ)
         self._arguments["ModelID"] = "SPDT Switch"
 
     def __repr__(self) -> str:
@@ -80,7 +80,7 @@ class SPDT_Switch(_switch_Base):
 # 双刀双掷开关
 class DPDT_Switch(_switch_Base):
     def __init__(self, x: numType = 0, y: numType = 0, z: numType = 0, elementXYZ: Optional[bool] = None):
-        super(DPDT_Switch, self).__init__(x, y, z, elementXYZ)
+        super().__init__(x, y, z, elementXYZ)
         self._arguments["ModelID"] = "DPDT Switch"
 
     def __repr__(self) -> str:

{physicslab-1.4.8 → physicslab-1.4.10}/physicsLab/circuit/elements/logicCircuit.py

@@ -6,36 +6,36 @@ from physicsLab.savTemplate import Generate
 from physicsLab.typehint import Optional, Self
 
 class _logicBase(CircuitBase):
-    # 设置高电平的值
-    def set_HighLeaveValue(self, num: numType) -> Self:
+    def set_HighLevelValue(self, num: numType) -> Self:
+        ''' 设置高电平的值 '''
         if not isinstance(num, (int, float)):
             raise TypeError("illegal argument")
-        if num < self.get_LowLeaveValue():
+        if num < self.get_LowLevelValue():
             raise TypeError("illegal range")
         self._arguments["Properties"]["高电平"] = num # type: ignore -> subclass must has attr _arguments
 
         return self
 
-    # 获取高电平的值
-    def get_HighLeaveValue(self) -> numType:
+    def get_HighLevelValue(self) -> numType:
+        ''' 获取高电平的值 '''
         return self._arguments["Properties"]["高电平"] # type: ignore -> subclass must has attr _arguments
 
-    # 设置低电平的值
-    def set_LowLeaveValue(self, num: numType) -> Self:
+    def set_LowLevelValue(self, num: numType) -> Self:
+        ''' 设置低电平的值 '''
         if not isinstance(num, (int, float)):
             raise TypeError("illegal argument")
-        if num > self.get_HighLeaveValue():
+        if num > self.get_HighLevelValue():
             raise TypeError("illegal range")
         self._arguments["Properties"]["低电平"] = num # type: ignore -> subclass must has attr _arguments
 
         return self
 
-    # 获取高电平的值
-    def get_LowLeaveValue(self):
+    def get_LowLevelValue(self):
+        ''' 获取低电平的值 '''
         return self._arguments["Properties"]["低电平"] # type: ignore -> subclass must has attr _arguments
 
-# 逻辑输入
 class Logic_Input(_logicBase):
+    ''' 逻辑输入 '''
     def __init__(self, x: numType = 0, y: numType = 0, z: numType = 0, elementXYZ: Optional[bool] = None):
         self._arguments = {"ModelID": "Logic Input", "Identifier": Generate,
                           "IsBroken": False, "IsLocked": False,
@@ -53,8 +53,8 @@ class Logic_Input(_logicBase):
             res += ".set_highLevel()"
         return res
 
-    # 将逻辑输入的状态设置为1
     def set_highLevel(self) -> "Logic_Input":
+        ''' 将逻辑输入的状态设置为1 '''
         self._arguments["Properties"]["开关"] = 1.0
         return self
 
@@ -62,8 +62,8 @@ class Logic_Input(_logicBase):
     def o(self) -> OutputPin:
         return OutputPin(self, 0)
 
-# 逻辑输出
 class Logic_Output(_logicBase):
+    ''' 逻辑输出 '''
     def __init__(self, x: numType = 0, y: numType = 0, z: numType = 0, elementXYZ: Optional[bool] = None):
         self._arguments = {"ModelID": "Logic Output", "Identifier": Generate,
                           "IsBroken": False, "IsLocked": False,
@@ -76,8 +76,8 @@ class Logic_Output(_logicBase):
     def i(self) -> InputPin:
             return InputPin(self, 0)
 
-# 2引脚门电路
 class _2_pin_Gate(_logicBase):
+    ''' 2引脚门电路基类 '''
     def __init__(self, x: numType = 0, y: numType = 0, z: numType = 0, elementXYZ: Optional[bool] = None):
         self._arguments = {"ModelID": Generate, "Identifier": Generate, "IsBroken": False, "IsLocked": False,
                           "Properties": {"高电平": 3.0, "低电平": 0.0, "最大电流": 0.1, "锁定": 1.0},
@@ -93,20 +93,20 @@ class _2_pin_Gate(_logicBase):
     def o(self) -> OutputPin:
         return OutputPin(self, 1)
 
-# 是门
 class Yes_Gate(_2_pin_Gate):
+    ''' 是门 '''
     def __init__(self, x: numType = 0, y: numType = 0, z: numType = 0, elementXYZ: Optional[bool] = None):
-        super(Yes_Gate, self).__init__(x, y, z, elementXYZ)
+        super().__init__(x, y, z, elementXYZ)
         self._arguments["ModelID"] = "Yes Gate"
 
-# 非门
 class No_Gate(_2_pin_Gate):
+    ''' 非门 '''
     def __init__(self, x: numType = 0, y: numType = 0, z: numType = 0, elementXYZ: Optional[bool] = None):
-        super(No_Gate, self).__init__(x, y, z, elementXYZ)
+        super().__init__(x, y, z, elementXYZ)
         self._arguments["ModelID"] = "No Gate"
 
-# 3引脚门电路
 class _3_pin_Gate(_logicBase):
+    ''' 3引脚门电路基类 '''
     def __init__(self, x: numType = 0, y: numType = 0, z: numType = 0, elementXYZ: Optional[bool] = None):
         self._arguments = {"ModelID": "", "Identifier": Generate, "IsBroken": False, "IsLocked": False,
                           "Properties": {"高电平": 3.0, "低电平": 0.0, "最大电流": 0.1, "锁定": 1.0},
@@ -126,56 +126,56 @@ class _3_pin_Gate(_logicBase):
     def o(self) -> OutputPin:
         return OutputPin(self, 2)
 
-# 或门
 class Or_Gate(_3_pin_Gate):
+    ''' 或门 '''
     def __init__(self, x: numType = 0, y: numType = 0, z: numType = 0, elementXYZ: Optional[bool] = None):
-        super(Or_Gate, self).__init__(x, y, z, elementXYZ)
+        super().__init__(x, y, z, elementXYZ)
         self._arguments["ModelID"] = "Or Gate"
 
-# 与门
 class And_Gate(_3_pin_Gate):
+    ''' 与门 '''
     def __init__(self, x: numType = 0, y: numType = 0, z: numType = 0, elementXYZ: Optional[bool] = None):
-        super(And_Gate, self).__init__(x, y, z, elementXYZ)
+        super().__init__(x, y, z, elementXYZ)
         self._arguments["ModelID"] = "And Gate"
 
-# 或非门
 class Nor_Gate(_3_pin_Gate):
+    ''' 或非门 '''
     def __init__(self, x: numType = 0, y: numType = 0, z: numType = 0, elementXYZ: Optional[bool] = None):
-        super(Nor_Gate, self).__init__(x, y, z, elementXYZ)
+        super().__init__(x, y, z, elementXYZ)
         self._arguments["ModelID"] = "Nor Gate"
 
-# 与非门
 class Nand_Gate(_3_pin_Gate):
+    ''' 与非门 '''
     def __init__(self, x: numType = 0, y: numType = 0, z: numType = 0, elementXYZ: Optional[bool] = None):
-        super(Nand_Gate, self).__init__(x, y, z, elementXYZ)
+        super().__init__(x, y, z, elementXYZ)
         self._arguments["ModelID"] = "Nand Gate"
 
-# 异或门
 class Xor_Gate(_3_pin_Gate):
+    ''' 异或门 '''
     def __init__(self, x: numType = 0, y: numType = 0, z: numType = 0, elementXYZ: Optional[bool] = None):
-        super(Xor_Gate, self).__init__(x, y, z, elementXYZ)
+        super().__init__(x, y, z, elementXYZ)
         self._arguments["ModelID"] = "Xor Gate"
 
-# 同或门
 class Xnor_Gate(_3_pin_Gate):
+    ''' 同或门 '''
     def __init__(self, x: numType = 0, y: numType = 0, z: numType = 0, elementXYZ: Optional[bool] = None):
-        super(Xnor_Gate, self).__init__(x, y, z, elementXYZ)
+        super().__init__(x, y, z, elementXYZ)
         self._arguments["ModelID"] = "Xnor Gate"
 
-# 蕴含门
 class Imp_Gate(_3_pin_Gate):
+    ''' 蕴含门 '''
     def __init__(self, x: numType = 0, y: numType = 0, z: numType = 0, elementXYZ: Optional[bool] = None):
-        super(Imp_Gate, self).__init__(x, y, z, elementXYZ)
+        super().__init__(x, y, z, elementXYZ)
         self._arguments["ModelID"] = "Imp Gate"
 
-# 蕴含非门
 class Nimp_Gate(_3_pin_Gate):
+    ''' 蕴含非门 '''
     def __init__(self, x: numType = 0, y: numType = 0, z: numType = 0, elementXYZ: Optional[bool] = None):
-        super(Nimp_Gate, self).__init__(x, y, z, elementXYZ)
+        super().__init__(x, y, z, elementXYZ)
         self._arguments["ModelID"] = "Nimp Gate"
 
-# 2体积元件父类
 class _big_element(_logicBase):
+    ''' 2体积元件父类 '''
     def __init__(self, x: numType = 0, y: numType = 0, z: numType = 0, elementXYZ: Optional[bool] = None):
         self._arguments = {"ModelID": "", "Identifier": Generate, "IsBroken": False,
                           "IsLocked": False, "Properties": {"高电平": 3.0, "低电平": 0.0, "锁定": 1.0},
@@ -187,10 +187,10 @@ class _big_element(_logicBase):
     def is_bigElement(self):
         return True
 
-# 半加器
 class Half_Adder(_big_element):
+    ''' 半加器 '''
     def __init__(self, x: numType = 0, y: numType = 0, z: numType = 0, elementXYZ: Optional[bool] = None):
-        super(Half_Adder, self).__init__(x, y, z, elementXYZ)
+        super().__init__(x, y, z, elementXYZ)
         self._arguments["ModelID"] = "Half Adder"
 
     @property
@@ -209,10 +209,10 @@ class Half_Adder(_big_element):
     def o_low(self) -> OutputPin:
         return OutputPin(self, 1)
 
-# 全加器
 class Full_Adder(_big_element):
+    ''' 全加器 '''
     def __init__(self, x: numType = 0, y: numType = 0, z: numType = 0, elementXYZ: Optional[bool] = None):
-        super(Full_Adder, self).__init__(x, y, z, elementXYZ)
+        super().__init__(x, y, z, elementXYZ)
         self._arguments["ModelID"] = "Full Adder"
 
     @property
@@ -235,10 +235,10 @@ class Full_Adder(_big_element):
     def o_low(self) -> OutputPin:
         return OutputPin(self, 1)
 
-# 二位乘法器
 class Multiplier(_big_element):
+    ''' 二位乘法器 '''
     def __init__(self, x: numType = 0, y: numType = 0, z: numType = 0, elementXYZ: Optional[bool] = None):
-        super(Multiplier, self).__init__(x, y, z, elementXYZ)
+        super().__init__(x, y, z, elementXYZ)
         self._arguments["ModelID"] = "Multiplier"
 
     @property
@@ -273,10 +273,10 @@ class Multiplier(_big_element):
     def o_low(self) -> OutputPin:
         return OutputPin(self, 3)
 
-# D触发器
 class D_Flipflop(_big_element):
+    ''' D触发器 '''
     def __init__(self, x: numType = 0, y: numType = 0, z: numType = 0, elementXYZ: Optional[bool] = None):
-        super(D_Flipflop, self).__init__(x, y, z, elementXYZ)
+        super().__init__(x, y, z, elementXYZ)
         self._arguments["ModelID"] = "D Flipflop"
 
     @property
@@ -295,10 +295,10 @@ class D_Flipflop(_big_element):
     def o_low(self) -> OutputPin:
         return OutputPin(self, 1)
 
-# T触发器
 class T_Flipflop(_big_element):
+    ''' T'触发器 '''
     def __init__(self, x: numType = 0, y: numType = 0, z: numType = 0, elementXYZ: Optional[bool] = None):
-        super(T_Flipflop, self).__init__(x, y, z, elementXYZ)
+        super().__init__(x, y, z, elementXYZ)
         self._arguments["ModelID"] = "T Flipflop"
 
     @property
@@ -317,10 +317,32 @@ class T_Flipflop(_big_element):
     def o_low(self) -> OutputPin:
         return OutputPin(self, 1)
 
-# JK触发器
+class Real_T_Flipflop(_big_element):
+    ''' T触发器 '''
+    def __init__(self, x: numType = 0, y: numType = 0, z: numType = 0, elementXYZ: Optional[bool] = None):
+        super().__init__(x, y, z, elementXYZ)
+        self._arguments["ModelID"] = "Real-T Flipflop"
+
+    @property
+    def i_up(self) -> InputPin:
+        return InputPin(self, 2)
+
+    @property
+    def i_low(self) -> InputPin:
+        return InputPin(self, 3)
+
+    @property
+    def o_up(self) -> OutputPin:
+        return OutputPin(self, 0)
+
+    @property
+    def o_low(self) -> OutputPin:
+        return OutputPin(self, 1)
+
 class JK_Flipflop(_big_element):
+    ''' JK触发器 '''
     def __init__(self, x: numType = 0, y: numType = 0, z: numType = 0, elementXYZ: Optional[bool] = None):
-        super(JK_Flipflop, self).__init__(x, y, z, elementXYZ)
+        super().__init__(x, y, z, elementXYZ)
         self._arguments["ModelID"] = "JK Flipflop"
 
     @property
@@ -343,10 +365,10 @@ class JK_Flipflop(_big_element):
     def o_low(self) -> OutputPin:
         return OutputPin(self, 1)
 
-# 计数器
 class Counter(_big_element):
+    ''' 计数器 '''
     def __init__(self, x: numType = 0, y: numType = 0, z: numType = 0, elementXYZ: Optional[bool] = None):
-        super(Counter, self).__init__(x, y, z, elementXYZ)
+        super().__init__(x, y, z, elementXYZ)
         self._arguments["ModelID"] = "Counter"
 
     @property
@@ -373,10 +395,10 @@ class Counter(_big_element):
     def o_low(self) -> OutputPin:
         return OutputPin(self, 3)
 
-# 随机数发生器
 class Random_Generator(_big_element):
+    ''' 随机数发生器 '''
     def __init__(self, x: numType = 0, y: numType = 0, z: numType = 0, elementXYZ: Optional[bool] = None):
-        super(Random_Generator, self).__init__(x, y, z, elementXYZ)
+        super().__init__(x, y, z, elementXYZ)
         self._arguments["ModelID"] = "Random Generator"
 
     @property
@@ -403,8 +425,8 @@ class Random_Generator(_big_element):
     def o_low(self) -> OutputPin:
         return OutputPin(self, 3)
 
-# 8位输入器
 class eight_bit_Input(_logicBase):
+    ''' 8位输入器 '''
     def __init__(self, x: numType = 0, y: numType = 0, z: numType = 0, elementXYZ: Optional[bool] = None):
         self._arguments = {"ModelID": "8bit Input", "Identifier": Generate,
                            "IsBroken": False, "IsLocked": False,
@@ -463,8 +485,8 @@ class eight_bit_Input(_logicBase):
     def o_low(self) -> OutputPin:
         return OutputPin(self, 7)
 
-# 8位显示器
 class eight_bit_Display(_logicBase):
+    ''' 8位显示器 '''
     def __init__(self, x: numType = 0, y: numType = 0, z: numType = 0, elementXYZ: Optional[bool] = None):
         self._arguments = {"ModelID": "8bit Display", "Identifier": Generate,
                           "IsBroken": False, "IsLocked": False,
@@ -510,8 +532,8 @@ class eight_bit_Display(_logicBase):
     def o_low(self) -> OutputPin:
         return OutputPin(self, 7)
 
-# 施密特触发器
 class Schmitt_Trigger(CircuitBase):
+    ''' 施密特触发器 '''
     def __init__(self, x: numType = 0, y: numType = 0, z: numType = 0, elementXYZ: Optional[bool] = None):
         self._arguments = {"ModelID": "Schmitt Trigger", "Identifier": Generate,
                            "IsBroken": False, "IsLocked": False,

{physicslab-1.4.8 → physicslab-1.4.10}/physicsLab/circuit/elements/otherCircuit.py

@@ -268,52 +268,53 @@ class Simple_Instrument(TwoPinMixIn):
     def get_instrument(self) -> int:
         return self._arguments["Properties"]["乐器"]
 
-    # 设置音高
-    def set_Tonality(self, pitch: Union[int, str], tone: Optional[bool] = None) -> "Simple_Instrument":
-        """
-        输入格式：
+    def set_Tonality(self, pitch: Union[int, str], rising_falling: Optional[bool] = None) -> "Simple_Instrument":
+        ''' 输入格式：
             tonality: C4, A5 ...
-            rising_falling = True 时，为升调，为 False 时降调
+            rising_falling = True 时, 为升调, 为 False 时降调
+        '''
 
-        输入范围：
-            C0 ~ C8
-            注: C0: 24, C1: 36, C2: 48, C3: 60, ..., C8: 120
-        """
-        def majorSet_Tonality(self,
-                              tonality: str = "C3",
-                              rising_falling: Optional[bool] = None
-        ) -> None:
-            if (not isinstance(tonality, str) or
-                len(tonality) != 2 or
-                tonality.upper()[0] not in "ABCDEFG" or
-                tonality[1] not in "012345678" or
-                not (isinstance(rising_falling, bool) or rising_falling is None)
-            ):
-                raise TypeError
-
-            var = 1 if rising_falling is True else 0 if rising_falling is None else -1
-
-            pitch = {
-                'A': 22,
-                'B': 23,
-                'C': 24,
-                'D': 25,
-                'E': 26,
-                'F': 27,
-                'G': 28
-            }[tonality.upper()[0]] + 12 * int(tonality[1]) + var
-
-            self._arguments["Properties"]["音高"] = pitch
-
-        # main
         if isinstance(pitch, int):
             if 0 <= pitch < 128:
                 self._arguments["Properties"]["音高"] = pitch
             else:
                 raise TypeError("Input number out of range")
         elif isinstance(pitch, str):
-            majorSet_Tonality(self, pitch, tone)
+            self._arguments["Properties"]["音高"] = majorSet_Tonality(pitch, rising_falling)
         else:
             raise TypeError
 
-        return self
+        return self
+
+def majorSet_Tonality(pitch: str,
+                      rising_falling: Optional[bool] = None
+                      ) -> int:
+    """ 输入格式：
+            tonality: C4, A5 ...
+            rising_falling = True 时，为升调，为 False 时降调
+
+        输入范围：
+            C0 ~ C8
+            注: C0: 24, C1: 36, C2: 48, C3: 60, ..., C8: 120
+    """
+    if (not isinstance(pitch, str) or
+        len(pitch) != 2 or
+        pitch.upper()[0] not in "ABCDEFG" or
+        pitch[1] not in "012345678" or
+        not (isinstance(rising_falling, bool) or rising_falling is None)
+    ):
+        raise TypeError
+
+    var = 1 if rising_falling is True else 0 if rising_falling is None else -1
+
+    pitch = {
+        'A': 22,
+        'B': 23,
+        'C': 24,
+        'D': 25,
+        'E': 26,
+        'F': 27,
+        'G': 28
+    }[pitch.upper()[0]] + 12 * int(pitch[1]) + var
+
+    return pitch