osis-python 0.5.2__py3-none-any.whl → 0.5.4__py3-none-any.whl

{osis_python-0.5.2.dist-info → osis_python-0.5.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: osis-python
-Version: 0.5.2
+Version: 0.5.4
 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.dist-info → osis_python-0.5.4.dist-info}/RECORD

@@ -1,5 +1,5 @@
-osis_python-0.5.2.dist-info/licenses/LICENSE,sha256=T4mkSYliXdU9mYe-NfHkqg6GPhzoYaIQO_a630UzpS4,1088
-pyosis/__init__.py,sha256=0MXFndPyNnk54MetElaMxO4ikTZeOokTMRdtJL-IcPc,501
+osis_python-0.5.4.dist-info/licenses/LICENSE,sha256=T4mkSYliXdU9mYe-NfHkqg6GPhzoYaIQO_a630UzpS4,1088
+pyosis/__init__.py,sha256=N9nzd0g89imrL0phXM-9CNHnHaggd9920UZPFTH96A0,501
 pyosis/boundary/__init__.py,sha256=W5LfF-jugWa-YI8pnfELZaz0pXLa-D8TiGnBn12HGGQ,102
 pyosis/boundary/interface.py,sha256=3MG3ZwOP_HM6WF6NTs8oyaTwucdCDa5CANifOdVZ9u8,8998
 pyosis/boundary/manager.py,sha256=SZAGysQFju2yEbibTTY_y0YosDVLUvA5pq-IOPB3WN0,31839
@@ -9,16 +9,19 @@ pyosis/control/io.py,sha256=buaut3-W8kwJIe3PgjtgOU0JCSgDfOEd2cS3mxYsfuc,591
 pyosis/control/manager.py,sha256=9vzNx6E9MVxU2DVNledeWv6UQaQNr3W9q5BJrqsnxzU,6795
 pyosis/control/nonlinear.py,sha256=26W_2GhD_0cn3YQxJjgbPR1oEopJWyuFWGlgx0q023I,1604
 pyosis/core/__init__.py,sha256=KvFYe6Iaain38GbuHT4s-gmxSWYzrnJDSCu8H_0FZBA,523
-pyosis/core/all_func.py,sha256=iJZasXz49i7IlJ-2erNfX1s2iohNYCt0PRKrfQpgvg8,497
-pyosis/core/apdl_sync.py,sha256=hGN-nWBcFaPHawR8hFYB59Yc6E3Kdgw9DEO-ZpcBkdY,5572
+pyosis/core/all_func.py,sha256=VhvAeMJMCQJ1redjqdkm7meTw1PJNDoRdmXXh2LzkVo,521
+pyosis/core/apdl_sync.py,sha256=rW5Ot6FLpmUzpfMlrbemstnfhxD_0qtPrWgDfj9_4XY,5312
 pyosis/core/basic_manager.py,sha256=S_IVCCGZXTEmNQ-0T4MNEG4xvHMyA3Y2kmeupHCjnHU,230
 pyosis/core/build.py,sha256=imXSZ8tU1yxY-a3kgZ0BwQEQggsWlG19bxHhYbi6mus,80845
 pyosis/core/client.py,sha256=0Fx--DW0aVvqnDUP0iUTPLvnDEPKfnA6jOE-nJVQJrU,2838
 pyosis/core/command.py,sha256=dmI7UtdELTTqziHh4w2NmhsU4QagGPdu1q53NGCEQ_U,8559
-pyosis/core/engine.py,sha256=NGcCtZ7-IPThEm5lZX4gb9LrE60RgUmJg6bwCMwJqD8,13936
+pyosis/core/engine.py,sha256=N5Xp8Z3y-e4_dI0Vg5UtDFMzJjqI8kVyGiIZyB64n3I,15132
 pyosis/core/exceptions.py,sha256=x0I0Emooejy8wF1ZBWGz7Yc1N70MitsnhhQv9txJQj8,1093
 pyosis/core/references.py,sha256=JQ8260aqVB5PhhGrqMt7W7fmrsmE69dFdrE6EyyLADg,2755
-pyosis/core/sync_apdl_cli.py,sha256=Zfszet2oXXBrKWyDu56em88KWTuUOHLYLYPZhjuYrV8,817
+pyosis/core/sync_apdl_cli.py,sha256=xlRDhtR4fOebLvyVZT9joUp6Q0H55gIt0YDy9Cb4HB4,874
+pyosis/display/__init__.py,sha256=POxWZ8I5Qanj4ETpHBZMhXNOMlsLMYRamXwP_JjSDUo,161
+pyosis/display/interface.py,sha256=QCMFWG7Xxh8RDSbvdtnT3fyg90pnKAV-DX-LnL2xtUM,3133
+pyosis/display/manager.py,sha256=wV_JMDFH25TkrdBn6mFZvmIcju62297sWR7nlKvBgos,3720
 pyosis/dynamic/__init__.py,sha256=ThVGZWd8qryNJc99IPKJ7oA10hg1skiHTYvWPBelB2U,314
 pyosis/dynamic/load_to_mass.py,sha256=xmSC16ug2C8HaY6rEwxfSX3puF5qjsUPsu44Skl8pyA,2940
 pyosis/dynamic/manager.py,sha256=v5SyICAIimFcJwmHPL8AF49PrqsS8kNivz1OQaqTR10,25829
