kmenshikov/GSS2Rework
1
0
Fork 0
forked from amkovkov/GranuSightSoftware2
Code Pull Requests Activity

fix: minor ui bugs

Browse Source
This commit is contained in:
amkovkov
2026-08-10 11:55:39 +03:00
parent 19fe72bdc3
commit 67718629ae
3 changed files with 55 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GSS2/ViewModels/AmineContent/AnalysisViewModel.cs
+3 -1
View File
@@ -494,6 +494,8 @@ public partial class AnalysisViewModel : ViewModelBase
InnerStdDevs.Clear(); InnerStdDevs.Clear();
InnerHeterogeneities.Clear(); InnerHeterogeneities.Clear();
ParticlesCount = Values.Count();
if (Values.Count() == 0) if (Values.Count() == 0)
{ {
MeanProcessedArea = -1; MeanProcessedArea = -1;
@@ -1112,7 +1114,7 @@ public partial class AnalysisViewModel : ViewModelBase
Record.MixtureNormalRate = -1; Record.MixtureNormalRate = -1;
Record.Image.Data = ""; Record.Image.Data = "";
Record.MaskImage.Data = ""; Record.MaskImage.Data = "";
Record.MaskImage.Data = ""; Record.ResultImage.Data = "";
Record.Values = new List<float[]>(); Record.Values = new List<float[]>();
Record.Xs = new List<float[]>(); Record.Xs = new List<float[]>();
Record.Ys = new List<float[]>(); Record.Ys = new List<float[]>();
GSS2/Views/AmineContent/AnalysisView.axaml
+36 -12
View File
@@ -167,12 +167,24 @@
PlaceholderText="Тип сепаратора" PlaceholderText="Тип сепаратора"
SelectedIndex="{Binding SeparatorComboBoxSelectedIndex}" 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> <ComboBox.ItemTemplate>
<DataTemplate x:DataType="vm:AnalysisViewModel+SeparatorComboBoxItemViewModel"> <DataTemplate x:DataType="vm:AnalysisViewModel+SeparatorComboBoxItemViewModel">
<TextBlock <TextBlock>
HorizontalAlignment="Center"
VerticalAlignment="Center"
>
<Run Text="{Binding Id, StringFormat='[{0}] '}" /> <Run Text="{Binding Id, StringFormat='[{0}] '}" />
<Run Text="{Binding Type}" /> <Run Text="{Binding Type}" />
</TextBlock> </TextBlock>
@@ -208,12 +220,24 @@
PlaceholderText="Марка пробы" PlaceholderText="Марка пробы"
SelectedIndex="{Binding BrandComboBoxSelectedIndex}" 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> <ComboBox.ItemTemplate>
<DataTemplate x:DataType="vm:AnalysisViewModel+BrandComboBoxItemViewModel"> <DataTemplate x:DataType="vm:AnalysisViewModel+BrandComboBoxItemViewModel">
<TextBlock <TextBlock>
HorizontalAlignment="Center"
VerticalAlignment="Center"
>
<Run Text="{Binding Id, StringFormat='[{0}] '}" /> <Run Text="{Binding Id, StringFormat='[{0}] '}" />
<Run Text="{Binding BrandName}" /> <Run Text="{Binding BrandName}" />
<Run Text=" - " /> <Run Text=" - " />
@@ -434,7 +458,7 @@
<StackPanel.IsVisible> <StackPanel.IsVisible>
<MultiBinding Converter="{x:Static BoolConverters.And}"> <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 Converter="{x:Static BoolConverters.Not}" Path="Record.Image.IsLoading" />
<Binding Path="ImagesIsCapturing" /> <Binding Path="ImagesIsCapturing" />
</MultiBinding> </MultiBinding>
@@ -511,7 +535,7 @@
<StackPanel.IsVisible> <StackPanel.IsVisible>
<MultiBinding Converter="{x:Static BoolConverters.And}"> <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 Converter="{x:Static BoolConverters.Not}" Path="Record.MaskImage.IsLoading" />
<Binding Path="ImagesIsCapturing" /> <Binding Path="ImagesIsCapturing" />
</MultiBinding> </MultiBinding>
@@ -588,7 +612,7 @@
<StackPanel.IsVisible> <StackPanel.IsVisible>
<MultiBinding Converter="{x:Static BoolConverters.And}"> <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 Converter="{x:Static BoolConverters.Not}" Path="Record.ResultImage.IsLoading" />
<Binding Path="ImagesIsCapturing" /> <Binding Path="ImagesIsCapturing" />
</MultiBinding> </MultiBinding>
@@ -1074,7 +1098,7 @@
<StackPanel.IsVisible> <StackPanel.IsVisible>
<MultiBinding Converter="{x:Static BoolConverters.And}"> <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 Converter="{x:Static BoolConverters.Not}" Path="Record.Image.IsLoading" />
<Binding Path="ImagesIsCapturing" /> <Binding Path="ImagesIsCapturing" />
</MultiBinding> </MultiBinding>
GSS2/Views/AmineContent/SampleCalibrationView.axaml
+16 -4
View File
@@ -177,12 +177,24 @@
PlaceholderText="Марка пробы" PlaceholderText="Марка пробы"
SelectedIndex="{Binding BrandComboBoxSelectedIndex}" 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> <ComboBox.ItemTemplate>
<DataTemplate x:DataType="vm:SampleCalibrationViewModel+BrandComboBoxItemViewModel"> <DataTemplate x:DataType="vm:SampleCalibrationViewModel+BrandComboBoxItemViewModel">
<TextBlock <TextBlock>
HorizontalAlignment="Left"
VerticalAlignment="Center"
>
<Run Text="{Binding Id, StringFormat='[{0}] '}" /> <Run Text="{Binding Id, StringFormat='[{0}] '}" />
<Run Text="{Binding BrandName}" /> <Run Text="{Binding BrandName}" />
<Run Text=" - " /> <Run Text=" - " />