From 67718629aeb7bd0b43a5d0784e411a74c3262c57 Mon Sep 17 00:00:00 2001
From: Alek-ban <alek.kovkov124@gmail.com>
Date: Mon, 10 Aug 2026 11:55:39 +0300
Subject: [PATCH] fix: minor ui bugs

---
 .../AmineContent/AnalysisViewModel.cs         |  4 +-
 GSS2/Views/AmineContent/AnalysisView.axaml    | 48 ++++++++++++++-----
 .../AmineContent/SampleCalibrationView.axaml  | 20 ++++++--
 3 files changed, 55 insertions(+), 17 deletions(-)

diff --git a/GSS2/ViewModels/AmineContent/AnalysisViewModel.cs b/GSS2/ViewModels/AmineContent/AnalysisViewModel.cs
index 62ad96e..d561af4 100644
--- a/GSS2/ViewModels/AmineContent/AnalysisViewModel.cs
+++ b/GSS2/ViewModels/AmineContent/AnalysisViewModel.cs
@@ -494,6 +494,8 @@ public partial class AnalysisViewModel : ViewModelBase
             InnerStdDevs.Clear();
             InnerHeterogeneities.Clear();
 
+            ParticlesCount = Values.Count();
+
             if (Values.Count() == 0)
             {
                 MeanProcessedArea = -1;
@@ -1112,7 +1114,7 @@ public partial class AnalysisViewModel : ViewModelBase
         Record.MixtureNormalRate = -1;
         Record.Image.Data = "";
         Record.MaskImage.Data = "";
-        Record.MaskImage.Data = "";
+        Record.ResultImage.Data = "";
         Record.Values = new List<float[]>();
         Record.Xs = new List<float[]>();
         Record.Ys = new List<float[]>();
diff --git a/GSS2/Views/AmineContent/AnalysisView.axaml b/GSS2/Views/AmineContent/AnalysisView.axaml
index e13c912..e70bee6 100644
--- a/GSS2/Views/AmineContent/AnalysisView.axaml
+++ b/GSS2/Views/AmineContent/AnalysisView.axaml
@@ -167,12 +167,24 @@
                                 PlaceholderText="Тип сепаратора"
                                 SelectedIndex="{Binding SeparatorComboBoxSelectedIndex}"
                             >
+
+                                <ComboBox.Styles>
+
+                                    <Style Selector="ComboBox /template/ ContentPresenter#PART_ContentPresenter">
+                                        <Setter Property="HorizontalContentAlignment" Value="Left"/>
+                                        <Setter Property="VerticalContentAlignment" Value="Center"/>
+                                    </Style>
+
+                                    <Style Selector="ComboBoxItem">
+                                        <Setter Property="HorizontalContentAlignment" Value="Center"/>
+                                        <Setter Property="VerticalContentAlignment" Value="Center"/>
+                                    </Style>
+
+                                </ComboBox.Styles>
+    
                                 <ComboBox.ItemTemplate>
                                     <DataTemplate x:DataType="vm:AnalysisViewModel+SeparatorComboBoxItemViewModel">
-                                        <TextBlock
-                                            HorizontalAlignment="Center"
-                                            VerticalAlignment="Center"
-                                        >
+                                        <TextBlock>
                                             <Run Text="{Binding Id, StringFormat='[{0}] '}" />
                                             <Run Text="{Binding Type}" />
                                         </TextBlock>
@@ -208,12 +220,24 @@
                                 PlaceholderText="Марка пробы"
                                 SelectedIndex="{Binding BrandComboBoxSelectedIndex}"
                             >
+
+                                <ComboBox.Styles>
+
+                                    <Style Selector="ComboBox /template/ ContentPresenter#PART_ContentPresenter">
+                                        <Setter Property="HorizontalContentAlignment" Value="Left"/>
+                                        <Setter Property="VerticalContentAlignment" Value="Center"/>
+                                    </Style>
+
+                                    <Style Selector="ComboBoxItem">
+                                        <Setter Property="HorizontalContentAlignment" Value="Center"/>
+                                        <Setter Property="VerticalContentAlignment" Value="Center"/>
+                                    </Style>
+                                    
+                                </ComboBox.Styles>
+
                                 <ComboBox.ItemTemplate>
                                     <DataTemplate x:DataType="vm:AnalysisViewModel+BrandComboBoxItemViewModel">
-                                        <TextBlock
-                                            HorizontalAlignment="Center"
-                                            VerticalAlignment="Center"
-                                        >
+                                        <TextBlock>
                                             <Run Text="{Binding Id, StringFormat='[{0}] '}" />
                                             <Run Text="{Binding BrandName}" />
                                             <Run Text=" - " />
@@ -434,7 +458,7 @@
                                     
                                         <StackPanel.IsVisible>
                                             <MultiBinding Converter="{x:Static BoolConverters.And}">
-                                                <Binding Converter="{x:Static StringConverters.IsNullOrEmpty}" Path="Record.Image.Data" />
+                                                <!-- <Binding Converter="{x:Static StringConverters.IsNullOrEmpty}" Path="Record.Image.Data" /> -->
                                                 <Binding Converter="{x:Static BoolConverters.Not}" Path="Record.Image.IsLoading" />
                                                 <Binding Path="ImagesIsCapturing" />
                                             </MultiBinding>
@@ -511,7 +535,7 @@
                                     
                                         <StackPanel.IsVisible>
                                             <MultiBinding Converter="{x:Static BoolConverters.And}">
-                                                <Binding Converter="{x:Static StringConverters.IsNullOrEmpty}" Path="Record.MaskImage.Data" />
+                                                <!-- <Binding Converter="{x:Static StringConverters.IsNullOrEmpty}" Path="Record.MaskImage.Data" /> -->
                                                 <Binding Converter="{x:Static BoolConverters.Not}" Path="Record.MaskImage.IsLoading" />
                                                 <Binding Path="ImagesIsCapturing" />
                                             </MultiBinding>
@@ -588,7 +612,7 @@
                                     
                                         <StackPanel.IsVisible>
                                             <MultiBinding Converter="{x:Static BoolConverters.And}">
-                                                <Binding Converter="{x:Static StringConverters.IsNullOrEmpty}" Path="Record.ResultImage.Data" />
+                                                <!-- <Binding Converter="{x:Static StringConverters.IsNullOrEmpty}" Path="Record.ResultImage.Data" /> -->
                                                 <Binding Converter="{x:Static BoolConverters.Not}" Path="Record.ResultImage.IsLoading" />
                                                 <Binding Path="ImagesIsCapturing" />
                                             </MultiBinding>
@@ -1074,7 +1098,7 @@
                         
                             <StackPanel.IsVisible>
                                 <MultiBinding Converter="{x:Static BoolConverters.And}">
-                                    <Binding Converter="{x:Static StringConverters.IsNullOrEmpty}" Path="Record.Image.Data" />
+                                    <!-- <Binding Converter="{x:Static StringConverters.IsNullOrEmpty}" Path="Record.Image.Data" /> -->
                                     <Binding Converter="{x:Static BoolConverters.Not}" Path="Record.Image.IsLoading" />
                                     <Binding Path="ImagesIsCapturing" />
                                 </MultiBinding>
diff --git a/GSS2/Views/AmineContent/SampleCalibrationView.axaml b/GSS2/Views/AmineContent/SampleCalibrationView.axaml
index 52364ff..fdf435e 100644
--- a/GSS2/Views/AmineContent/SampleCalibrationView.axaml
+++ b/GSS2/Views/AmineContent/SampleCalibrationView.axaml
@@ -177,12 +177,24 @@
                                 PlaceholderText="Марка пробы"
                                 SelectedIndex="{Binding BrandComboBoxSelectedIndex}"
                             >
+
+                                <ComboBox.Styles>
+
+                                    <Style Selector="ComboBox /template/ ContentPresenter#PART_ContentPresenter">
+                                        <Setter Property="HorizontalContentAlignment" Value="Left"/>
+                                        <Setter Property="VerticalContentAlignment" Value="Center"/>
+                                    </Style>
+
+                                    <Style Selector="ComboBoxItem">
+                                        <Setter Property="HorizontalContentAlignment" Value="Center"/>
+                                        <Setter Property="VerticalContentAlignment" Value="Center"/>
+                                    </Style>
+                                    
+                                </ComboBox.Styles>
+
                                 <ComboBox.ItemTemplate>
                                     <DataTemplate x:DataType="vm:SampleCalibrationViewModel+BrandComboBoxItemViewModel">
-                                        <TextBlock
-                                            HorizontalAlignment="Left"
-                                            VerticalAlignment="Center"
-                                        >
+                                        <TextBlock>
                                             <Run Text="{Binding Id, StringFormat='[{0}] '}" />
                                             <Run Text="{Binding BrandName}" />
                                             <Run Text=" - " />