@@ -26,7 +29,7 @@ pyosis/dynamic/modal.py,sha256=__as3Nl7Ks2ntgcZwAA9UhvsvTfBl-1zSUOTsnPVf-Y,640
 pyosis/dynamic/seismic.py,sha256=8DIh7xkUgl0UwweDq4WoYSNzMxpLnpDaM4W_7u3rg_A,6380
 pyosis/element/__init__.py,sha256=fZgmxJiNhCe3Ki8vNEdZOhyinxwvlF6Jcu-DgD-c6YM,92
 pyosis/element/interface.py,sha256=xLd2ljq0qW5uvqV0Lo2e6Ly7NShh_p2I5vQNdcA8P4Q,9872
-pyosis/element/manager.py,sha256=1FRk9LaKloNwiAw5vHjgYvh4zs1ntIFTv4l7RY0fVpQ,28352
+pyosis/element/manager.py,sha256=tjvKDjj7_mt6dsvd1ABobdUA1IxH7Nrfy-5SKKNkT5o,28776
 pyosis/general/__init__.py,sha256=dyvge-GgUpT3BeDwm_Lss1xqNlxAQdt63WJ7QcuZ_O4,24
 pyosis/general/interface.py,sha256=YRXQ-iXYVhiUBiUd7fpA0NOtL5VSueOHcobj625aQeU,5382
 pyosis/geometry/__init__.py,sha256=mlAXlxaohcEcm8-6anyDo1fevh_IzYz2OXBn0_DIrCY,99
@@ -54,8 +57,8 @@ pyosis/post/design_check.py,sha256=vJzpu63yBjU4QDUIxvLOhUvqPrZ56q301ADCgHdu0eA,1
 pyosis/post/display.py,sha256=BdoHetcM69Ez4s0-Zx3MreIcadxJPv2U2cx0E0PJTVw,2006
 pyosis/post/manager.py,sha256=wj0nGIqdlRhu9zqWxZAAhNAt9FB6vX0-hVtIYcdC6zU,19927
 pyosis/project/__init__.py,sha256=hYfnubp0bbHJK2tBBH12XDs3CeeO0d7whzILDxl4044,78
-pyosis/project/interface.py,sha256=_pDttdXT4Kw8iXfVX3pLlr4vKY5XI27EwbvZAOr9wSg,1294
-pyosis/project/manager.py,sha256=IRAZbfCrt-rTZ6PWHhvkuA8qGjIgavQXyR8bEUMo-NQ,2734
+pyosis/project/interface.py,sha256=Iiku4SsBlBkH216Hrb2E3VrqzHnoLW6tlGwxfFDwbpU,1522
+pyosis/project/manager.py,sha256=iVgSFQXsbIo-qTALN7bEltM7m5NWEBSB7ZoJ-FnmM58,3545
 pyosis/property/__init__.py,sha256=xGdJItBRic3rd-6i5vyjGfA3KY-e9-WuOquIEnjPP_4,191
 pyosis/property/component_thickness.py,sha256=jrbmc4TwulxakRXKJpyC0oDue5EKLDODcKZHObf2tTw,728
 pyosis/property/coordinate.py,sha256=xFfuzXCzBWqYsDxHifpYCYgC_to9kC4LKD2yTX2CtvM,2668
@@ -96,11 +99,11 @@ pyosis/thickness/manager.py,sha256=ALJXBQEwIdIXmoYcjyvrYdh1mzNEygSf5Eo6y__0u6c,4
 pyosis/transfer/__init__.py,sha256=OZVxVnjhDGe4fHC6pjtOaKPzAKuoDp3-XkNFzDWepsE,623
 pyosis/transfer/generator.py,sha256=T3YLf4TrqAF4FFIa84opclmNDCw5WpvbNIsKC2rvKcU,3541
 pyosis/transfer/matrix.py,sha256=sHw9X34-PUeY1EdoNklgK0LUHwbBPnhkhk0R9ME0XG0,3378
-pyosis/transfer/out_to_python.py,sha256=rqNii7SBOLOYp8yGnh0F_LERS99JjMyyVCxBXVP99_4,8592
-pyosis/transfer/parser.py,sha256=KM2eK7SZTgn2ooAOv5gvqHNCw85DTrpoOB_393wzbMI,6422
-pyosis/transfer/routes.py,sha256=P5Iy6raVHRKqVrPmVgnoFKjmGwdNqyioiLrSwk6G85U,8077
+pyosis/transfer/out_to_python.py,sha256=WMzu1GaVvzvO1oq9ihyyp9dn2xY4s6ualW5M7CO98Cg,14464
+pyosis/transfer/parser.py,sha256=R_aBlYJTe53hD1sX5PBv86bhj88NQwANFRN4pGYudQ8,6774
+pyosis/transfer/routes.py,sha256=GAgrx71utq1tToxQKtfYeBwBvy7bktvFWEvWq3FPYIk,8267
 pyosis/transfer/split.py,sha256=hpBe9D9WbjbKsovx4hM3X5RjTrruWNkuFmZt2ed0fME,1284
