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

feat: amine content disable camera due unstable work

Browse Source
This commit is contained in:
amkovkov
2026-06-08 07:34:30 +03:00
parent e853254c00
commit cec12bca23
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GSS2/ViewModels/AmineContentViewModel.cs
+3 -3
View File
@@ -16,7 +16,7 @@ public partial class AmineContentViewModel : ViewModelBase
[ObservableProperty] public partial AnalysisViewModel Analysis { get; set; } [ObservableProperty] public partial AnalysisViewModel Analysis { get; set; }
[ObservableProperty] public partial SampleCalibrationViewModel SampleCalibration { get; set; } [ObservableProperty] public partial SampleCalibrationViewModel SampleCalibration { get; set; }
[ObservableProperty] public partial SeparatorCalibrationViewModel SeparatorCalibration { get; set; } [ObservableProperty] public partial SeparatorCalibrationViewModel SeparatorCalibration { get; set; }
[ObservableProperty] public partial CameraViewModel Camera { get; set; } // [ObservableProperty] public partial CameraViewModel Camera { get; set; }
[ObservableProperty] public partial SystemViewModel System { get; set; } [ObservableProperty] public partial SystemViewModel System { get; set; }
[ObservableProperty] public partial int CurrentIndex { get; set; } [ObservableProperty] public partial int CurrentIndex { get; set; }
@@ -27,7 +27,7 @@ public partial class AmineContentViewModel : ViewModelBase
AnalysisViewModel analysis, AnalysisViewModel analysis,
SampleCalibrationViewModel sampleCalibration, SampleCalibrationViewModel sampleCalibration,
SeparatorCalibrationViewModel separatorCalibration, SeparatorCalibrationViewModel separatorCalibration,
CameraViewModel camera, // CameraViewModel camera,
SystemViewModel system SystemViewModel system
) )
{ {
@@ -35,7 +35,7 @@ public partial class AmineContentViewModel : ViewModelBase
Analysis = analysis; Analysis = analysis;
SampleCalibration = sampleCalibration; SampleCalibration = sampleCalibration;
SeparatorCalibration = separatorCalibration; SeparatorCalibration = separatorCalibration;
Camera = camera; // Camera = camera;
System = system; System = system;
} }
GSS2/Views/AmineContentView.axaml
+5 -5
View File
@@ -59,7 +59,7 @@
<ColumnDefinition Width="*" MinWidth="200"/> <!-- Анализ --> <ColumnDefinition Width="*" MinWidth="200"/> <!-- Анализ -->
<ColumnDefinition Width="*" MinWidth="200"/> <!-- Калибровка проб --> <ColumnDefinition Width="*" MinWidth="200"/> <!-- Калибровка проб -->
<ColumnDefinition Width="*" MinWidth="200"/> <!-- Калибровка сепаратора --> <ColumnDefinition Width="*" MinWidth="200"/> <!-- Калибровка сепаратора -->
<ColumnDefinition Width="*" MinWidth="200"/> <!-- Камера --> <!-- <ColumnDefinition Width="*" MinWidth="200"/> --> <!-- Камера -->
<ColumnDefinition Width="*" MinWidth="200"/> <!-- Система --> <ColumnDefinition Width="*" MinWidth="200"/> <!-- Система -->
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
@@ -79,12 +79,12 @@
</Button> </Button>
<!-- Камера --> <!-- Камера -->
<Button Grid.Column="3" Classes="menu" Command="{Binding ChangeSectionCommand}" CommandParameter="3"> <!-- <Button Grid.Column="3" Classes="menu" Command="{Binding ChangeSectionCommand}" CommandParameter="3">
<TextBlock Classes="menu-text" Text="Камера"/> <TextBlock Classes="menu-text" Text="Камера"/>
</Button> </Button> -->
<!-- Система --> <!-- Система -->
<Button Grid.Column="4" Classes="menu" Command="{Binding ChangeSectionCommand}" CommandParameter="4"> <Button Grid.Column="3" Classes="menu" Command="{Binding ChangeSectionCommand}" CommandParameter="4">
<TextBlock Classes="menu-text" Text="Система"/> <TextBlock Classes="menu-text" Text="Система"/>
</Button> </Button>
@@ -96,7 +96,7 @@
<ContentControl Content="{Binding Analysis}"/> <!-- Анализ --> <ContentControl Content="{Binding Analysis}"/> <!-- Анализ -->
<ContentControl Content="{Binding SampleCalibration}"/> <!-- Калибровка проб --> <ContentControl Content="{Binding SampleCalibration}"/> <!-- Калибровка проб -->
<ContentControl Content="{Binding SeparatorCalibration}"/> <!-- Калибровка сепаратора --> <ContentControl Content="{Binding SeparatorCalibration}"/> <!-- Калибровка сепаратора -->
<ContentControl Content="{Binding Camera}"/> <!-- Камера --> <!-- <ContentControl Content="{Binding Camera}"/> --> <!-- Камера -->
<ContentControl Content="{Binding System}"/> <!-- Система --> <ContentControl Content="{Binding System}"/> <!-- Система -->
</core:SectionPanel> </core:SectionPanel>