physicsLab 1.1.2__tar.gz → 1.1.6__tar.gz

{physicsLab-1.1.2 → physicsLab-1.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: physicsLab
-Version: 1.1.2
+Version: 1.1.6
 Summary: Doing experiments in the physics lab AR by python
 Home-page: https://gitee.com/script2000/physicsLab
 Author: Goodenough
@@ -25,17 +25,10 @@ License-File: LICENSE.txt
 ## 安装教程
 
 1.  请确保你的电脑有[Python](https://www.python.org)与[物理实验室PC版](https://www.turtlesim.com/)（也可以联系[开发者Jone-Chen](https://gitee.com/civitasjohn)）
-2.  打开physicsLab，克隆到本地  
-你也可以通过pip安装，在cmd或shell输入：
+2.  在cmd或shell输入：
 ```diff
 pip install physicsLab
 ```
-3.  如果你的ide无法找到physicsLab，你可以在代码开头写  
-```python
-import sys
-sys.path.append('physicsLab的路径')
-```
-当然，你也可以通过IDE来解决这个问题
 
 ## 开发环境
 python 3.7, PyCharm, win7  

{physicsLab-1.1.2 → physicsLab-1.1.6}/README.md

@@ -8,17 +8,10 @@
 ## 安装教程
 
 1.  请确保你的电脑有[Python](https://www.python.org)与[物理实验室PC版](https://www.turtlesim.com/)（也可以联系[开发者Jone-Chen](https://gitee.com/civitasjohn)）
-2.  打开physicsLab，克隆到本地  
-你也可以通过pip安装，在cmd或shell输入：
+2.  在cmd或shell输入：
 ```diff
 pip install physicsLab
 ```
-3.  如果你的ide无法找到physicsLab，你可以在代码开头写  
-```python
-import sys
-sys.path.append('physicsLab的路径')
-```
-当然，你也可以通过IDE来解决这个问题
 
 ## 开发环境
 python 3.7, PyCharm, win7  

{physicsLab-1.1.2 → physicsLab-1.1.6}/physicsLab/electricity/__init__.py

@@ -8,4 +8,4 @@ from physicsLab.electricity.elementsClass import *
 # 元件引脚类
 from physicsLab.electricity.elementPin import *
 # 元件坐标系
-from physicsLab.electricity._elementPosition import set_elementXYZ
+from physicsLab.electricity.elementXYZ import *

{physicsLab-1.1.2 → physicsLab-1.1.6}/physicsLab/electricity/element.py

@@ -1,7 +1,7 @@
 #coding=utf-8
 import physicsLab._fileGlobals as _fileGlobals
 from physicsLab.electricity.elementsClass import *
-import physicsLab.electricity._elementPosition as _elementPosition
+import physicsLab.electricity.elementXYZ as _elementXYZ
 
 # 创建原件，本质上仍然是实例化
 def crt_Element(name: str, x : float = 0, y : float = 0, z : float = 0):

physicsLab-1.1.6/physicsLab/electricity/elementXYZ.py

@@ -0,0 +1,77 @@
+# Ԫ������ϵ
+# һ�����ŵij�Ϊ0.15����Ϊ0.075
+# һ�����ŵij������ΪԪ������ϵ��x, y�ĵ�λ����
+# z��ĵ�λ������ԭ����ϵ��0.1
+#
+# ���λ�˷�������Ԫ����λ�ñ��뾭����������ʹԪ����������
+# x, z�᲻������
+# y�������Ϊ +0.045
+
+# _elementClassHead���element_Init_HEAD�в��ִ���Ԫ������ϵ�Ĵ���
+# crt_ExperimentҲ�в��ִ���
+
+from typing import Union
+
+### define ###
+
+# �Ƿ�ȫ������ΪԪ������ϵ
+_elementXYZ = False
+
+@property
+def elementXYZ():
+    return _elementXYZ
+
+@elementXYZ.setter
+def set_elementXYZ(boolen: bool) -> None:
+    if not isinstance(boolen, bool):
+        raise TypeError
+    global _elementXYZ
+    _elementXYZ = bool(boolen)
+
+# ��ʵ����ϵx, y, z��λ1
+_xUnit = 0.16
+_yUnit = 0.08
+_zUnit = 0.1
+# big_element��������
+_xAmend = 0.04
+
+# Ԫ������ϵԭ��
+_xOrigin, _yOrigin, _zOrigin = 0, 0, 0
+### end define ###
+
+# ��Ԫ������ϵת��Ϊ��ʵ֧�ֵ�����ϵ
+def xyzTranslate(x: Union[int, float], y: Union[int, float], z: Union[int, float], isBigElement = False):
+    x *= _xUnit
+    y *= _yUnit
+    z *= _zUnit
+    # �޸�Ԫ������ϵԭ��
+    x += _xOrigin
+    y += _yOrigin
+    # �޸Ĵ�����߼���·ԭ��������
+    if isBigElement:
+        y += _xAmend
+    return x, y, z
+
+# ����ʵ֧�ֵ�����ϵת��ΪԪ������ϵ
+def translateXYZ(x: Union[int, float], y: Union[int, float], z: Union[int, float], isBigElement = False):
+    x /= _xUnit
+    y /= _yUnit
+    z /= _zUnit
+    # �޸�Ԫ������ϵԭ��
+    x -= _xOrigin
+    y -= _yOrigin
+    # �޸Ĵ�����߼���·ԭ��������
+    if isBigElement:
+        y -= _xAmend
+    return x, y, z
+
+# ����Ԫ������ϵԭ��O������ֵΪ��ʵ����ϵ
+def set_O(x: Union[int, float], y: Union[int, float], z: Union[int, float]) -> None:
+    if (isinstance(x, (int, float)) and
+        isinstance(y, (int, float)) and
+        isinstance(z, (int, float))
+    ):
+        global _xOrigin, _yOrigin, _zOrigin
+        _xOrigin, _yOrigin, _zOrigin = x, y, z
+    else:
+        raise TypeError

{physicsLab-1.1.2 → physicsLab-1.1.6}/physicsLab/electricity/elementsClass/_elementClassHead.py

@@ -4,17 +4,10 @@ import string as _string
 from typing import Callable, Union
 import physicsLab._fileGlobals as _fileGlobals
 import physicsLab.electricity.elementPin as _elementPin
-import physicsLab.electricity._elementPosition as _elementPosition
+import physicsLab.electricity.elementXYZ as _elementPosition
 
 # 所有元件的父类
 class elementObject:
-    # 用来避免IDE报太多错的函数，无实际作用
-    def __define(self):
-        self._arguments = {'ModelID': '', 'Identifier': "", 'IsBroken': False, 'IsLocked': False, 'Properties': {},
-                           'Statistics': {}, 'Position': "", 'Rotation': '', 'DiagramCached': False,
-                           'DiagramPosition': {}, 'DiagramRotation': 0}
-        self._index = None
-
     # 设置原件的角度
     def set_Rotation(self, xRotation: Union[int, float] = 0, yRotation: Union[int, float] = 0, zRotation: Union[int, float] = 180):
         if not (isinstance(xRotation, (int, float)) and isinstance(yRotation, (int, float)) and isinstance(zRotation, (int, float))):
@@ -68,15 +61,16 @@ def element_Init_HEAD(isBigElement = False) -> Callable:
             if not isinstance(x, (float, int)) and isinstance(y, (float, int)) and isinstance(z, (float, int)):
                 raise TypeError('illegal argument')
             x, y, z = _fileGlobals.myRound(x), _fileGlobals.myRound(y), _fileGlobals.myRound(z)
+            self._position = (x, y, z)
             # 元件坐标系
             if elementXYZ == True or (_elementPosition.elementXYZ == True and elementXYZ is None):
-                x, y, z = _elementPosition.translate(x, y, z, bool(isBigElement))
-            self._position = (x, y, z)
+                x, y, z = _elementPosition.xyzTranslate(x, y, z, bool(isBigElement))
+            # 该坐标是否已存在
             if self._position in _fileGlobals.elements_Address.keys():
                 raise RuntimeError("The position already exists")
             func(self, x, y, z)
             self._arguments["Identifier"] = ''.join(_random.choice(_string.ascii_letters + _string.digits) for _ in range(32))
-            self._arguments["Position"] = f"{self._position[0]},{self._position[2]},{self._position[1]}"
+            self._arguments["Position"] = f"{x},{z},{y}"
             _fileGlobals.Elements.append(self._arguments)
             _fileGlobals.elements_Address[self._position] = self
             self.set_Rotation()

{physicsLab-1.1.2 → physicsLab-1.1.6}/physicsLab/experiment.py

@@ -1,18 +1,19 @@
 #coding=utf-8
-import json as _json
+import os as _os
 import sys as _sys
+import json as _json
 import random as _random
 import string as _string
-import os as _os
 
-from ._utf_8 import utf8_coding as _utf8_coding
 import physicsLab._fileGlobals as _fileGlobals
 from physicsLab.electricity.element import crt_Element
-import physicsLab.electricity._elementPosition as _elementPosition
 
 ### define ###
 
+# 是否已经有存档被打开或创建
 _ifndef_open_Experiment = False
+# 打印write_Experiment的信息时是否使用彩色字
+_printColor = True
 
 def print_Elements():
     print(_fileGlobals.Elements)
@@ -45,6 +46,27 @@ def old_open_Experiment(file: str) -> None:
         except:
             raise RuntimeError('Data errors in the file')
 
+# 将import了physicsLab的文件的第一行添加上 #coding=utf-8
+def _utf8_coding(func):
+    def result(string: str) -> None:
+        try: # 在cmd或者shell上无法执行该功能
+            import sys
+            s = ''
+            with open(sys.argv[0], encoding='utf-8') as f:
+                s = f.read()
+            if not s.replace('\n', '').startswith('#coding=utf-8'):
+                with open(sys.argv[0], 'w', encoding='utf-8') as f:
+                    if s.startswith('\n'):
+                        f.write(f'#coding=utf-8{s}')
+                    else:
+                        f.write(f'#coding=utf-8\n{s}')
+        except FileNotFoundError:
+            # 在cmd或IDLE上运行时会关闭打印彩字功能
+            global _printColor
+            _printColor = False
+        func(string)
+    return result
+
 # 打开一个指定的sav文件（支持输入本地实验的名字或sav文件名）
 @_utf8_coding
 def open_Experiment(file : str) -> None:
@@ -138,7 +160,10 @@ def write_Experiment() -> None:
             experiments.pop(0)
     with open(f'{_fileGlobals.savName[:len(_fileGlobals.savName) - 4:]}_rollBack_sav.txt', 'w', encoding='utf-8') as f:
         f.write(_json.dumps(experiments, indent=2, ensure_ascii=False))
-    print(f'\nCompile successfully! {_fileGlobals.Elements.__len__()} elements, {_fileGlobals.Wires.__len__()} wires.')
+    if _printColor:
+        print(f'\033[32mSuccessfully compiled! {_fileGlobals.Elements.__len__()} elements, {_fileGlobals.Wires.__len__()} wires.\033[39m')
+    else:
+        print(f'Successfully compiled! {_fileGlobals.Elements.__len__()} elements, {_fileGlobals.Wires.__len__()} wires.')
 
 # 读取sav文件已有的原件与导线
 def read_Experiment() -> None:

{physicsLab-1.1.2 → physicsLab-1.1.6}/physicsLab.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: physicsLab
-Version: 1.1.2
+Version: 1.1.6
 Summary: Doing experiments in the physics lab AR by python
 Home-page: https://gitee.com/script2000/physicsLab
 Author: Goodenough
@@ -25,17 +25,10 @@ License-File: LICENSE.txt
 ## 安装教程
 
 1.  请确保你的电脑有[Python](https://www.python.org)与[物理实验室PC版](https://www.turtlesim.com/)（也可以联系[开发者Jone-Chen](https://gitee.com/civitasjohn)）
-2.  打开physicsLab，克隆到本地  
-你也可以通过pip安装，在cmd或shell输入：
+2.  在cmd或shell输入：
 ```diff
 pip install physicsLab
 ```
-3.  如果你的ide无法找到physicsLab，你可以在代码开头写  
-```python
-import sys
-sys.path.append('physicsLab的路径')
-```
-当然，你也可以通过IDE来解决这个问题
 
 ## 开发环境
 python 3.7, PyCharm, win7  

{physicsLab-1.1.2 → physicsLab-1.1.6}/physicsLab.egg-info/SOURCES.txt

@@ -4,7 +4,6 @@ pyproject.toml
 setup.py
 physicsLab/__init__.py
 physicsLab/_fileGlobals.py
-physicsLab/_utf_8.py
 physicsLab/errors.py
 physicsLab/experiment.py
 physicsLab/userlog.py
@@ -14,9 +13,9 @@ physicsLab.egg-info/dependency_links.txt
 physicsLab.egg-info/top_level.txt
 physicsLab/astrophysics/__init__.py
 physicsLab/electricity/__init__.py
-physicsLab/electricity/_elementPosition.py
 physicsLab/electricity/element.py
 physicsLab/electricity/elementPin.py
+physicsLab/electricity/elementXYZ.py
 physicsLab/electricity/wire.py
 physicsLab/electricity/elementsClass/__init__.py
 physicsLab/electricity/elementsClass/_elementClassHead.py

{physicsLab-1.1.2 → physicsLab-1.1.6}/setup.py

@@ -6,7 +6,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setuptools.setup(
     name="physicsLab",  # 用自己的名替换其中的YOUR_USERNAME_
-    version="1.1.2",  # 包版本号，便于维护版本
+    version="1.1.6",  # 包版本号，便于维护版本
     author="Goodenough",  # 作者，可以写自己的姓名
     author_email="2381642961@qq.com",  # 作者联系方式，可写自己的邮箱地址
     description="Doing experiments in the physics lab AR by python",  # 包的简述

physicsLab-1.1.2/physicsLab/_utf_8.py

@@ -1,15 +0,0 @@
-# 将import了physicsLab的文件的第一行添加上 #coding=utf-8
-def utf8_coding(func):
-    def result(string: str) -> None:
-        import sys
-        s = ''
-        with open(sys.argv[0], encoding='utf-8') as f:
-            s = f.read()
-        if not s.startswith('#coding=utf-8'):
-            with open(sys.argv[0], 'w', encoding='utf-8') as f:
-                if s.startswith('\n'):
-                    f.write(f'#coding=utf-8{s}')
-                else:
-                    f.write(f'#coding=utf-8\n{s}')
-        func(string)
-    return result

physicsLab-1.1.2/physicsLab/electricity/_elementPosition.py

@@ -1,39 +0,0 @@
-# Ԫ������ϵ
-# һ�����ŵij�Ϊ0.15����Ϊ0.075
-# һ�����ŵij������ΪԪ������ϵ��x, y�ĵ�λ����
-# z��ĵ�λ������ԭ����ϵ��0.1
-#
-# ���λ�˷�������Ԫ����λ�ñ��뾭����������ʹԪ����������
-# x, z�᲻������
-# y�������Ϊ +0.045
-
-# _elementClassHead���element_Init_HEAD�в��ִ���Ԫ������ϵ�Ĵ���
-# crt_ExperimentҲ�в��ִ���
-
-from typing import Union
-
-### define ###
-elementXYZ = False
-### end define ###
-
-# ��Ԫ������ϵת��Ϊ��ʵ֧�ֵ�����ϵ
-def translate(x: Union[int, float], y: Union[int, float], z: Union[int, float], isBigElement = False):
-    x *= 0.15
-    y *= 0.075
-    z *= 0.1
-    if isBigElement:
-        y += 0.045
-    return x, y, z
-
-# ����ʵ֧�ֵ�����ϵת��ΪԪ������ϵ
-def change(x: Union[int, float], y: Union[int, float], z: Union[int, float], isBigElement = False):
-    x /= 0.15
-    y /= 0.075
-    z /= 0.1
-    if isBigElement:
-        y -= 0.045
-    return x, y, z
-
-def set_elementXYZ(boolen: bool):
-    global elementXYZ
-    elementXYZ = bool(boolen)