-osis_python-0.5.2.dist-info/METADATA,sha256=uCoC9QTxfh27Sp9XIpxmISg3IeNp5HKigrEhh16epJw,11330
-osis_python-0.5.2.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
-osis_python-0.5.2.dist-info/top_level.txt,sha256=6VDNySkQKwipRXcN8ayKVci4vAXi4oPyWLqFhNVcIfM,7
-osis_python-0.5.2.dist-info/RECORD,,
+osis_python-0.5.4.dist-info/METADATA,sha256=KK6oUHASR6A6uzfKiE2BrL0Q6lOTSNBO9itDyoHs3aA,11330
+osis_python-0.5.4.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
+osis_python-0.5.4.dist-info/top_level.txt,sha256=6VDNySkQKwipRXcN8ayKVci4vAXi4oPyWLqFhNVcIfM,7
+osis_python-0.5.4.dist-info/RECORD,,

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.4"
 __author__ = "CCCC Highway Consultant Co. Ltd." # 中交公路规划设计院 - 工程技术研究中心 - lzh - wjh - myf
 
 from .core.engine import OSISEngine

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 *

pyosis/core/apdl_sync.py

@@ -7,9 +7,9 @@
     4. 有变化 → parse → 写 prep → 存本次 hash
 
 用法:
-    result = engine.sync_apdl()
-    if result and result.changed:
-        print(result.summary())
+    changed = engine.sync_apdl()
+    if changed:
+        print("命令流已变化,已写 prep")
 """
 
 from __future__ import annotations
@@ -21,7 +21,6 @@ from dataclasses import dataclass
 from pathlib import Path
 from typing import TYPE_CHECKING
 
-from ..transfer import parse_text
 from ..transfer.out_to_python import write_prep_outputs
 
 if TYPE_CHECKING:
@@ -39,19 +38,9 @@ _TIME_LINE_PATTERN = re.compile(
 )
 
 
-@dataclass
-class ApdlSyncResult:
-    """APDL 同步结果。"""
-
-    changed: bool = False
-
-    def summary(self) -> str:
-        return "命令流已变化，已写 prep" if self.changed else "命令流未变化"
-
-
 @dataclass
 class ApdlSessionStore:
-    """记录最近一次同步的 .out 路径与 hash（供调试/展示，不由 ApdlSyncResult 重复携带）。"""
+    """记录最近一次同步的 .out 路径与 hash（供调试/展示）。"""
 
     last_path: str = ""
     last_hash: str = ""
@@ -162,11 +151,14 @@ def perform_apdl_sync(
     engine: "OSISEngine",
     path: str | None = None,
     *,
-    force_export: bool = True,
-) -> ApdlSyncResult | None:
+    force_export: bool = False,
+) -> bool | None:
     """执行 APDL 同步：export → 比 hash → 有变化则写 prep（不执行 prep）。
 
-    无项目路径时返回 None。
+    Returns:
+        True  - 命令流已变化,已写 prep
+        False - 命令流未变化
+        None  - 未获取到项目路径(无法同步)
     """
     if _get_project_dir(engine) is None:
         return None
@@ -186,12 +178,11 @@ def perform_apdl_sync(
     session.update_file(str(out_path), file_hash)
 
     if file_hash == last_hash:
-        return ApdlSyncResult(changed=False)
+        return False
 
-    parsed = parse_text(text)
-    write_prep_outputs(parsed, prep_dir)
+    write_prep_outputs(out_path, prep_dir)
 
     # 未执行 prep，OSIS 未变
     _save_persisted_hash(state_path, out_path, file_hash)
 
-    return ApdlSyncResult(changed=True)
+    return True

pyosis/core/engine.py

@@ -22,7 +22,7 @@ from __future__ import annotations
 import os
 from typing import Any
 
-from .apdl_sync import ApdlSyncResult, ApdlSessionStore, perform_apdl_sync
+from .apdl_sync import ApdlSessionStore, perform_apdl_sync
 from ..material.manager import MaterialManager, material_manager
 from ..section.manager import SectionManager, section_manager
 from ..node.manager import NodeManager, node_manager
@@ -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,22 @@ class OSISEngine:
         """结果导出管理器（工况结果、包络结果、验算结果）"""
         return self._result
 
+    ### 显示 ###
+
+    @property
+    def display(self) -> DisplayManager:
+        """显示管理器（边界 / 荷载 / 钢束显隐等）"""
+        return self._display
+
+
+    def start(self) -> None:
+        """开启 OSIS 软件"""
+        ...
+
+    def close(self) -> None:
+        """关闭 OSIS 软件"""
+        ...
+
     # ──────────────────────────────────────────
     # 通用操作（直接暴露 general 和 core 的函数）
     # ──────────────────────────────────────────
@@ -297,9 +318,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:
         """新建项目
@@ -387,8 +413,21 @@ class OSISEngine:
         return f"OSISEngine(project_path={self.project.get_directory()})"
 
     def sync_apdl(
-            self,
-            path: str | None = None,
-    ) -> ApdlSyncResult:
-        """通过 APDL 导出从 OSIS 同步数据。OSIS 界面操作后调用。"""
-        return perform_apdl_sync(self, path)
+        self,
+        path: str | None = None,
+        *,
+        force_export: bool = False,
+    ) -> bool | None:
+        """通过 APDL 导出从 OSIS 同步数据。OSIS 界面操作后调用。
+
+        Args:
+            path: 自定义 .out 文件路径,None 用项目下默认 _pyosis_sync.out。
+            force_export: False(默认)若 .out 已存在则直接复用,仅当 hash 与上次不一致才写 prep;
+                True 时总是重新执行 export_apdl。
+
+        Returns:
+            True  - 命令流已变化,已写 prep
+            False - 命令流未变化
+            None  - 未获取到项目路径
+        """
+        return perform_apdl_sync(self, path, force_export=force_export)

pyosis/core/sync_apdl_cli.py

