From 25cb5343ed2daecba07b24a59d4c4558a4832e1c Mon Sep 17 00:00:00 2001 From: lh <2334563547@qq.com> Date: Thu, 3 Sep 2026 15:49:48 +0800 Subject: [PATCH] =?UTF-8?q?fix(nmNum):=20=E4=BF=AE=E5=A4=8D=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E8=BE=B9=E7=95=8C=E5=90=8D=E7=A7=B0=E4=B9=B1=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Bin/Config/Lang/cn/nmNum_cn.qm | Bin 127772 -> 127988 bytes Bin/Config/Lang/cn/nmNum_cn.ts | 15 +++++++++++++++ Src/nmNum/nmSubWnd/nmSubWndUtils.cpp | 6 +++--- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/Bin/Config/Lang/cn/nmNum_cn.qm b/Bin/Config/Lang/cn/nmNum_cn.qm index 398b4c454c449793cf4fdbc7f5cbc1a8bbeee461..5f04c48cb8bd0cbfc68e6042adf023e089c87eb5 100644 GIT binary patch delta 3755 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 delta 3557 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 + + nmWxParaPropertyPebi + + RectangleOutline + 矩形边界 + + + CircleOutline + 圆形边界 + + + PolygonOutline + 多边形边界 + + nmWxParameterProperty diff --git a/Src/nmNum/nmSubWnd/nmSubWndUtils.cpp b/Src/nmNum/nmSubWnd/nmSubWndUtils.cpp index c10db5b..e7ab2eb 100644 --- a/Src/nmNum/nmSubWnd/nmSubWndUtils.cpp +++ b/Src/nmNum/nmSubWnd/nmSubWndUtils.cpp @@ -608,7 +608,7 @@ bool nmSubWndUtils::fillNmDockWxs(iSubWnd* pSubWnd) tr("The rectangular-boundary data could not be created.")); } Q_ASSERT(pOutlineData); - // 设置默认边界名称 + // 默认名称留空,由界面根据边界类型进行翻译显示。 pOutlineData->setName(""); // 设置边界点 pOutlineData->setOutlinePoints(vecBoundaryPoints); @@ -633,7 +633,7 @@ bool nmSubWndUtils::fillNmDockWxs(iSubWnd* pSubWnd) tr("The circular-boundary data could not be created.")); } Q_ASSERT(pOutlineData); - // 设置默认边界名称 + // 默认名称留空,由界面根据边界类型进行翻译显示。 pOutlineData->setName(""); // 设置半径 pOutlineData->setRadius(dRadius); @@ -667,7 +667,7 @@ bool nmSubWndUtils::fillNmDockWxs(iSubWnd* pSubWnd) tr("The default numerical boundary could not be created.")); } Q_ASSERT(pDefaultOutlineData); - // 设置默认边界名称 + // 默认名称留空,由界面根据边界类型进行翻译显示。 pDefaultOutlineData->setName(""); // 设置边界点 QVector vecPoints;