xhouse/XplorePlane
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

VarexDetectorConfig移除不支持的 3×3 Binning 选项，修正索引对齐。

Browse Source 
新增多语言资源：暗场/亮场/坏像素校正确认对话框、进度提示、参数不一致提示。
This commit is contained in:
QI Mingxuan
2026-05-21 10:39:43 +08:00
parent d7c027b732
commit 5c56779f9f
5 changed files with 264 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
XP.Hardware.Detector/Config/VarexDetectorConfig.cs
+4 -6
View File
@@ -46,6 +46,7 @@ namespace XP.Hardware.Detector.Config
/// <summary>
/// Varex 支持 1×1、2×2、4×4 三种 Binning | Varex supports 1×1, 2×2, 4×4 binning
/// 注意：索引值必须与 BinningMode 枚举对齐（0=1×1, 1=2×2, 2=4×4）
/// </summary>
public override List<BinningOption> GetSupportedBinnings()
{
@@ -53,8 +54,7 @@ namespace XP.Hardware.Detector.Config
{
new BinningOption("1×1", 0),
new BinningOption("2×2", 1),
new BinningOption("3×3", 2),
new BinningOption("4×4", 3),
new BinningOption("4×4", 2),
};
}
@@ -73,8 +73,7 @@ namespace XP.Hardware.Detector.Config
{
0 => 15m, // 1×1
1 => 30m, // 2×2
2 => 45m, // 3×3
3 => 60m, // 4×4
2 => 60m, // 4×4
_ => 15m
};
@@ -86,8 +85,7 @@ namespace XP.Hardware.Detector.Config
{
0 => new BinningImageSpec(0.139, 0.139, 3072, 3060), // 1×1
1 => new BinningImageSpec(0.278, 0.278, 1536, 1530), // 2×2
2 => new BinningImageSpec(0.417, 0.417, 1024, 1020), // 3×3
3 => new BinningImageSpec(0.556, 0.556, 768, 765), // 4×4
2 => new BinningImageSpec(0.556, 0.556, 768, 765), // 4×4
_ => new BinningImageSpec(0.139, 0.139, 3072, 3060)
};
}
XP.Hardware.Detector/Resources/Resources.en-US.resx
+60
View File
@@ -145,4 +145,64 @@
<data name="Detector_StatusLabel" xml:space="preserve">
<value>Status:</value>
</data>
<data name="Detector_DarkCorrection_ConfirmTitle" xml:space="preserve">
<value>Dark Correction Confirmation</value>
</data>
<data name="Detector_DarkCorrection_ConfirmMessage" xml:space="preserve">
<value>Please confirm the X-ray source is OFF before starting dark correction.</value>
</data>
<data name="Detector_DarkCorrection_Title" xml:space="preserve">
<value>Dark Correction</value>
</data>
<data name="Detector_LightCorrection_ConfirmObjectTitle" xml:space="preserve">
<value>Light Correction Confirmation</value>
</data>
<data name="Detector_LightCorrection_ConfirmObjectMessage" xml:space="preserve">
<value>Please confirm the object has been removed from the detector field of view.</value>
</data>
<data name="Detector_LightCorrection_ConfirmRayMessage" xml:space="preserve">
<value>Please confirm the X-ray source is ON and stable before starting light correction.</value>
</data>
<data name="Detector_LightCorrection_Title" xml:space="preserve">
<value>Light Correction</value>
</data>
<data name="Detector_BadPixelCorrection_Title" xml:space="preserve">
<value>Bad Pixel Correction</value>
</data>
<data name="Detector_Progress_StoppingAcquisition" xml:space="preserve">
<value>Stopping acquisition...</value>
</data>
<data name="Detector_Progress_ApplyingParameters" xml:space="preserve">
<value>Applying parameters...</value>
</data>
<data name="Detector_Progress_AcquiringDarkData" xml:space="preserve">
<value>Acquiring dark field data (64 frames), please wait...</value>
</data>
<data name="Detector_Progress_DarkCorrectionDone" xml:space="preserve">
<value>Dark correction completed</value>
</data>
<data name="Detector_Progress_AcquiringLightData" xml:space="preserve">
<value>Acquiring light field data (64 frames), please wait...</value>
</data>
<data name="Detector_Progress_BadPixelCorrecting" xml:space="preserve">
<value>Executing bad pixel correction...</value>
</data>
<data name="Detector_Progress_LightAndBadPixelDone" xml:space="preserve">
<value>Light and bad pixel correction completed</value>
</data>
<data name="Detector_Progress_LightDoneBadPixelFailed" xml:space="preserve">
<value>Light correction done, bad pixel correction failed</value>
</data>
<data name="Detector_Progress_DetectingBadPixels" xml:space="preserve">
<value>Detecting bad pixels...</value>
</data>
<data name="Detector_Progress_BadPixelDone" xml:space="preserve">
<value>Bad pixel correction completed</value>
</data>
<data name="Detector_ParameterMismatch_Title" xml:space="preserve">
<value>Parameter Mismatch</value>
</data>
<data name="Detector_ParameterMismatch_Message" xml:space="preserve">
<value>Current parameters differ from dark correction. Please redo dark correction.</value>
</data>
</root>
XP.Hardware.Detector/Resources/Resources.resx
+80
View File
@@ -169,4 +169,84 @@
<value>状态：</value>
<comment>DetectorImageWindow - 探测器状态标签 | Detector status label</comment>
</data>
<data name="Detector_DarkCorrection_ConfirmTitle" xml:space="preserve">
<value>暗场校正确认</value>
<comment>暗场校正确认对话框标题 | Dark correction confirmation dialog title</comment>
</data>
<data name="Detector_DarkCorrection_ConfirmMessage" xml:space="preserve">
<value>请确认射线源已关闭，即将开始暗场校正。</value>
<comment>暗场校正确认对话框消息 | Dark correction confirmation dialog message</comment>
</data>
<data name="Detector_DarkCorrection_Title" xml:space="preserve">
<value>暗场校正</value>
<comment>暗场校正进度窗口标题 | Dark correction progress window title</comment>
</data>
<data name="Detector_LightCorrection_ConfirmObjectTitle" xml:space="preserve">
<value>亮场校正确认</value>
<comment>亮场校正确认对话框标题 | Light correction confirmation dialog title</comment>
</data>
<data name="Detector_LightCorrection_ConfirmObjectMessage" xml:space="preserve">
<value>请确认物体已移出探测器视野。</value>
<comment>亮场校正物体确认消息 | Light correction object removal confirmation message</comment>
</data>
<data name="Detector_LightCorrection_ConfirmRayMessage" xml:space="preserve">
<value>请确认射线源已开启且稳定，即将开始亮场校正。</value>
<comment>亮场校正射线源确认消息 | Light correction ray source confirmation message</comment>
</data>
<data name="Detector_LightCorrection_Title" xml:space="preserve">
<value>亮场校正</value>
<comment>亮场校正进度窗口标题 | Light correction progress window title</comment>
</data>
<data name="Detector_BadPixelCorrection_Title" xml:space="preserve">
<value>坏像素校正</value>
<comment>坏像素校正进度窗口标题 | Bad pixel correction progress window title</comment>
</data>
<data name="Detector_Progress_StoppingAcquisition" xml:space="preserve">
<value>正在停止采集...</value>
<comment>进度提示：停止采集 | Progress: stopping acquisition</comment>
</data>
<data name="Detector_Progress_ApplyingParameters" xml:space="preserve">
<value>正在应用参数...</value>
<comment>进度提示：应用参数 | Progress: applying parameters</comment>
</data>
<data name="Detector_Progress_AcquiringDarkData" xml:space="preserve">
<value>正在采集暗场数据（64帧），请等待...</value>
<comment>进度提示：采集暗场数据 | Progress: acquiring dark field data</comment>
</data>
<data name="Detector_Progress_DarkCorrectionDone" xml:space="preserve">
<value>暗场校正完成</value>
<comment>进度提示：暗场校正完成 | Progress: dark correction done</comment>
</data>
<data name="Detector_Progress_AcquiringLightData" xml:space="preserve">
<value>正在采集亮场数据（64帧），请等待...</value>
<comment>进度提示：采集亮场数据 | Progress: acquiring light field data</comment>
</data>
<data name="Detector_Progress_BadPixelCorrecting" xml:space="preserve">
<value>正在执行坏像素校正...</value>
<comment>进度提示：坏像素校正中 | Progress: bad pixel correcting</comment>
</data>
<data name="Detector_Progress_LightAndBadPixelDone" xml:space="preserve">
<value>亮场校正及坏像素校正完成</value>
<comment>进度提示：亮场和坏像素校正完成 | Progress: light and bad pixel correction done</comment>
</data>
<data name="Detector_Progress_LightDoneBadPixelFailed" xml:space="preserve">
<value>亮场校正完成，但坏像素校正失败</value>
<comment>进度提示：亮场完成但坏像素失败 | Progress: light done but bad pixel failed</comment>
</data>
<data name="Detector_Progress_DetectingBadPixels" xml:space="preserve">
<value>正在检测坏像素...</value>
<comment>进度提示：检测坏像素 | Progress: detecting bad pixels</comment>
</data>
<data name="Detector_Progress_BadPixelDone" xml:space="preserve">
<value>坏像素校正完成</value>
<comment>进度提示：坏像素校正完成 | Progress: bad pixel correction done</comment>
</data>
<data name="Detector_ParameterMismatch_Title" xml:space="preserve">
<value>参数不一致</value>
<comment>参数不一致对话框标题 | Parameter mismatch dialog title</comment>
</data>
<data name="Detector_ParameterMismatch_Message" xml:space="preserve">
<value>当前参数与暗场校正时不一致，请重新进行暗场校正。</value>
<comment>参数不一致对话框消息 | Parameter mismatch dialog message</comment>
</data>
</root>
XP.Hardware.Detector/Resources/Resources.zh-CN.resx
+60
View File
@@ -145,4 +145,64 @@
<data name="Detector_StatusLabel" xml:space="preserve">
<value>状态：</value>
</data>
<data name="Detector_DarkCorrection_ConfirmTitle" xml:space="preserve">
<value>暗场校正确认</value>
</data>
<data name="Detector_DarkCorrection_ConfirmMessage" xml:space="preserve">
<value>请确认射线源已关闭，即将开始暗场校正。</value>
</data>
<data name="Detector_DarkCorrection_Title" xml:space="preserve">
<value>暗场校正</value>
</data>
<data name="Detector_LightCorrection_ConfirmObjectTitle" xml:space="preserve">
<value>亮场校正确认</value>
</data>
<data name="Detector_LightCorrection_ConfirmObjectMessage" xml:space="preserve">
<value>请确认物体已移出探测器视野。</value>
</data>
<data name="Detector_LightCorrection_ConfirmRayMessage" xml:space="preserve">
<value>请确认射线源已开启且稳定，即将开始亮场校正。</value>
</data>
<data name="Detector_LightCorrection_Title" xml:space="preserve">
<value>亮场校正</value>
</data>
<data name="Detector_BadPixelCorrection_Title" xml:space="preserve">
<value>坏像素校正</value>
</data>
<data name="Detector_Progress_StoppingAcquisition" xml:space="preserve">
<value>正在停止采集...</value>
</data>
<data name="Detector_Progress_ApplyingParameters" xml:space="preserve">
<value>正在应用参数...</value>
</data>
<data name="Detector_Progress_AcquiringDarkData" xml:space="preserve">
<value>正在采集暗场数据（64帧），请等待...</value>
</data>
<data name="Detector_Progress_DarkCorrectionDone" xml:space="preserve">
<value>暗场校正完成</value>
</data>
<data name="Detector_Progress_AcquiringLightData" xml:space="preserve">
<value>正在采集亮场数据（64帧），请等待...</value>
</data>
<data name="Detector_Progress_BadPixelCorrecting" xml:space="preserve">
<value>正在执行坏像素校正...</value>
</data>
<data name="Detector_Progress_LightAndBadPixelDone" xml:space="preserve">
<value>亮场校正及坏像素校正完成</value>
</data>
<data name="Detector_Progress_LightDoneBadPixelFailed" xml:space="preserve">
<value>亮场校正完成，但坏像素校正失败</value>
</data>
<data name="Detector_Progress_DetectingBadPixels" xml:space="preserve">
<value>正在检测坏像素...</value>
</data>
<data name="Detector_Progress_BadPixelDone" xml:space="preserve">
<value>坏像素校正完成</value>
</data>
<data name="Detector_ParameterMismatch_Title" xml:space="preserve">
<value>参数不一致</value>
</data>
<data name="Detector_ParameterMismatch_Message" xml:space="preserve">
<value>当前参数与暗场校正时不一致，请重新进行暗场校正。</value>
</data>
</root>
XP.Hardware.Detector/Resources/Resources.zh-TW.resx
+60
View File
@@ -145,4 +145,64 @@
<data name="Detector_StatusLabel" xml:space="preserve">
<value>狀態：</value>
</data>
<data name="Detector_DarkCorrection_ConfirmTitle" xml:space="preserve">
<value>暗場校正確認</value>
</data>
<data name="Detector_DarkCorrection_ConfirmMessage" xml:space="preserve">
<value>請確認射線源已關閉，即將開始暗場校正。</value>
</data>
<data name="Detector_DarkCorrection_Title" xml:space="preserve">
<value>暗場校正</value>
</data>
<data name="Detector_LightCorrection_ConfirmObjectTitle" xml:space="preserve">
<value>亮場校正確認</value>
</data>
<data name="Detector_LightCorrection_ConfirmObjectMessage" xml:space="preserve">
<value>請確認物體已移出探測器視野。</value>
</data>
<data name="Detector_LightCorrection_ConfirmRayMessage" xml:space="preserve">
<value>請確認射線源已開啟且穩定，即將開始亮場校正。</value>
</data>
<data name="Detector_LightCorrection_Title" xml:space="preserve">
<value>亮場校正</value>
</data>
<data name="Detector_BadPixelCorrection_Title" xml:space="preserve">
<value>壞像素校正</value>
</data>
<data name="Detector_Progress_StoppingAcquisition" xml:space="preserve">
<value>正在停止採集...</value>
</data>
<data name="Detector_Progress_ApplyingParameters" xml:space="preserve">
<value>正在套用參數...</value>
</data>
<data name="Detector_Progress_AcquiringDarkData" xml:space="preserve">
<value>正在採集暗場資料（64幀），請等待...</value>
</data>
<data name="Detector_Progress_DarkCorrectionDone" xml:space="preserve">
<value>暗場校正完成</value>
</data>
<data name="Detector_Progress_AcquiringLightData" xml:space="preserve">
<value>正在採集亮場資料（64幀），請等待...</value>
</data>
<data name="Detector_Progress_BadPixelCorrecting" xml:space="preserve">
<value>正在執行壞像素校正...</value>
</data>
<data name="Detector_Progress_LightAndBadPixelDone" xml:space="preserve">
<value>亮場校正及壞像素校正完成</value>
</data>
<data name="Detector_Progress_LightDoneBadPixelFailed" xml:space="preserve">
<value>亮場校正完成，但壞像素校正失敗</value>
</data>
<data name="Detector_Progress_DetectingBadPixels" xml:space="preserve">
<value>正在檢測壞像素...</value>
</data>
<data name="Detector_Progress_BadPixelDone" xml:space="preserve">
<value>壞像素校正完成</value>
</data>
<data name="Detector_ParameterMismatch_Title" xml:space="preserve">
<value>參數不一致</value>
</data>
<data name="Detector_ParameterMismatch_Message" xml:space="preserve">
<value>當前參數與暗場校正時不一致，請重新進行暗場校正。</value>
</data>
</root>