@@ -20,16 +20,16 @@ from .engine import OSISEngine
 def main() -> int:
     engine = OSISEngine()
     try:
-        result = perform_apdl_sync(engine)
+        changed = perform_apdl_sync(engine)
     except Exception as exc:
         print(f"sync_apdl 失败: {exc}", file=sys.stderr)
         return 1
 
-    if result is None:
+    if changed is None:
         print("跳过：未获取到项目路径")
         return 0
 
-    print(result.summary())
+    print("命令流已变化，已写 prep" if changed else "命令流未变化")
     return 0
 
 

pyosis/display/__init__.py

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

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

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()

pyosis/element/manager.py

@@ -298,6 +298,15 @@ class ElementGroupManager:
         Args:
             name: 单元组名称
             op: 操作
+                * c = 创建
+                * a = 添加
+                * s = 替换
+                * r = 移除
+                * aa = 添加全部
+                * ra = 移除全部
+                * m = 修改组名
+                * d = 删除
+            *param (str | int): 待操作的编号，支持的格式：*，*to*；*by*，仅用于替换。例子：2,3,5,8to10,2by3,5by6,8by10 重合的编号自动忽略
 
         Returns:
             ElementGroup: 创建的单元组对象

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

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()"
 

pyosis/transfer/out_to_python.py

@@ -1,21 +1,53 @@
 """transfer 同步链路的纯文本处理工具：把 .out 文本转换为 pyosis prep 模块。
 
-只负责文本解析与 Python 代码生成：
-    - 解析 OSIS 导出的命令流（parse_text）
-    - 按模块分桶并生成 prep 模块（_1_control.py … _10_stage.py + main.py）
+只负责文本解析与 Python 代码生成:
+    - 读 .out 源文件
+    - 用 parser 解析出命令流,并按 //--- MODULE_NAME --- 标记分桶
+    - 第一个模块标记之前的"前言"命令(典型为 clear/clc)写到 main.py
+    - 每个模块的命令写到 _1_control.py … _10_stage.py
 
-不负责：
+不负责:
     - .out 文件的获取（export_apdl） —— 由调用方管理
-    - prep 模块的执行（import + builder 调用） —— 由调用方管理
+    - prep 模块的执行（import + builder 调用） —— 由 main.py 调度
 """
 
 from __future__ import annotations
 
+import inspect
+import re
+import sys
 from collections import defaultdict
 from pathlib import Path
+from typing import Iterable
 
 from pyosis.transfer.generator import generate_lines
