physicsLab 1.4.5__tar.gz → 1.4.6__tar.gz

{physicsLab-1.4.5 → physicsLab-1.4.6}/PKG-INFO

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

{physicsLab-1.4.5 → physicsLab-1.4.6}/physicsLab/__init__.py

@@ -32,6 +32,26 @@ else:
     if not os.path.exists("physicsLabSav"):
         os.mkdir("physicsLabSav")
 
+# 获取 Physics-Lab-AR 版本
+def get_Physics_Lab_AR_version() -> Optional[str]:
+    if platform.system() == "Windows":
+        from getpass import getuser
+        version_file = f"C:/Users/{getuser()}/AppData/LocalLow/CIVITAS/Quantum Physics/Unity/" \
+                       f"30fdf88e-c67c-4ae8-a0f5-83bb57b9a5c3/Analytics/values"
+        if os.path.exists(version_file):
+            import json
+            with open(version_file) as f:
+                version = json.load(f)["app_ver"]
+                return version
+
+    return None
+
+plAR_version = get_Physics_Lab_AR_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")
+
 __all__ = [
     # _colorUtils.py
     "close_color_print",

{physicsLab-1.4.5 → physicsLab-1.4.6}/physicsLab/_colorUtils.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-import sys
+import platform
 from enum import Enum, unique
 
 @unique
@@ -17,7 +17,7 @@ class COLOR(Enum):
 # 打印write_Experiment的信息时是否使用彩色字
 colorSupport = True
 
-if colorSupport and sys.platform == "win32":
+if colorSupport and platform.system == "Windows":
     try:
         # https://stackoverflow.com/questions/36760127/...
         # how-to-use-the-new-support-for-ansi-escape-sequences-in-the-windows-10-console

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

@@ -3,12 +3,13 @@ import inspect
 
 from physicsLab import errors
 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.experiment import Experiment, stack_Experiment
-from physicsLab.typehint import Optional, NoReturn, Self, numType
 
 # electricity class's metaClass
 class CircuitMeta(type):
@@ -67,9 +68,8 @@ class CircuitMeta(type):
         CircuitMeta.__index += 1
         return self
 
-
 # 所有电学元件的父类
-class CircuitBase(metaclass=CircuitMeta):
+class CircuitBase(ElementBase, metaclass=CircuitMeta):
     def __repr__(self) -> str:
         #TODO Simple_Instrument 的__repr__方法参数更多
         return f"{self.__class__.__name__}" \

{physicsLab-1.4.5 → physicsLab-1.4.6}/physicsLab/circuit/elements/basicCircuit.py

@@ -9,7 +9,7 @@ from ._elementBase import CircuitBase, TwoPinMixIn
 # 开关基类
 class _switch_Base(CircuitBase):
     def __init__(self, x: numType = 0, y: numType = 0, z: numType = 0, elementXYZ: Optional[bool] = None):
-        self._arguments = {"ModelID": "", "Identifier": Generate, "IsBroken": False,
+        self._arguments = {"ModelID": Generate, "Identifier": Generate, "IsBroken": False,
                           "IsLocked": False, "Properties": {"开关": 0, "锁定": 1.0},
                           "Statistics": {}, "Position": Generate,
                           "Rotation": Generate, "DiagramCached": False,
@@ -26,6 +26,14 @@ class Simple_Switch(_switch_Base, TwoPinMixIn):
         super(Simple_Switch, self).__init__(x, y, z, elementXYZ)
         self._arguments["ModelID"] = "Simple Switch"
 
+    def __repr__(self) -> str:
+        res = f"Simple_Switch({self._position.x}, {self._position.y}, {self._position.z}, " \
+              f"elementXYZ={self.is_elementXYZ})"
+
+        if self._arguments["Properties"]["开关"] == 1:
+            res += ".turn_on_switch()"
+        return res
+
     # 闭合开关
     def turn_on_switch(self) -> Self:
         self._arguments["Properties"]["开关"] = 1
@@ -37,6 +45,16 @@ class SPDT_Switch(_switch_Base):
         super(SPDT_Switch, self).__init__(x, y, z, elementXYZ)
         self._arguments["ModelID"] = "SPDT Switch"
 
+    def __repr__(self) -> str:
+        res = f"SPDT_Switch({self._position.x}, {self._position.y}, {self._position.z}, " \
+              f"elementXYZ={self.is_elementXYZ})"
+
+        if self._arguments["Properties"]["开关"] == 1:
+            res += ".left_turn_on_switch()"
+        elif self._arguments["Properties"]["开关"] == 2:
+            res += ".right_turn_on_switch()"
+        return res
+
     # 向左闭合开关
     def left_turn_on_switch(self) -> Self:
         self._arguments["Properties"]["开关"] = 1
@@ -65,6 +83,16 @@ class DPDT_Switch(_switch_Base):
         super(DPDT_Switch, self).__init__(x, y, z, elementXYZ)
         self._arguments["ModelID"] = "DPDT Switch"
 
+    def __repr__(self) -> str:
+        res = f"DPDT_Switch({self._position.x}, {self._position.y}, {self._position.z}, " \
+              f"elementXYZ={self.is_elementXYZ})"
+
+        if self._arguments["Properties"]["开关"] == 1:
+            res += ".left_turn_on_switch()"
+        elif self._arguments["Properties"]["开关"] == 2:
+            res += ".right_turn_on_switch()"
+        return res
+
     # 向左闭合开关
     def left_turn_on_switch(self) -> Self:
         self._arguments["Properties"]["开关"] = 1
@@ -119,6 +147,14 @@ class Air_Switch(TwoPinMixIn):
                            "Position": Generate, "Rotation": Generate, "DiagramCached": False,
                            "DiagramPosition": {"X": 0, "Y": 0, "Magnitude": 0.0}, "DiagramRotation": 0}
 
+    def __repr__(self) -> str:
+        res = f"Air_Switch({self._position.x}, {self._position.y}, {self._position.z}, " \
+              f"elementXYZ={self.is_elementXYZ})"
+
+        if self._arguments["Properties"]["开关"] == 1:
+            res += ".turn_on_switch()"
+        return res
+
     # 断开开关
     def turn_off_switch(self) -> Self:
         self._arguments["Properties"]["开关"] = 0

{physicsLab-1.4.5 → physicsLab-1.4.6}/physicsLab/circuit/elements/logicCircuit.py

@@ -45,9 +45,17 @@ class Logic_Input(_logicBase):
                           "DiagramPosition": {"X": 0, "Y": 0, "Magnitude": 0.0},
                           "DiagramRotation": 0}
 
+    def __repr__(self) -> str:
+        res = f"Logic_Input({self._position.x}, {self._position.y}, {self._position.z}, " \
+              f"elementXYZ={self.is_elementXYZ})"
+
+        if self._arguments["Properties"]["开关"] == 1.0:
+            res += ".set_highLevel()"
+        return res
+
     # 将逻辑输入的状态设置为1
     def set_highLevel(self) -> "Logic_Input":
-        self._arguments["Properties"][u"开关"] = 1.0
+        self._arguments["Properties"]["开关"] = 1.0
         return self
 
     @property
@@ -405,6 +413,14 @@ class eight_bit_Input(_logicBase):
                            "Position": Generate, "Rotation": Generate, "DiagramCached": False,
                            "DiagramPosition": {"X": 0, "Y": 0, "Magnitude": 0.0}, "DiagramRotation": 0}
 
