osis-python 0.5.2__tar.gz → 0.5.3__tar.gz

{osis_python-0.5.2/src/osis_python.egg-info → osis_python-0.5.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: osis-python
-Version: 0.5.2
+Version: 0.5.3
 Summary: A Python client library for Osis APDL
 Author-email: "CCCC Highway Consultant Co. Ltd." <support@osisbim.com>
 License-Expression: MIT

{osis_python-0.5.2 → osis_python-0.5.3/src/osis_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: osis-python
-Version: 0.5.2
+Version: 0.5.3
 Summary: A Python client library for Osis APDL
 Author-email: "CCCC Highway Consultant Co. Ltd." <support@osisbim.com>
 License-Expression: MIT

{osis_python-0.5.2 → osis_python-0.5.3}/src/osis_python.egg-info/SOURCES.txt

@@ -26,6 +26,9 @@ src/pyosis/core/engine.py
 src/pyosis/core/exceptions.py
 src/pyosis/core/references.py
 src/pyosis/core/sync_apdl_cli.py
+src/pyosis/display/__init__.py
+src/pyosis/display/interface.py
+src/pyosis/display/manager.py
 src/pyosis/dynamic/__init__.py
 src/pyosis/dynamic/load_to_mass.py
 src/pyosis/dynamic/manager.py
@@ -107,4 +110,5 @@ src/pyosis/transfer/out_to_python.py
 src/pyosis/transfer/parser.py
 src/pyosis/transfer/routes.py
 src/pyosis/transfer/split.py
-tests/test_delete_occupied.py
+tests/test_delete_occupied.py
+tests/test_project_manager.py

{osis_python-0.5.2 → osis_python-0.5.3}/src/pyosis/__init__.py

@@ -7,7 +7,7 @@ A library for extending OSIS functionality.
 A library that allows users to use CAE with great flexibility.
 """
 
-__version__ = "0.5.2"
+__version__ = "0.5.3"
 __author__ = "CCCC Highway Consultant Co. Ltd." # 中交公路规划设计院 - 工程技术研究中心 - lzh - wjh - myf
 
 from .core.engine import OSISEngine

{osis_python-0.5.2 → osis_python-0.5.3}/src/pyosis/core/all_func.py

@@ -19,4 +19,5 @@ from ..settlement import *
 from ..stability import *
 
 from ..post import *
-from ..result import *
+from ..result import *
+from ..display import *

{osis_python-0.5.2 → osis_python-0.5.3}/src/pyosis/core/engine.py

@@ -41,6 +41,7 @@ from ..stability.manager import StabilityManager, stability_manager
 from ..dynamic.manager import DynamicManager, dynamic_manager
 from ..post.manager import PostManager, post_manager
 from ..result.manager import ResultManager, result_manager
+from ..display.manager import DisplayManager, display_manager
 from ..general.interface import (
     osis_matrix,
     output_result_for_calc_book,
@@ -78,6 +79,7 @@ class OSISEngine:
         - dynamic:   动力分析管理器（荷载转换质量、模态、反应谱）
         - post:      后处理管理器（荷载组合、规范验算、结果显示）
         - result:    结果导出管理器（工况结果、包络结果、验算结果）
+        - display:   显示管理器（边界 / 荷载 / 钢束显隐等）
 
     通用操作可直接通过 engine 调用：
         - run(), solve(), replot(), clear(), clc()
@@ -114,6 +116,9 @@ class OSISEngine:
         ### 后处理 ###
         self._post = post_manager
         self._result = result_manager
+        
+        ### 显示 ###
+        self._display = display_manager
 
         # OSIS端口与网址
         if port is None:
@@ -228,6 +233,13 @@ class OSISEngine:
         """结果导出管理器（工况结果、包络结果、验算结果）"""
         return self._result
 
+    ### 显示 ###
+
+    @property
+    def display(self) -> DisplayManager:
+        """显示管理器（边界 / 荷载 / 钢束显隐等）"""
+        return self._display
+
     # ──────────────────────────────────────────
     # 通用操作（直接暴露 general 和 core 的函数）
     # ──────────────────────────────────────────
@@ -297,9 +309,14 @@ class OSISEngine:
     # 便捷方法（委托给 project manager）
     # ──────────────────────────────────────────
 
-    def save_project(self) -> None:
-        """保存当前项目"""
-        self._project.save()
+    def save_project(self, filepath: str = "") -> None:
+        """保存项目
+
+        Args:
+            filepath: 工程文件路径。为空时使用当前项目路径；
+                非空时使用传入路径。
+        """
+        self._project.save(filepath)
 
     def new_project(self, type: int = 1, filepath: str = "") -> None:
         """新建项目
@@ -318,6 +335,10 @@ class OSISEngine:
         """
         self._project.open(filepath)
 
+    def close(self) -> None:
+        """关闭 OSIS 软件"""
+        self._project.close()
+
     # ──────────────────────────────────────────
     # 便捷方法（委托给 control manager）
     # ──────────────────────────────────────────

osis_python-0.5.3/src/pyosis/display/__init__.py

@@ -0,0 +1,8 @@
+"""
+pyosis.display
+
+显示控制（显隐、视图方向、显示开关等）
+"""
+
+from .interface import *
+from .manager import DisplayManager, display_manager

osis_python-0.5.3/src/pyosis/display/interface.py

@@ -0,0 +1,103 @@
+"""显示控制命令接口
+
+控制边界、荷载、钢束显隐，以及视图方向、显示开关等。
+"""
+
+from typing import Literal, Sequence, Union
+
+from ..core import REGISTRY
+
+
+@REGISTRY.register("DispCtrl")
+def osis_disp_ctrl(
+    eObject: Literal["bc", "boundary", "lg", "load", "td", "tendon"],
+    eType: str,
+    ids: Union[str, int, Sequence[Union[str, int]]],
+    bShow: Literal[0, 1] = 1,
+):
+    """控制边界 / 荷载 / 钢束的显示与隐藏。
+
+    格式: ``dispctrl,<Object>,<Type>,<Number/Name...>,<0|1>``
+
+    Args:
+        eObject (str): 对象类型
+            * ``bc`` / ``boundary`` = 边界
+            * ``lg`` / ``load`` = 荷载
+            * ``td`` / ``tendon`` = 钢束
+        eType (str): 子类型
+            * 边界: ``all``, ``general``, ``mstslv``, ``release``, ``elstcspt``,
+              ``generalelstcspt``, ``rigid``, ``secfactor``
+            * 荷载: ``all``, ``gravity``, ``nforce``, ``line``, ``pointforce``,
+              ``pointmoment``, ``displacement``, ``initial``, ``utemp``, ``gtemp``,
+              ``pst``, ``cforce``, ``elementsurface``
+            * 钢束: 通常为 ``all``
+        ids: 编号或名称
+            * ``all`` = 全部
+            * 单个编号 / 名称，或多个组成的序列（如 ``[1, 2, "3to10"]``、``["T1", "T2"]``）
+        bShow (int): ``0`` = 隐藏，``1`` = 显示
+
+    Returns:
+        tuple (bool, str): 是否成功，失败原因
+
+    Examples:
+        >>> # 显示全部边界
+        >>> osis_disp_ctrl("bc", "all", "all", 1)
+        >>> # 显示一般边界 1、2、3to10
+        >>> osis_disp_ctrl("bc", "general", [1, 2, "3to10"], 1)
+        >>> # 显示全部节点力荷载
+        >>> osis_disp_ctrl("lg", "nforce", "all", 1)
+        >>> # 显示名为 DeadLoad 的荷载
+        >>> osis_disp_ctrl("lg", "all", "DeadLoad", 1)
+        >>> # 隐藏钢束 1、2、3to10
+        >>> osis_disp_ctrl("td", "all", [1, 2, "3to10"], 0)
+        >>> # 显示钢束 T1、T2
+        >>> osis_disp_ctrl("td", "all", ["T1", "T2"], 1)
+    """
+    pass
+
+
+@REGISTRY.register("/control")
+def osis_control(
+    eAction: str,
+    eArg: str | None = None,
+):
+    """视图 / 界面控制命令。
+
+    格式: ``/control,<Action>[,<Arg>]``
+
+    Args:
+        eAction (str): 子命令
+            * ``view`` = 切换视图方向（配合 eArg）
+            * 其他如 ``quickCreateModel`` 等
+        eArg (str | None): 子命令参数
+            * 当 eAction 为 ``view`` 时: ``standard`` / ``top`` / ``right`` / ``front``
+
+    Returns:
+        tuple (bool, str): 是否成功，失败原因
+
+    Examples:
+        >>> osis_control("view", "standard")
+        >>> osis_control("view", "top")
+        >>> osis_control("view", "right")
+        >>> osis_control("view", "front")
+    """
+    pass
+
+
+@REGISTRY.register("Plsm")
+def osis_plsm(bFlag: Literal[0, 1] = 1):
+    """显示开关（Plsm）。
+
+    格式: ``plsm,<0|1>``
+
+    Args:
+        bFlag (int): ``0`` = 关，``1`` = 开
+
+    Returns:
+        tuple (bool, str): 是否成功，失败原因
+
+    Examples:
+        >>> osis_plsm(1)
+        >>> osis_plsm(0)
+    """
+    pass

osis_python-0.5.3/src/pyosis/display/manager.py

@@ -0,0 +1,115 @@
+"""显示管理器 - 控制显隐、视图方向与显示开关
+
+设计理念：
+- 隐藏底层命令接口细节，提供原生 Python 风格 API
+- 无状态设计，操作直接提交到 OSIS
+
+用法:
+    >>> from pyosis.display import display_manager
+    >>> display_manager.disp_ctrl("bc", "all", "all", 1)
+    >>> display_manager.set_view("top")
+    >>> display_manager.set_plsm(1)
+"""
+
+from __future__ import annotations
+
+from typing import Literal, Sequence, Union
+
+from .interface import osis_control, osis_disp_ctrl, osis_plsm
+
+
+class DisplayManager:
+    """显示管理器
+
+    控制边界 / 荷载 / 钢束显隐、视图方向与显示开关。
+    """
+
+    def disp_ctrl(
+        self,
+        obj: Literal["bc", "boundary", "lg", "load", "td", "tendon"],
+        type: str,
+        ids: Union[str, int, Sequence[Union[str, int]]],
+        show: Literal[0, 1] = 1,
+    ) -> None:
+        """控制边界 / 荷载 / 钢束的显示与隐藏。
+
+        Args:
+            obj: 对象类型
+                * ``bc`` / ``boundary`` = 边界
+                * ``lg`` / ``load`` = 荷载
+                * ``td`` / ``tendon`` = 钢束
+            type: 子类型（``all`` 或具体类型，见 ``osis_disp_ctrl`` 文档）
+            ids: 编号或名称（``all`` / 单个 / 序列）
+            show: ``0`` = 隐藏，``1`` = 显示
+
+        Raises:
+            RuntimeError: 操作失败时抛出异常
+
+        Examples:
+            >>> display_manager.disp_ctrl("bc", "all", "all", 1)
+            >>> display_manager.disp_ctrl("bc", "general", [1, 2, "3to10"], 1)
+            >>> display_manager.disp_ctrl("lg", "nforce", "all", 1)
+            >>> display_manager.disp_ctrl("td", "all", ["T1", "T2"], 1)
+        """
+        ok, err = osis_disp_ctrl(obj, type, ids, show)
+        if not ok:
+            raise RuntimeError(f"显示控制失败: {err}")
+
+    def control(self, action: str, arg: str | None = None) -> None:
+        """视图 / 界面控制（对应 ``/control,...``）。
+
+        Args:
+            action: 子命令，如 ``view``、``quickCreateModel``
+            arg: 子命令参数；``view`` 时为 ``standard`` / ``top`` / ``right`` / ``front``
+
+        Raises:
+            RuntimeError: 操作失败时抛出异常
+        """
+        ok, err = osis_control(action, arg)
+        if not ok:
+            raise RuntimeError(f"界面控制失败: {err}")
+
+    def set_view(
+        self,
+        view: Literal["standard", "top", "right", "front"] = "standard",
+    ) -> None:
+        """切换视图方向。
+
+        Args:
+            view: ``standard`` / ``top`` / ``right`` / ``front``
+
+        Raises:
+            RuntimeError: 操作失败时抛出异常
+
+        Examples:
+            >>> display_manager.set_view("top")
+            >>> display_manager.set_view("front")
+        """
+        self.control("view", view)
+
+    def set_plsm(self, enabled: Literal[0, 1] = 1) -> None:
+        """显示开关（Plsm）。
+
+        Args:
+            enabled: ``0`` = 关，``1`` = 开
+
+        Raises:
+            RuntimeError: 操作失败时抛出异常
+
+        Examples:
+            >>> display_manager.set_plsm(1)
+            >>> display_manager.set_plsm(0)
+        """
+        ok, err = osis_plsm(enabled)
+        if not ok:
+            raise RuntimeError(f"设置 Plsm 失败: {err}")
+
+    def __repr__(self) -> str:
+        return "DisplayManager()"
+
+
+# ═════════════════════════════════════════════
+# 全局单例
+# ═════════════════════════════════════════════
+
+display_manager = DisplayManager()

{osis_python-0.5.2 → osis_python-0.5.3}/src/pyosis/project/interface.py

@@ -43,7 +43,8 @@ def save_project(filePath) -> Tuple[bool, str]:
     保存项目
     
     Args:
-        filepath: 为空或者当前工程文件路径
+        filePath: 工程文件路径。为空时由上层补全为当前工程路径；
+            非空时使用该路径。
 
     Returns: 
         Tuple[bool, str]
@@ -62,3 +63,13 @@ def save_project_as(filePath) -> Tuple[bool, str]:
         Tuple[bool, str]
     """
     pass
+
+@REGISTRY.register("/Close")
+def close_osis() -> Tuple[bool, str]:
+    """
+    关闭 OSIS 软件
+
+    Returns:
+        Tuple[bool, str]
+    """
+    pass

{osis_python-0.5.2 → osis_python-0.5.3}/src/pyosis/project/manager.py

@@ -2,10 +2,12 @@
 
 用法:
     >>> from pyosis.project import project_manager
-    >>> project_manager.create(type=1, filepath="D:/Models/bridge.osis")
-    >>> project_manager.open("D:/Models/bridge.osis")
+    >>> project_manager.create(type=1, filepath="D:/Models/bridge.sis")
+    >>> project_manager.open("D:/Models/bridge.sis")
     >>> project_manager.save()
-    >>> project_manager.save_as("D:/Models/bridge_v2.osis")
+    >>> project_manager.save("D:/Models/bridge.sis")
+    >>> project_manager.save_as("D:/Models/bridge_v2.sis")
+    >>> project_manager.close()
     >>> project_manager.get_directory()
 """
 
@@ -16,6 +18,7 @@ from .interface import (
     open_project,
     save_project,
     save_project_as,
+    close_osis,
     get_project_directory,
 )
 
@@ -53,13 +56,19 @@ class ProjectManager:
         if not ok:
             raise RuntimeError(f"打开项目失败: {err}")
 
-    def save(self) -> None:
-        """保存当前项目
+    def save(self, filepath: str = "") -> None:
+        """保存项目
+
+        Args:
+            filepath: 工程文件路径。为空时使用当前项目路径；
+                非空时使用传入路径。
 
         Raises:
             RuntimeError: 保存失败时抛出异常
         """
-        ok, err = save_project("")
+        if not filepath:
+            filepath = self._current_project_file()
+        ok, err = save_project(filepath)
         if not ok:
             raise RuntimeError(f"保存项目失败: {err}")
 
@@ -76,6 +85,16 @@ class ProjectManager:
         if not ok:
             raise RuntimeError(f"另存为失败: {err}")
 
+    def close(self) -> None:
+        """关闭 OSIS 软件
+
+        Raises:
+            RuntimeError: 关闭失败时抛出异常
+        """
+        ok, err = close_osis()
+        if not ok:
+            raise RuntimeError(f"关闭软件失败: {err}")
+
     def get_directory(self) -> str:
         """获取当前项目目录
 
@@ -90,6 +109,11 @@ class ProjectManager:
         except Exception as e:
             raise RuntimeError(f"获取项目目录失败: {e}")
 
+    def _current_project_file(self) -> str:
+        """由当前项目目录推导工程文件路径（目录同名 .sis）。"""
+        directory = self.get_directory().rstrip("\\/")
+        return f"{directory}.sis"
+
     def __repr__(self) -> str:
         return "ProjectManager()"
 

{osis_python-0.5.2 → osis_python-0.5.3}/src/pyosis/transfer/routes.py

@@ -173,6 +173,12 @@ ROUTES = {
     "/Open": "engine.open_project",
     "/Save": "engine.save_project",
     "/SaveAs": "engine.project.save_as",
+    "/Close": "engine.close",
+
+    # ─── DISPLAY ───
+    "DispCtrl": "engine.display.disp_ctrl",
+    "/control": "engine.display.control",
+    "Plsm": "engine.display.set_plsm",
 
     # ─── GENERAL ───
     "Clear": "engine.clear",

osis_python-0.5.3/tests/test_project_manager.py

@@ -0,0 +1,135 @@
+"""
+测试 ProjectManager（create / open / save / save_as / get_directory）
+
+前置条件: OSIS 已打开。
+
+使用方式:
+    python tests/test_project_manager.py
+
+说明:
+    create / open / save_as 传入完整 .sis 路径；
+    create 只创建项目目录，不会生成 .sis 文件；
+    save / save_as 后才会在磁盘上生成 .sis 工程文件；
+    close 关闭 OSIS 软件（测试最后一步，执行后需重新打开 OSIS）。
+"""
+
+from __future__ import annotations
+
+import os
+import time
+
+from pyosis.core.engine import OSISEngine
+
+
+def _expect_eq(actual, expected, label: str) -> None:
+    if actual != expected:
+        raise ValueError(f"{label} 不符: 期望 {expected!r}, 实际 {actual!r}")
+
+
+def _expect_true(cond: bool, msg: str) -> None:
+    if not cond:
+        raise ValueError(msg)
+
+
+def _norm_path(path: str) -> str:
+    """规范化路径，去掉末尾分隔符便于比较。"""
+    return os.path.normcase(os.path.normpath(path.rstrip("\\/")))
+
+
+def _expected_project_dir(filepath: str) -> str:
+    """由 .sis 完整路径推导项目目录（去掉扩展名）。"""
+    return os.path.splitext(filepath)[0]
+
+
+def _sibling_names(filepath: str) -> list[str]:
+    parent = os.path.dirname(filepath) or "."
+    if not os.path.isdir(parent):
+        return []
+    return sorted(os.listdir(parent))
+
+
+def _wait_isfile(filepath: str, timeout: float = 3.0, interval: float = 0.2) -> bool:
+    """等待文件出现（兼顾落盘延迟）。"""
+    deadline = time.time() + timeout
+    while time.time() < deadline:
+        if os.path.isfile(filepath):
+            return True
+        time.sleep(interval)
+    return os.path.isfile(filepath)
+
+
+def _expect_sis_file(filepath: str, label: str) -> None:
+    """断言工程文件为 .sis，失败时打印同级目录内容。"""
+    _expect_true(filepath.lower().endswith(".sis"), f"{label} 路径应为 .sis: {filepath}")
+    if _wait_isfile(filepath):
+        return
+    siblings = _sibling_names(filepath)
+    raise ValueError(
+        f"{label} 后应存在文件: {filepath}\n"
+        f"  同级目录内容: {siblings}"
+    )
+
+
+def test_project(engine: OSISEngine, filepath: str) -> None:
+    """依次验证 create / get_directory / save / save_as / open。
+
+    Args:
+        filepath: 项目文件完整路径，例如 "D:\Temp\demo.sis"
+    """
+    project = engine.project
+    expected_dir = _expected_project_dir(filepath)
+    path2 = os.path.splitext(filepath)[0] + "_v2.sis"
+
+    # ── create：只建目录，不生成 .sis ──
+    project.create(type=101, filepath=filepath)
+    print(f"  create -> {filepath}")
+    _expect_true(
+        not os.path.isfile(filepath),
+        f"create 后不应生成 .sis 文件: {filepath}",
+    )
+
+    # ── get_directory ──
+    directory = project.get_directory()
+    print(f"  get_directory -> {directory}")
+    _expect_true(isinstance(directory, str) and len(directory) > 0, "get_directory 应返回非空路径")
+    _expect_eq(_norm_path(directory), _norm_path(expected_dir), "项目目录")
+    _expect_true(os.path.isdir(expected_dir), f"项目目录应存在: {expected_dir}")
+
+    # ── save：路径为空时使用当前项目路径，此时才生成 .sis ──
+    project.save()
+    print("  save() -> 当前项目路径")
+    _expect_sis_file(filepath, "save")
+
+    # ── save：显式传入路径 ──
+    project.save(filepath)
+    print(f"  save({filepath})")
+    _expect_sis_file(filepath, "save(显式路径)")
+
+    # ── save_as ──
+    project.save_as(path2)
+    print(f"  save_as -> {path2}")
+    _expect_sis_file(path2, "save_as")
+
+    # ── open ──
+    project.open(path2)
+    print(f"  open -> {path2}")
+    directory2 = project.get_directory()
+    print(f"  get_directory -> {directory2}")
+    _expect_eq(
+        _norm_path(directory2),
+        _norm_path(_expected_project_dir(path2)),
+        "另存为后打开的项目目录",
+    )
+
+    # ── close：关闭软件 ──
+    project.close()
+    print("  close ok（OSIS 已退出）")
+
+
+if __name__ == "__main__":
+    engine = OSISEngine()
+    filepath = r"D:\Temp\demo5555555.sis"
+    print(f"项目文件: {filepath}")
+    print("开始测试 ProjectManager ...")
+    test_project(engine, filepath)
+    print("全部通过")