-from pyosis.transfer.parser import ParsedCommand
+from pyosis.transfer.parser import (
+    BLANK_RE,
+    COMMENT_LINE_RE,
+    ParsedCommand,
+    _parse_physical_line,
+    iter_physical_lines,
+    strip_inline_comment,
+)
+
+# 匹配链式调用中的 .get(...) 部分(如 engine.section.get("k").set_offset(...))
+_CHAIN_GET_RE = re.compile(r"""\.get\((?:"[^"]*"|'[^']*'|[^()]*)\)""")
+
+# .out 中模块标记行的正则: //----- CONTROL ----- 之类
+MODULE_PATTERN = re.compile(r"^\s*//-+\s*(\w+)\s*-*")
+# 已知的模块名(用于过滤 .out 中的非模块横线注释,例如 //--- VERSION: x.xx ---//)
+KNOWN_MODULES = frozenset({
+    "CONTROL",
+    "PROPERTY",
+    "MATERIAL",
+    "SECTION",
+    "NODE",
+    "ELEMENT",
+    "BOUNDARY",
+    "LOADCASE",
+    "ANALYSIS",
+    "STAGE",
+})
 
 # 模块文件名
 MODULE_FILES = {
@@ -47,28 +79,6 @@ MODULE_BUILDERS = {
 
 MODULE_ORDER = tuple(MODULE_FILES.keys())
 
-
-# 按模块分桶
-def _bucket_by_module(parsed: list[ParsedCommand]) -> dict[str, list[ParsedCommand]]:
-    buckets: dict[str, list[ParsedCommand]] = defaultdict(list)
-    for cmd in parsed:
-        buckets[cmd.module or "PREAMBLE"].append(cmd)
-    return buckets
-
-
-# 合并 preamble 到 control
-def _merge_preamble_into_control(
-    buckets: dict[str, list[ParsedCommand]],
-) -> dict[str, list[ParsedCommand]]:
-    if "PREAMBLE" not in buckets:
-        return buckets
-    merged = dict(buckets)
-    preamble = merged.pop("PREAMBLE")
-    merged.setdefault("CONTROL", [])
-    merged["CONTROL"] = preamble + merged["CONTROL"]
-    return merged
-
-
 # 模块职责一句话(给 AI 看的提示)
 MODULE_PURPOSE = {
     "CONTROL": "全局控制参数(重力、非线性、收缩徐变开关等)",
@@ -84,51 +94,199 @@ MODULE_PURPOSE = {
 }
 
 
-# 写 prep 模块时,按调用特征(method + 第一个 string 参数)分段,加注释
-def _group_key(line: str) -> str | None:
-    """提取一行的"分组键":method 链 + 第一个 string 参数。
-
-    例:
-        engine.load.get("防撞护栏右").create("LINE", ...) -> load.get+防撞护栏右
-        engine.element.group.create("0号块单元", ...)      -> element.group.create+0号块单元
-        engine.element.create(1, "BEAM3D", ...)            -> element.create+BEAM3D
-        engine.control.set_gravity_acceleration(9.8)      -> control.set_gravity_acceleration+-
+# 按模块分桶
+def _split_by_module(text: str) -> tuple[list[ParsedCommand], dict[str, list[ParsedCommand]]]:
+    """走一遍 .out 文本,把命令按 //--- MODULE_NAME --- 标记分桶。
 
-    无特征(如赋值)返 None。
+    Returns:
+        (preamble, {MODULE: [cmd, ...]})
+        - preamble: 第一个模块标记之前的命令(典型为 clear/clc)
+        - by_module: 每个模块的命令列表,按 .out 出现顺序
     """
-    s = line.strip()
-    # 找第一个 '('
-    i = s.find("(")
-    if i < 0:
-        return None
-    # method 链 = 整行直到 "("
-    method = s[:i]
-    # 第一个 string 参数
-    rest = s[i + 1:].lstrip()
-    if not rest.startswith('"'):
-        return None
-    j = rest.find('"', 1)
-    if j < 0:
+    preamble: list[ParsedCommand] = []
+    by_module: dict[str, list[ParsedCommand]] = defaultdict(list)
+    current: str | None = None
+
+    for line in iter_physical_lines(text):
+        m = MODULE_PATTERN.match(line)
+        if m:
+            name = m.group(1).upper()
+            current = name if name in KNOWN_MODULES else None
+            continue
+        if COMMENT_LINE_RE.match(line) or BLANK_RE.match(line):
+            continue
+        line = strip_inline_comment(line)
+        if BLANK_RE.match(line):
+            continue
+        cmds = _parse_physical_line(line)
+        if current is None:
+            preamble.extend(cmds)
+        else:
+            by_module[current].extend(cmds)
+
+    return preamble, dict(by_module)
+
+
+# 读取 .out 文件内容(容错编码)
+def _read_out_text(path: Path) -> str:
+    for encoding in ("gbk", "utf-8", "gb2312", "gb18030", "latin-1"):
+        try:
+            return path.read_text(encoding=encoding)
+        except UnicodeDecodeError:
+            continue
+    raise RuntimeError(f"无法解码 .out 文件: {path}")
+
+
+# ──────────────────────────────────────────────────────────────────────
+# 方法 docstring 注释:在每个被调用方法的第一次出现处,插入其 docstring 第一行
+# ──────────────────────────────────────────────────────────────────────
+
+_ENGINE_INSTANCE: object | None = None
+
+
+def _get_engine() -> object:
+    """懒加载一个 OSISEngine 实例,只读属性,不会真正连 OSIS。"""
+    global _ENGINE_INSTANCE
+    if _ENGINE_INSTANCE is None:
+        from pyosis.core.engine import OSISEngine
+        _ENGINE_INSTANCE = OSISEngine()
+    return _ENGINE_INSTANCE
+
+
+def _strip_outer_args(line: str) -> str:
+    """剥离最外层调用的实参列表,返回接收者表达式。
+
+    取的是最后一个顶层 `(`,这样链式调用也能保留中间的 .get(...)。
+    engine.control.set_gravity_acceleration(9.8)   → engine.control.set_gravity_acceleration
+    engine.section.get(1).set_offset("Middle", 0) → engine.section.get(1).set_offset
+    engine.matrix("M", [[1]])                      → engine.matrix
+    """
+    depth = 0
+    last_paren = -1
+    in_str = False
+    sc: str | None = None
+    for i, ch in enumerate(line):
+        if in_str:
+            if ch == sc and (i == 0 or line[i - 1] != "\\"):
+                in_str = False
+            continue
+        if ch in ('"', "'"):
+            in_str = True
+            sc = ch
+            continue
+        if ch == "(":
+            if depth == 0:
+                last_paren = i
+            depth += 1
+        elif ch == ")":
+            depth -= 1
+    return line[:last_paren] if last_paren >= 0 else line
+
+
+def _doc_first_line(doc: str | None) -> str:
+    if not doc:
+        return ""
+    return doc.strip().split("\n", 1)[0].strip()
+
+
+def _resolve_chain_target(head: str, engine: object) -> object | None:
+    """从 'engine.X.method'(已折叠 .get)解析出真正的可调用对象。
+
+    1) 直接 getattr 链:engine.section.create → SectionManager.create;engine.matrix → OSISEngine.matrix
+    2) 链式调用:head 折叠后是 engine.section.set_offset(或嵌套的 engine.live.case.include),
+       中间某一层管理器没有这个属性。从该层往前找带 .get 的管理器,用其返回类型注解
+       (Section / LiveCase / TendonShape 等)找到方法本体。
+    """
+    parts = head.split(".")
+    if len(parts) < 2 or parts[0] != "engine":
         return None
-    return f"{method}|{rest[1:j]}"
-
-
-def _insert_group_comments(lines: list[str]) -> list[str]:
-    """在 group key 变化处插入 `# ---- <method>: <name> ----` 注释。
 
-    输入 lines 假设跟 generator 输出对齐(**每行无缩进**,已有 `engine.xxx` 前缀)。
-    注释也保持无缩进,跟代码一致;最终由 `_write_prep_module` 统一加 def body 缩进。
-    """
+    # 1) 直接 getattr 链
+    try:
+        obj = engine
+        for p in parts[1:]:
+            obj = getattr(obj, p)
+        if callable(obj):
+            return obj
+    except AttributeError:
+        pass
+
+    if len(parts) < 3:
+        return None
+    method_name = parts[-1]
+
+    # 2) 从尾往头试每一层,看它是不是一个带 .get 的管理器
+    for cut in range(len(parts) - 1, 1, -1):
+        try:
+            mgr_obj = engine
+            for p in parts[1:cut]:
+                mgr_obj = getattr(mgr_obj, p)
+        except AttributeError:
+            continue
+        get_method = type(mgr_obj).__dict__.get("get")
+        if get_method is None:
+            continue
+        try:
+            sig = inspect.signature(get_method)
+        except (ValueError, TypeError):
+            continue
+        ann = sig.return_annotation
+        if ann is inspect.Parameter.empty:
+            continue
+        if isinstance(ann, str):
+            mod = sys.modules.get(get_method.__module__)
+            if mod is None:
+                continue
+            try:
+                ann = eval(ann, vars(mod))
+            except Exception:
+                continue
+        candidates: list[type] = []
+        if isinstance(ann, type):
+            candidates.append(ann)
+        else:
+            for arg in getattr(ann, "__args__", ()):
+                if isinstance(arg, type):
+                    candidates.append(arg)
+                else:
+                    for inner in getattr(arg, "__args__", ()):
+                        if isinstance(inner, type):
+                            candidates.append(inner)
+        for cand in candidates:
+            target = vars(cand).get(method_name)
+            if target is not None and callable(target):
+                return target
+    return None
+
+
+def _method_doc_for(line: str) -> str:
+    """取这一行生成代码所调用方法的 docstring 第一行。非 engine 调用返空串。"""
+    s = line.strip()
+    if not s.startswith("engine."):
+        return ""
+    head = _CHAIN_GET_RE.sub("", _strip_outer_args(s))
+    # head 形如 'engine.section.set_offset' 或 'engine.control.set_gravity_acceleration'
+    target = _resolve_chain_target(head, _get_engine())
+    if target is None:
+        return ""
+    return _doc_first_line(getattr(target, "__doc__", None))
+
+
+def _insert_method_doc_comments(lines: list[str]) -> list[str]:
+    """在每个被调用的独特方法的第一次出现处,插入一行 # <docstring 第一行>。"""
+    seen: set[str] = set()
     out: list[str] = []
-    prev_key: str | None = None
     for line in lines:
-        key = _group_key(line)
-        if key is not None and key != prev_key:
-            method, name = key.split("|", 1)
-            short = method.rsplit(".", 1)[-1]  # 最后一个方法名
-            out.append(f"# ---- {short}: {name} ----")
+        s = line.strip()
+        if s.startswith("engine."):
+            # 用与解析时相同的 head 作为去重键,保证多次调用同一方法只注一次
+            head = _CHAIN_GET_RE.sub("", _strip_outer_args(s))
+            if head not in seen:
+                doc = _method_doc_for(line)
+                if doc:
+                    out.append(f"# {doc}")
+                seen.add(head)
         out.append(line)
-        prev_key = key if key is not None else prev_key
     return out
 
 
@@ -139,7 +297,7 @@ def _write_prep_module(prep_dir: Path, module: str, lines: list[str]) -> Path:
     生成顺序:
         1. docstring(说明模块职责)
         2. imports
-        3. builder 函数(按 group 加注释)
+        3. builder 函数
         4. if __name__ == "__main__": 单跑入口
     """
     fname = MODULE_FILES[module]
@@ -151,12 +309,8 @@ def _write_prep_module(prep_dir: Path, module: str, lines: list[str]) -> Path:
         doc = f"OSIS 命令流 {module} 模块 — 当前 .out 中无该段,无需调用。"
         fn_body = ["    pass"]
     else:
-        doc = (
-            f"OSIS 命令流 {module} 模块 — {purpose}\n\n"
-            f"由 pyosis.transfer.out_to_python 从 .out 自动生成。"
-            f"按调用特征分组(注释头 # ---- method: name ----),同组相邻命令共享同一上下文。"
-        )
-        annotated = _insert_group_comments(lines)
+        doc = f"OSIS 命令流 {module} 模块 — {purpose}"
+        annotated = _insert_method_doc_comments(lines)
         fn_body = [f"    {line}" for line in annotated]
 
     body_lines = [
@@ -179,20 +333,21 @@ def _write_prep_module(prep_dir: Path, module: str, lines: list[str]) -> Path:
     return path
 
 
-def _write_main_py(prep_dir: Path) -> Path:
-    """写入 main.py：依次执行 _1_control … _10_stage。"""
-    import_lines = [
-        f"from {Path(fname).stem} import {MODULE_BUILDERS[mod]}"
-        for mod in MODULE_ORDER
-        for fname in [MODULE_FILES[mod]]
-    ]
-    call_lines = [f"    {MODULE_BUILDERS[mod]}(eng)" for mod in MODULE_ORDER]
+def _iter_module_call_lines() -> Iterable[str]:
+    """main.py 中依次调用各模块 builder 的语句(4 空格缩进)。"""
+    for mod in MODULE_ORDER:
+        yield f"    {MODULE_BUILDERS[mod]}(engine)"
+
+
+def _write_main_py(prep_dir: Path, preamble_lines: list[str]) -> Path:
+    """写入 main.py：先执行 preamble(典型为 clear/clc),再依次执行 _1.._10 builder。"""
+    import_lines = [f"from {Path(MODULE_FILES[mod]).stem} import {MODULE_BUILDERS[mod]}" for mod in MODULE_ORDER]
 
     body_lines = [
         '"""main.py — 入口脚本,按 _1.._10 顺序依次执行 prep 模块。',
         "",
-        "可单独跑(`python main.py`),也可被 import 后调 main(engine)。",
-        "默认使用 _0_engine 模块级单例 OSISEngine,也可注入外部 engine。",
+        "可直接 `python main.py`,或被 import 后调 main()。",
+        "engine 用 _0_engine 模块级单例,跟同包内的 prep 模块保持一致。",
         '"""',
         "",
         "from __future__ import annotations",
@@ -203,37 +358,51 @@ def _write_main_py(prep_dir: Path) -> Path:
         "# 让 main.py 不管从哪个目录跑都能 import 同目录的 prep modules",
         "sys.path.insert(0, str(Path(__file__).resolve().parent))",
         "",
-        "from _0_engine import engine as default_engine",
+        "from _0_engine import engine",
         *import_lines,
         "",
-        "def main(engine=None) -> None:",
-        "    eng = default_engine if engine is None else engine",
-        *call_lines,
+        "def main() -> None:",
+    ]
+    for line in preamble_lines:
+        body_lines.append(f"    {line}")
+    body_lines.append("")
+    body_lines.extend(_iter_module_call_lines())
+    body_lines.extend([
         "",
         'if __name__ == "__main__":',
         "    main()",
         "",
-    ]
+    ])
+
     path = prep_dir / "main.py"
     path.write_text("\n".join(body_lines), encoding="utf-8")
     return path
 
 
