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

去掉MahApps相关引用

Browse Source
This commit is contained in:
李伟
2026-04-28 14:05:53 +08:00
parent 872f320114
commit 0c2e360f21
2 changed files with 11 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
XP.Camera/Calibration/Controls/CalibrationControl.xaml
+5 -29
View File
@@ -3,7 +3,6 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
xmlns:cal="clr-namespace:XP.Camera.Calibration" xmlns:cal="clr-namespace:XP.Camera.Calibration"
xmlns:controls="clr-namespace:XP.Camera.Calibration.Controls" xmlns:controls="clr-namespace:XP.Camera.Calibration.Controls"
mc:Ignorable="d" mc:Ignorable="d"
@@ -36,9 +35,6 @@
BorderThickness="{TemplateBinding BorderThickness}" BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="3"> CornerRadius="3">
<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center"> <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
<ContentPresenter Content="{TemplateBinding Tag}"
HorizontalAlignment="Center"
Margin="0,4,0,4" />
<TextBlock Text="{TemplateBinding Content}" <TextBlock Text="{TemplateBinding Content}"
FontSize="12" FontSize="12"
HorizontalAlignment="Center" HorizontalAlignment="Center"
@@ -77,39 +73,19 @@
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<Button Content="{Binding Source={StaticResource LocalizedStrings}, Path=Resources.CalibrationLoadImage}" <Button Content="{Binding Source={StaticResource LocalizedStrings}, Path=Resources.CalibrationLoadImage}"
Command="{Binding LoadImageCommand}" FontFamily="Segoe UI" Command="{Binding LoadImageCommand}" FontFamily="Segoe UI"
Style="{StaticResource ToolbarButtonStyle}"> Style="{StaticResource ToolbarButtonStyle}" />
<Button.Tag>
<iconPacks:PackIconMaterial Kind="ImageOutline" Width="24" Height="24" />
</Button.Tag>
</Button>
<Button Content="{Binding Source={StaticResource LocalizedStrings}, Path=Resources.CalibrationLoadCsv}" <Button Content="{Binding Source={StaticResource LocalizedStrings}, Path=Resources.CalibrationLoadCsv}"
Command="{Binding LoadCsvCommand}" FontFamily="Segoe UI" Command="{Binding LoadCsvCommand}" FontFamily="Segoe UI"
Style="{StaticResource ToolbarButtonStyle}"> Style="{StaticResource ToolbarButtonStyle}" />
<Button.Tag>
<iconPacks:PackIconMaterial Kind="FileDelimited" Width="24" Height="24" />
</Button.Tag>
</Button>
<Button Content="{Binding Source={StaticResource LocalizedStrings}, Path=Resources.CalibrationExecute}" <Button Content="{Binding Source={StaticResource LocalizedStrings}, Path=Resources.CalibrationExecute}"
Command="{Binding CalibrateCommand}" FontFamily="Segoe UI" Command="{Binding CalibrateCommand}" FontFamily="Segoe UI"
Style="{StaticResource ToolbarButtonStyle}"> Style="{StaticResource ToolbarButtonStyle}" />
<Button.Tag>
<iconPacks:PackIconMaterial Kind="Crosshairs" Width="24" Height="24" />
</Button.Tag>
</Button>
<Button Content="{Binding Source={StaticResource LocalizedStrings}, Path=Resources.CalibrationSave}" <Button Content="{Binding Source={StaticResource LocalizedStrings}, Path=Resources.CalibrationSave}"
Command="{Binding SaveCalibrationCommand}" FontFamily="Segoe UI" Command="{Binding SaveCalibrationCommand}" FontFamily="Segoe UI"
Style="{StaticResource ToolbarButtonStyle}"> Style="{StaticResource ToolbarButtonStyle}" />
<Button.Tag>
<iconPacks:PackIconMaterial Kind="ContentSave" Width="24" Height="24" />
</Button.Tag>
</Button>
<Button Content="{Binding Source={StaticResource LocalizedStrings}, Path=Resources.CalibrationLoad}" <Button Content="{Binding Source={StaticResource LocalizedStrings}, Path=Resources.CalibrationLoad}"
Command="{Binding LoadCalibrationCommand}" FontFamily="Segoe UI" Command="{Binding LoadCalibrationCommand}" FontFamily="Segoe UI"
Style="{StaticResource ToolbarButtonStyle}"> Style="{StaticResource ToolbarButtonStyle}" />
<Button.Tag>
<iconPacks:PackIconMaterial Kind="FolderOpen" Width="24" Height="24" />
</Button.Tag>
</Button>
<CheckBox Content="{Binding Source={StaticResource LocalizedStrings}, Path=Resources.CalibrationShowWorld}" <CheckBox Content="{Binding Source={StaticResource LocalizedStrings}, Path=Resources.CalibrationShowWorld}"
VerticalAlignment="Center" FontFamily="Segoe UI" VerticalAlignment="Center" FontFamily="Segoe UI"
IsChecked="{Binding ShowWorldCoordinates}" IsChecked="{Binding ShowWorldCoordinates}"
XP.Camera/Calibration/Controls/ChessboardCalibrationControl.xaml
+6 -22
View File
@@ -3,7 +3,6 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
xmlns:cal="clr-namespace:XP.Camera.Calibration" xmlns:cal="clr-namespace:XP.Camera.Calibration"
xmlns:controls="clr-namespace:XP.Camera.Calibration.Controls" xmlns:controls="clr-namespace:XP.Camera.Calibration.Controls"
mc:Ignorable="d" mc:Ignorable="d"
@@ -37,9 +36,6 @@
BorderThickness="{TemplateBinding BorderThickness}" BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="3"> CornerRadius="3">
<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center"> <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
<ContentPresenter Content="{TemplateBinding Tag}"
HorizontalAlignment="Center"
Margin="0,4,0,4" />
<TextBlock Text="{TemplateBinding Content}" <TextBlock Text="{TemplateBinding Content}"
FontSize="12" FontFamily="Segoe UI" FontSize="12" FontFamily="Segoe UI"
HorizontalAlignment="Center" HorizontalAlignment="Center"
@@ -76,29 +72,17 @@
BorderThickness="0,0,0,1" Padding="15,10"> BorderThickness="0,0,0,1" Padding="15,10">
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<Button Content="{Binding Source={StaticResource LocalizedStrings}, Path=Resources.ChessboardAddImages}" Command="{Binding AddImagesCommand}" <Button Content="{Binding Source={StaticResource LocalizedStrings}, Path=Resources.ChessboardAddImages}" Command="{Binding AddImagesCommand}"
Style="{StaticResource ToolbarButtonStyle}"> Style="{StaticResource ToolbarButtonStyle}" />
<Button.Tag><iconPacks:PackIconMaterial Kind="ImageMultiple" Width="24" Height="24" /></Button.Tag>
</Button>
<Button Content="{Binding Source={StaticResource LocalizedStrings}, Path=Resources.ChessboardClearImages}" Command="{Binding ClearImagesCommand}" <Button Content="{Binding Source={StaticResource LocalizedStrings}, Path=Resources.ChessboardClearImages}" Command="{Binding ClearImagesCommand}"
Style="{StaticResource ToolbarButtonStyle}"> Style="{StaticResource ToolbarButtonStyle}" />
<Button.Tag><iconPacks:PackIconMaterial Kind="DeleteSweep" Width="24" Height="24" /></Button.Tag>
</Button>
<Button Content="{Binding Source={StaticResource LocalizedStrings}, Path=Resources.ChessboardCalibrate}" Command="{Binding CalibrateCommand}" <Button Content="{Binding Source={StaticResource LocalizedStrings}, Path=Resources.ChessboardCalibrate}" Command="{Binding CalibrateCommand}"
Style="{StaticResource ToolbarButtonStyle}"> Style="{StaticResource ToolbarButtonStyle}" />
<Button.Tag><iconPacks:PackIconMaterial Kind="GridLarge" Width="24" Height="24" /></Button.Tag>
</Button>
<Button Content="{Binding Source={StaticResource LocalizedStrings}, Path=Resources.ChessboardSave}" Command="{Binding SaveCalibrationCommand}" <Button Content="{Binding Source={StaticResource LocalizedStrings}, Path=Resources.ChessboardSave}" Command="{Binding SaveCalibrationCommand}"
Style="{StaticResource ToolbarButtonStyle}"> Style="{StaticResource ToolbarButtonStyle}" />
<Button.Tag><iconPacks:PackIconMaterial Kind="ContentSave" Width="24" Height="24" /></Button.Tag>
</Button>
<Button Content="{Binding Source={StaticResource LocalizedStrings}, Path=Resources.ChessboardLoad}" Command="{Binding LoadCalibrationCommand}" <Button Content="{Binding Source={StaticResource LocalizedStrings}, Path=Resources.ChessboardLoad}" Command="{Binding LoadCalibrationCommand}"
Style="{StaticResource ToolbarButtonStyle}"> Style="{StaticResource ToolbarButtonStyle}" />
<Button.Tag><iconPacks:PackIconMaterial Kind="FolderOpen" Width="24" Height="24" /></Button.Tag>
</Button>
<Button Content="{Binding Source={StaticResource LocalizedStrings}, Path=Resources.ChessboardUndistort}" Command="{Binding UndistortImageCommand}" <Button Content="{Binding Source={StaticResource LocalizedStrings}, Path=Resources.ChessboardUndistort}" Command="{Binding UndistortImageCommand}"
Style="{StaticResource ToolbarButtonStyle}"> Style="{StaticResource ToolbarButtonStyle}" />
<Button.Tag><iconPacks:PackIconMaterial Kind="ImageEdit" Width="24" Height="24" /></Button.Tag>
</Button>
</StackPanel> </StackPanel>
</Border> </Border>