TyroneGit/CapMachine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CAN 配置和报文记录的功能

Browse Source
This commit is contained in:
Tyrone CT
2024-12-23 21:33:19 +08:00
parent 713b9b02e6
commit 8b21846424
20 changed files with 1021 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
CapMachine.Wpf/Views/CANConfigView.xaml
View File

@@ -71,9 +71,9 @@
<Grid Grid.Row="1">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="360" />
<ColumnDefinition Width="400" />
<ColumnDefinition />
<ColumnDefinition Width="800" />
<ColumnDefinition Width="500" />
</Grid.ColumnDefinitions>
<Grid Margin="3">
@@ -87,7 +87,10 @@
Background="{DynamicResource MaterialDesignLightBackground}"
Foreground="{DynamicResource PrimaryHueLightForegroundBrush}"
UniformCornerRadius="5">
<StackPanel Margin="5" Orientation="Horizontal">
<StackPanel
Margin="5"
HorizontalAlignment="Center"
Orientation="Horizontal">
<Button
Margin="2,0"
Command="{Binding CanLinConfigPromdCmd}"
@@ -191,8 +194,12 @@
<i:EventTrigger EventName="SelectionChanged">
<prism:InvokeCommandAction Command="{Binding CanConfigProGridSelectionChangedCmd}" CommandParameter="{Binding ElementName=CANConfigDatagrid, Path=SelectedItem}" />
</i:EventTrigger>
<i:EventTrigger EventName="PreviewMouseLeftButtonDown">
<prism:InvokeCommandAction Command="{Binding CanConfigProGridPreviewMouseLeftButtonDownCmd}" />
</i:EventTrigger>
</i:Interaction.Triggers>
</DataGrid>
</Grid>
@@ -368,7 +375,7 @@
<StackPanel
Grid.Row="2"
Grid.ColumnSpan="2"
Grid.ColumnSpan="3"
Orientation="Horizontal">
<TextBlock
Margin="10,0,10,0"
@@ -401,13 +408,22 @@
</Border>
<Button
Margin="5,0"
Command="{Binding CanOpCmd}"
CommandParameter="SendTest1"
Content="发送测试数据" />
<Button
Margin="5,0"
Command="{Binding CanOpCmd}"
CommandParameter="SendTest2"
Content="发送测试数据" />
<Button
Margin="5,0"
Background="Green"
Command="{Binding CanOpCmd}"
CommandParameter="Listen"
Content="监听报文"
Foreground="White" />
</StackPanel>
</Grid>
@@ -672,11 +688,11 @@
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
<DataGridTextColumn Width="200" Binding="{Binding Name}">
<!--<DataGridTextColumn Width="200" Binding="{Binding Name}">
<DataGridTextColumn.Header>
<TextBlock FontWeight="Bold" Text="名称" />
</DataGridTextColumn.Header>
</DataGridTextColumn>
</DataGridTextColumn>-->
<DataGridTextColumn Binding="{Binding Content}" IsReadOnly="True">
<DataGridTextColumn.Header>
<TextBlock FontWeight="Bold" Text="配置内容" />
@@ -776,17 +792,17 @@
</DataGridTextColumn.Header>
</DataGridTextColumn>
<DataGridTextColumn Binding="{Binding SignalDesc}">
<!--<DataGridTextColumn Binding="{Binding SignalDesc}">
<DataGridTextColumn.Header>
<TextBlock FontWeight="Bold" Text="信号描述" />
</DataGridTextColumn.Header>
</DataGridTextColumn>
</DataGridTextColumn>-->
<DataGridTextColumn Binding="{Binding SignalUnit}">
<!--<DataGridTextColumn Binding="{Binding SignalUnit}">
<DataGridTextColumn.Header>
<TextBlock FontWeight="Bold" Text="信号单位" />
</DataGridTextColumn.Header>
</DataGridTextColumn>
</DataGridTextColumn>-->
<DataGridTextColumn Binding="{Binding SignalRtValue}">
<DataGridTextColumn.Header>

6
CapMachine.Wpf/Views/MonitorView.xaml
View File

@@ -757,9 +757,9 @@
<!--<svg1:SVGImage Grid.Column="1" Source="E:\图库资源\SVGEdit\CapMachineOutput.svg" RenderTransformOrigin="0.5,0.5" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" Margin="3" />-->
<Canvas Grid.Column="1">
<Canvas.Background>
<ImageBrush ImageSource="E:\图库资源\SVGEdit\CapMachineOutput1.png" />
</Canvas.Background>
<!--<Canvas.Background>
<ImageBrush ImageSource="\Assets\Images\CapMachineOutput1.png" />
</Canvas.Background>-->
<Rectangle
Canvas.Left="30"
Canvas.Top="107"

8
CapMachine.Wpf/Views/ProConfigView.xaml
View File

@@ -561,7 +561,11 @@
<TextBlock FontWeight="Bold" Text="序号" />
</DataGridTextColumn.Header>
</DataGridTextColumn>
<DataGridTextColumn Binding="{Binding SpeedCycle.Cycle}" CanUserSort="False">
<DataGridTextColumn
Binding="{Binding SpeedCycle.Cycle}"
CanUserSort="False"
FontSize="16"
Foreground="Blue">
<DataGridTextColumn.Header>
<TextBlock FontWeight="Bold" Text="转速&#x0A;循环次数" />
</DataGridTextColumn.Header>
@@ -1787,7 +1791,7 @@
SwitchConstSlopCommand="{Binding MeterOS2TempSwitchConstSlopCmd}"
TotalSlopTime="{Binding MeterOS2TempExDto.SlopTime}" />
</TabItem>
<!--<TabItem>
<TabItem.Header>
<StackPanel