-def write_prep_outputs(parsed: list[ParsedCommand], prep_dir: Path) -> tuple[int, list[Path]]:
-    """写入 _0_engine.py 与 _1~_10 prep 模块 + main.py，返回 (代码行数, 文件路径列表)。
+def write_prep_outputs(out_path: Path, prep_dir: Path) -> tuple[int, list[Path]]:
+    """读 .out 源文件,生成 _0_engine.py + _1~_10 prep 模块 + main.py,返回 (代码行数, 文件路径列表)。
 
-    每个标准模块都会写入文件；.out 中无对应命令时生成 pass stub，避免遗留旧 prep。
+    每个标准模块都会写入文件;.out 中无对应命令时生成 pass stub,避免遗留旧 prep。
+
+    Args:
+        out_path: 源 .out 文件路径(由 apdl_sync 管理获取,这里只读取)
+        prep_dir: prep 输出目录(必须已存在)
     """
+    text = _read_out_text(out_path)
+    preamble, by_module = _split_by_module(text)
+
     code_line_count = 0
     prep_paths: list[Path] = []
-    buckets = _merge_preamble_into_control(_bucket_by_module(parsed))
 
     for module in MODULE_ORDER:
-        cmds = buckets.get(module, [])
+        cmds = by_module.get(module, [])
         lines = generate_lines(cmds) if cmds else []
         code_line_count += len(lines)
         prep_paths.append(_write_prep_module(prep_dir, module, lines))
 
+    # 前言(典型 clear/clc)放到 main.py 顶部;无前言时为空列表
+    preamble_lines = generate_lines(preamble) if preamble else []
+
     (prep_dir / "_0_engine.py").write_text(
         '"""模块级单例 OSISEngine,供同包内其他 prep 模块 import 使用。\n\n'
         "不要在主代码里直接 new OSISEngine();通过 main.py 调度。\n"
