浏览代码

feat(ui): 删CalibWindow底部冗余孔位数据 + well格预览显示详细参数

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
huangjie 1 周之前
父节点
当前提交
a2470e771f
共有 3 个文件被更改,包括 4 次插入13 次删除
  1. 0 9
      CalibWindow.xaml
  2. 0 3
      CalibWindow.xaml.cs
  3. 4 1
      MainWindow.Calib.cs

+ 0 - 9
CalibWindow.xaml

@@ -7,7 +7,6 @@
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="*"/>
-            <RowDefinition Height="120"/>
         </Grid.RowDefinitions>
 
         <!-- 顶部:进度提示 + 控制 -->
@@ -24,13 +23,5 @@
 
         <!-- 中部:16 well 网格(4x4),正在标定的格子实时显示画面 -->
         <UniformGrid x:Name="WellGrid" Grid.Row="1" Rows="4" Columns="4" Margin="0,8,0,8"/>
-
-        <!-- 底部:仅当前参数/步骤文字(画面直接显示在上面对应well格内) -->
-        <Border Grid.Row="2" Background="#252526" Padding="8" CornerRadius="4">
-            <StackPanel VerticalAlignment="Center">
-                <TextBlock x:Name="TxtCurParams" Text="当前: --" Foreground="White" FontSize="14"/>
-                <TextBlock x:Name="TxtCurStep" Text="" Foreground="#DCDCAA" FontSize="13" Margin="0,4,0,0"/>
-            </StackPanel>
-        </Border>
     </Grid>
 </Window>

+ 0 - 3
CalibWindow.xaml.cs

@@ -81,9 +81,6 @@ namespace AutoFocusTool
         {
             Dispatcher.Invoke(() =>
             {
-                if (param != null) TxtCurParams.Text = param;
-                if (step != null) TxtCurStep.Text = step;
-                // 当前well格标题实时显示步骤+参数
                 if (_activeWell >= 1 && _activeWell <= 16)
                 {
                     _cellCaps[_activeWell].Text = $"well {_activeWell} 标定中\n{step}\n{param}";

+ 4 - 1
MainWindow.Calib.cs

@@ -146,10 +146,13 @@ namespace AutoFocusTool
                         },
                         OnStep = (msg, circle, exp) =>
                         {
-                            string param = circle != null && circle.Found
+                            string circlePart = circle != null && circle.Found
                                 ? $"圆心偏移 Y:{circle.OffsetYPct:F0}% X:{circle.OffsetXPct:F0}% 完整:{circle.Complete}"
                                 : "未检出well圆";
+                            string expPart = exp != null ? $" 曝光信息:{exp}" : "";
+                            string param = $"Z:{_lastZ} 水平:{_lastH} {circlePart}{expPart}";
                             win.SetCurrentInfo(param, msg);
+                            AutoFocusTool.Logging.FileLogger.Data("CALIB", $"{msg} | {param}");
                         }
                     };