+    def __repr__(self) -> str:
+        res = f"eight_bit_Input({self._position.x}, {self._position.y}, {self._position.z}, " \
+              f"elementXYZ={self.is_elementXYZ})"
+
+        if self._arguments["Properties"]["十进制"] != 0:
+            res += f".set_num({self._arguments['Properties']['十进制']})"
+        return res
+
     def set_num(self, num : int):
         if 0 <= num <= 255:
             self._arguments["Properties"]["十进制"] = num

{physicsLab-1.4.5 → physicsLab-1.4.6}/physicsLab/circuit/elements/otherCircuit.py

@@ -205,7 +205,6 @@ class Simple_Instrument(TwoPinMixIn):
             rated_oltage: numType = 3.0, # 额定电压
             is_ideal_model: bool = False, # 是否为理想模式
             is_single: bool = True, # 简单乐器是否只响一次
-            other_chord_notes: list = [], # 其他和弦音
     ) -> None:
         if not (
             (isinstance(instrument, int) and 0 <= instrument <= 128) and
@@ -228,8 +227,6 @@ class Simple_Instrument(TwoPinMixIn):
 
         self.set_Tonality(pitch)
         self.notes: List[int] = [self._arguments["Properties"]["音高"]] # 仅用于记录self已有的音符
-        for a_note in other_chord_notes:
-            self.add_note(a_note)
 
     @property
     def i(self) -> Pin:
@@ -246,8 +243,8 @@ class Simple_Instrument(TwoPinMixIn):
                f"velocity={self._arguments['Properties']['音量']}, " \
                f"rated_oltage={self._arguments['Properties']['额定电压']}, " \
                f"is_ideal_model={self._arguments['Properties']['理想模式']}, " \
-               f"is_single={bool(self._arguments['Properties']['脉冲'])}, " \
-               f"other_chord_notes={self.notes})"
+               f"is_single={bool(self._arguments['Properties']['脉冲'])}" \
+               f").add_note({str(self.notes)[1:-2]})"
 
     # 物实v2.4.7新功能: 简单乐器同时播放多个音符
     def add_note(self, *pitchs: int) -> Self:

{physicsLab-1.4.5 → physicsLab-1.4.6}/physicsLab/circuit/wire.py

@@ -68,6 +68,8 @@ class Wire:
     def __hash__(self) -> int:
         return hash(
             (self.Source.element_self, self.Source.pinLabel, self.Target.element_self, self.Target.pinLabel)
+        ) + hash(
+            (self.Target.element_self, self.Target.pinLabel, self.Source.element_self, self.Source.pinLabel)
         )
 
     def __eq__(self, other: "Wire") -> bool:

physicsLab-1.4.6/physicsLab/elementBase.py

@@ -0,0 +1,2 @@
+class ElementBase:
+    pass

{physicsLab-1.4.5 → physicsLab-1.4.6}/physicsLab/music/music.py

@@ -48,10 +48,35 @@ class Midi:
             program: midi音色
             tempo: 播放速度
         '''
+        def read_midopy(plpath: str = "temp.mido.py") -> Self:
+            self.midifile = "temp.mid"
+
+            context = None
+            with open(plpath, encoding="utf-8") as f:
+                context = f.read()
+
+            import re
+            from mido import MidiFile, MidiTrack, Message, MetaMessage
+            # 正则匹配内容: MidiTrack([Message(...), ...])
+            re_context = re.search(r"MidiTrack\(\[[^\]]+\]\)", context, re.M)
+            if re_context is None:
+                raise SyntaxError(f"error context in {plpath}")
+            self.messages = eval(re_context.group()) # 用到mido import出的内容
+
+            return self
+
         if not isinstance(midifile, str):
             raise TypeError
 
-        self.midifile: str = midifile
+        from os import path
+        if not path.exists(midifile):
+            raise FileNotFoundError
+
+        if midifile.endswith(".mido.py"):
+            read_midopy(midifile)
+        else:
+            self.midifile: str = midifile
+
         self.channels: List[int] = [0] * 16
         self.tempo: int = 500_000
         self.messages: mido.MidiTrack = self.__get_midi_messages()
@@ -196,7 +221,7 @@ class Midi:
         return res
 
     # 转换为physicsLab的piece类
-    def translate_to_piece(self, div_time: numType = 100, max_notes: Optional[int] = 800) -> "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))
 
     ''' *.pl.py文件:
@@ -210,27 +235,6 @@ class Midi:
         为了修改方便, 默认使用 str(mido.MidiTrack) 的方式导出
         而且是个Py文件, 大家想要自己修改也是很方便的
     '''
-    def read_midopy(self, plpath: str = "temp.mido.py") -> Self:
-        def _read_midopy(plpath):
-            context = None
-            with open(plpath, encoding="utf-8") as f:
-                context = f.read()
-
-            import re
-            from mido import MidiFile, MidiTrack, Message, MetaMessage
-            # 正则匹配内容: MidiTrack([Message(...), ...])
-            re_context = re.search(r"MidiTrack\(\[[^\]]+\]\)", context, re.M)
-            if re_context is None:
-                raise SyntaxError(f"error context in {plpath}")
-            self.messages = eval(re_context.group()) # 用到mido import出的内容
-
-        from os import path
-        if not path.exists(plpath):
-            raise FileNotFoundError
-
-        self.midifile = "temp.mid"
-        _read_midopy(plpath)
-        return self
 
     # 导出一个 .mido.py 文件
     def write_midopy(self, path: str="temp.mido.py") -> Self:
@@ -238,7 +242,9 @@ class Midi:
             path += ".mido.py"
 
         with open(path, "w", encoding="utf-8") as f:
-            f.write(f"from mido import MidiFile, MidiTrack, MetaMessage, Message\n"
+            f.write(f"import os\n"
+                    f"os.environ['PYGAME_HIDE_SUPPORT_PROMPT'] = '1'\n"
+                    f"from mido import MidiFile, MidiTrack, MetaMessage, Message\n"
                     f"mid = MidiFile()\n"
                     f"track = {str(self.messages)}\n"
                     f"mid.tracks.append(track)\n"
@@ -533,7 +539,7 @@ class Piece:
         return self
 
     # 将Piece类转换为Midi
-    def translate_to_midi(self, filepath="temp.mid") -> Midi:
+    def to_midi(self, filepath="temp.mid") -> Midi:
         self.write_midi(filepath)
         return Midi(filepath)
 

{physicsLab-1.4.5 → physicsLab-1.4.6}/physicsLab/unit/__init__.py

@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
-from .unionLogic import *
+from .logic import *
 # 模块化电路引脚连接
 from .wires import *

physicsLab-1.4.5/physicsLab/unit/unionLogic.py → physicsLab-1.4.6/physicsLab/unit/logic.py

@@ -41,7 +41,7 @@ class Union_LogicBase(UnionBase):
             element.set_LowLeaveValue(num)
         return self
 
-# 只读非门，若没有则创建一个只读非门，若已存在则不会创建新的元件，该类为单例模式
+# 只读非门，若没有则创建一个只读非门，若已存在则不会创建新的元件
 class Const_NoGate:
     __singleton: "Const_NoGate" = None # type: ignore
     __singleton_NoGate: No_Gate = None # type: ignore

{physicsLab-1.4.5 → physicsLab-1.4.6}/physicsLab.egg-info/PKG-INFO

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

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

@@ -5,6 +5,7 @@ physicsLab/__init__.py
 physicsLab/_colorUtils.py
 physicsLab/_tools.py
 physicsLab/element.py
+physicsLab/elementBase.py
 physicsLab/errors.py
 physicsLab/experiment.py
 physicsLab/experimentType.py
@@ -32,5 +33,5 @@ physicsLab/music/__init__.py
 physicsLab/music/music.py
 physicsLab/unit/__init__.py
 physicsLab/unit/_unionClassHead.py
-physicsLab/unit/unionLogic.py
+physicsLab/unit/logic.py
 physicsLab/unit/wires.py

{physicsLab-1.4.5 → physicsLab-1.4.6}/setup.py

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