@@ -242,5 +411,5 @@ def write_prep_outputs(parsed: list[ParsedCommand], prep_dir: Path) -> tuple[int
         "engine = OSISEngine()\n",
         encoding="utf-8",
     )
-    prep_paths.append(_write_main_py(prep_dir))
-    return code_line_count, prep_paths
+    prep_paths.append(_write_main_py(prep_dir, preamble_lines))
+    return code_line_count, prep_paths

pyosis/transfer/parser.py

@@ -1,5 +1,9 @@
 """命令流解析器.
 
+职责:把输入的一整段 OSIS 命令流文本解析成多条 ParsedCommand.
+不做任何 .out 格式相关的事(比如识别 //--- CONTROL --- 这类模块标记),
+那是 out_to_python 的职责.
+
 支持:
     - 行注释（//、#）
     - 多行续行（行末逗号 / 下一行首字符为空白+逗号）
@@ -13,7 +17,7 @@ from __future__ import annotations
 
 import re
 from dataclasses import dataclass
-from typing import List
+from typing import Iterator, List
 
 from .split import split_cmd, split_commands
 
@@ -23,24 +27,10 @@ _GLUED_TAIL_COMMANDS = ("SectionOffset",)
 # 矩阵赋值命令正则表达式
 MATRIX_ASSIGN_RE = re.compile(r"^(\w+)\[([\d,\s]+)\]\s*=\s*(.+)$")
 # 注释行正则表达式
-_COMMENT_LINE_RE = re.compile(r"^\s*(//|#)")
+COMMENT_LINE_RE = re.compile(r"^\s*(//|#)")
 # 空白行正则表达式
-_BLANK_RE = re.compile(r"^\s*$")
-# 模块标记正则表达式
-MODULE_PATTERN = re.compile(r"//-+\s*(\w+)\s*-*")
-# 用于识别命令所属模块
-KNOWN_MODULES = frozenset({
-    "CONTROL",
-    "PROPERTY",
-    "MATERIAL",
-    "SECTION",
-    "NODE",
-    "ELEMENT",
-    "BOUNDARY",
-    "LOADCASE",
-    "ANALYSIS",
-    "STAGE",
-})
+BLANK_RE = re.compile(r"^\s*$")
+
 
 # 已解析的 OSIS 命令
 @dataclass
@@ -54,7 +44,6 @@ class ParsedCommand:
     matrix_name: str = ""
     matrix_indices: tuple[int, ...] = ()
     matrix_value: str = ""
-    module: str | None = None  # "CONTROL" | "SECTION" | ... | None
 
 
 def _join_continuation_lines(lines: List[str]) -> List[str]:
@@ -117,8 +106,33 @@ def _split_glued_command_fields(fields: List[str]) -> List[List[str]]:
     return groups
 
 
+# 去除一行内的 // 注释（保留 // 之前的有效命令部分）
+def strip_inline_comment(line: str) -> str:
+    if "//" not in line:
+        return line
+    pos = line.find("//")
+    if pos == 0:
+        return ""
+    if line[pos - 1] in (" ", "\t"):
+        return line[:pos].rstrip()
+    return line
+
+
+# 迭代"物理命令行":合并续行;不过滤注释/空行,留给调用方决定
+def iter_physical_lines(text: str) -> Iterator[str]:
+    """逐行 yield 物理命令行(已合并续行)。
+
+    不做任何注释/空行过滤——调用方按需处理:
+        - parse_text 会跳过 //、#、空行(以及 //--- MODULE_NAME --- 这种模块标记);
+          因为 parser 不识别模块,所以这条规则保持宽泛。
+        - out_to_python._split_by_module 同样跳过注释/空行,但用 MODULE_PATTERN
+          提前捕获模块标记以切换 current_module。
+    """
+    yield from _join_continuation_lines(text.splitlines())
+
+
 # 创建已解析的命令
-def _make_parsed_command(fields: List[str], source: str, module: str | None) -> ParsedCommand:
+def _make_parsed_command(fields: List[str], source: str) -> ParsedCommand:
     first = fields[0] if fields else ""
     return ParsedCommand(
         raw=source,
@@ -126,11 +140,11 @@ def _make_parsed_command(fields: List[str], source: str, module: str | None) ->
         name=first,
         source=source,
         kind="normal",
-        module=module,
     )
 
+
 # 解析一条命令,返回已解析的命令列表
-def _parse_one_command(source: str, module:str|None) -> List[ParsedCommand]:
+def _parse_one_command(source: str) -> List[ParsedCommand]:
     fields = split_cmd(source)
     first = fields[0] if fields else ""
     lower_first = first.lower()
@@ -143,7 +157,6 @@ def _parse_one_command(source: str, module:str|None) -> List[ParsedCommand]:
                 name=first,
                 source=source,
                 kind="matrix_dim",
-                module=module,
             )
         ]
 
@@ -161,7 +174,6 @@ def _parse_one_command(source: str, module:str|None) -> List[ParsedCommand]:
                 matrix_name=assign_match.group(1),
                 matrix_indices=indices,
                 matrix_value=assign_match.group(3).strip(),
-                module=module,
             )
         ]
 
@@ -171,46 +183,34 @@ def _parse_one_command(source: str, module:str|None) -> List[ParsedCommand]:
         if not group:
             continue
         sub_source = ",".join(group)
-        result.append(_make_parsed_command(group, sub_source, module=module))
+        result.append(_make_parsed_command(group, sub_source))
     return result
 
 
+# 解析一行物理命令为多条 ParsedCommand(处理 ; 分隔)
+def _parse_physical_line(line: str) -> List[ParsedCommand]:
+    out: List[ParsedCommand] = []
+    for sub in split_commands(line):
+        out.extend(_parse_one_command(sub))
+    return out
+
+
 # 解析 OSIS 命令流文本,返回已解析的命令列表
 def parse_text(text: str) -> List[ParsedCommand]:
     """解析 OSIS 命令流文本。
 
     Returns:
         ParsedCommand 列表（不含注释、空行）。
+        不识别 //--- MODULE_NAME --- 这类 .out 模块标记,那是 out_to_python 的职责。
     """
-    lines = text.splitlines()
-    physical_lines = _join_continuation_lines(lines)
-    current_module: str | None = None
     commands: List[ParsedCommand] = []
-
-    for physical in physical_lines:
-        stripped = physical.strip()
-        # 识别模块标记
-        m = MODULE_PATTERN.match(stripped)
-        if m:
-            name = m.group(1).upper()
-            current_module = name if name in KNOWN_MODULES else None
+    for line in iter_physical_lines(text):
+        if COMMENT_LINE_RE.match(line):
             continue
-
-        if _COMMENT_LINE_RE.match(physical):
-            continue
-        if _BLANK_RE.match(physical):
+        if BLANK_RE.match(line):
             continue
-        if "//" in physical:
-            hash_pos = physical.find("//")
-            if hash_pos == 0:
-                continue
-            if hash_pos > 0 and physical[hash_pos - 1] in (" ", "\t"):
-                physical = physical[:hash_pos].rstrip()
-        if not physical:
+        line = strip_inline_comment(line)
+        if BLANK_RE.match(line):
             continue
-
-        for sub in split_commands(physical):
-            for cmd in _parse_one_command(sub, module=current_module):
-                commands.append(cmd)
-
-    return commands
+        commands.extend(_parse_physical_line(line))
+    return commands

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",