Skip to content

H
hemei
Commit 2345c155 authored by 潘栩锋's avatar 潘栩锋 🚴
Browse files
Options

分离中心收卷主界面，与表面收卷主界面

parent c5fb85fb
Show whitespace changes
Inline Side-by-side
Showing with 1163 additions and 264 deletions
Project.FLY.Winder_20190413/FLY.Winder.UI.Client/FLY.Winder.UI.Client.csproj
View file @ 2345c155
...@@ -72,6 +72,10 @@ ...@@ -72,6 +72,10 @@
<Compile Include="PgInterstitialParam\PgInterstitialParam.xaml.cs"> <Compile Include="PgInterstitialParam\PgInterstitialParam.xaml.cs">
<DependentUpon>PgInterstitialParam.xaml</DependentUpon> <DependentUpon>PgInterstitialParam.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="UiModule\MainPanel\MainPanel2.xaml.cs">
<DependentUpon>MainPanel2.xaml</DependentUpon>
</Compile>
<Compile Include="UiModule\MainPanel\UiModule2_MainPanel2.cs" />
<Compile Include="UiModule\MainPanel\UiModule2_MainPanel.cs" /> <Compile Include="UiModule\MainPanel\UiModule2_MainPanel.cs" />
<Compile Include="UiModule\CenterWinderPanel\CenterWinderPanel.xaml.cs"> <Compile Include="UiModule\CenterWinderPanel\CenterWinderPanel.xaml.cs">
<DependentUpon>CenterWinderPanel.xaml</DependentUpon> <DependentUpon>CenterWinderPanel.xaml</DependentUpon>
...@@ -89,6 +93,9 @@ ...@@ -89,6 +93,9 @@
<Compile Include="UiModule\VelocityCtrlPanel\VelocityCtrlPanel.xaml.cs"> <Compile Include="UiModule\VelocityCtrlPanel\VelocityCtrlPanel.xaml.cs">
<DependentUpon>VelocityCtrlPanel.xaml</DependentUpon> <DependentUpon>VelocityCtrlPanel.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="UiModule\WdManual\WdManual2.xaml.cs">
<DependentUpon>WdManual2.xaml</DependentUpon>
</Compile>
<Compile Include="UiModule\WdMeasure.xaml.cs"> <Compile Include="UiModule\WdMeasure.xaml.cs">
<DependentUpon>WdMeasure.xaml</DependentUpon> <DependentUpon>WdMeasure.xaml</DependentUpon>
</Compile> </Compile>
...@@ -138,6 +145,10 @@ ...@@ -138,6 +145,10 @@
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType> <SubType>Designer</SubType>
</Page> </Page>
<Page Include="UiModule\MainPanel\MainPanel2.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="UiModule\MainPanel\MainPanelStyle.xaml"> <Page Include="UiModule\MainPanel\MainPanelStyle.xaml">
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
...@@ -170,6 +181,10 @@ ...@@ -170,6 +181,10 @@
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</Page> </Page>
<Page Include="UiModule\WdManual\WdManual2.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="UiModule\WdManual\WdManualStyle.xaml"> <Page Include="UiModule\WdManual\WdManualStyle.xaml">
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
......
Project.FLY.Winder_20190413/FLY.Winder.UI.Client/UIModule/WdManual/WdManual.xaml
View file @ 2345c155
...@@ -76,111 +76,6 @@ ...@@ -76,111 +76,6 @@
</Button> </Button>
<TextBlock Text="压臂平移" Style="{StaticResource TextBlockStyle_FieldHeader}"/> <TextBlock Text="压臂平移" Style="{StaticResource TextBlockStyle_FieldHeader}"/>
</StackPanel> </StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}">
<Button Style="{StaticResource ButtonStyle_resizeIcon}">
<i:Interaction.Behaviors>
<flyctrllib:ResetBehavior Binding="{Binding PushRod}"/>
</i:Interaction.Behaviors>
<Grid>
<Border Background="White" Margin="2" CornerRadius="0 0 5 5"/>
<iconPacks:PackIconMaterial Kind="FormatVerticalAlignTop" />
</Grid>
</Button>
<TextBlock Text="内顶杆" Style="{StaticResource TextBlockStyle_FieldHeader}"/>
</StackPanel>
</WrapPanel>
<WrapPanel Orientation="Horizontal">
<StackPanel Margin="{StaticResource ControlMargin}">
<ToggleButton Style="{StaticResource ToggleButtonStyle_hand}" IsChecked="{Binding IsTongAuto}" />
<TextBlock Style="{StaticResource TextBlockStyle_hand}" Tag="{Binding IsTongAuto}"/>
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}">
<Button Style="{StaticResource ButtonStyle_resizeIcon}">
<i:Interaction.Behaviors>
<flyctrllib:ResetBehavior Binding="{Binding TongClamp}"/>
</i:Interaction.Behaviors>
<Grid>
<iconPacks:PackIconMaterial Kind="ArrowCollapseHorizontal" />
</Grid>
</Button>
<TextBlock Text="抓手夹紧" Style="{StaticResource TextBlockStyle_FieldHeader}"/>
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}">
<Button Style="{StaticResource ButtonStyle_resizeIcon}">
<i:Interaction.Behaviors>
<flyctrllib:ResetBehavior Binding="{Binding TongLoosen}"/>
</i:Interaction.Behaviors>
<Grid>
<iconPacks:PackIconMaterial Kind="ArrowExpandHorizontal"/>
</Grid>
</Button>
<TextBlock Text="抓手松开" Style="{StaticResource TextBlockStyle_FieldHeader}"/>
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}">
<Button Style="{StaticResource ButtonStyle_resizeIcon}">
<i:Interaction.Behaviors>
<flyctrllib:ResetBehavior Binding="{Binding TongUp}"/>
</i:Interaction.Behaviors>
<Grid>
<Border Background="White" Margin="5" />
<iconPacks:PackIconMaterial Kind="ArrowUpBoldBox"/>
</Grid>
</Button>
<TextBlock Text="抓手上升" Style="{StaticResource TextBlockStyle_FieldHeader}"/>
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}">
<Button Style="{StaticResource ButtonStyle_resizeIcon}">
<i:Interaction.Behaviors>
<flyctrllib:ResetBehavior Binding="{Binding TongDown}"/>
</i:Interaction.Behaviors>
<Grid>
<Border Background="White" Margin="5" />
<iconPacks:PackIconMaterial Kind="ArrowDownBoldBox"/>
</Grid>
</Button>
<TextBlock Text="抓手下降" Style="{StaticResource TextBlockStyle_FieldHeader}"/>
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}">
<Button Style="{StaticResource ButtonStyle_resizeIcon}">
<i:Interaction.Behaviors>
<flyctrllib:ResetBehavior Binding="{Binding TongIn}"/>
</i:Interaction.Behaviors>
<Grid>
<Border Background="White" Margin="5" />
<iconPacks:PackIconMaterial Kind="ArrowLeftBoldBox"/>
</Grid>
</Button>
<TextBlock Text="抓手进" Style="{StaticResource TextBlockStyle_FieldHeader}"/>
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}">
<Button Style="{StaticResource ButtonStyle_resizeIcon}">
<i:Interaction.Behaviors>
<flyctrllib:ResetBehavior Binding="{Binding TongOut}"/>
</i:Interaction.Behaviors>
<Grid>
<Border Background="White" Margin="5"/>
<iconPacks:PackIconMaterial Kind="ArrowRightBoldBox"/>
</Grid>
</Button>
<TextBlock Text="抓手出" Style="{StaticResource TextBlockStyle_FieldHeader}"/>
</StackPanel>
</WrapPanel> </WrapPanel>
</StackPanel> </StackPanel>
</Border> </Border>
...@@ -240,112 +135,9 @@ ...@@ -240,112 +135,9 @@
</Button> </Button>
<TextBlock Text="压臂平移" Style="{StaticResource TextBlockStyle_FieldHeader}"/> <TextBlock Text="压臂平移" Style="{StaticResource TextBlockStyle_FieldHeader}"/>
</StackPanel> </StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}">
<Button Style="{StaticResource ButtonStyle_resizeIcon}">
<i:Interaction.Behaviors>
<flyctrllib:ResetBehavior Binding="{Binding PushRod}"/>
</i:Interaction.Behaviors>
<Grid>
<Border Background="White" Margin="2" CornerRadius="0 0 5 5"/>
<iconPacks:PackIconMaterial Kind="FormatVerticalAlignTop" />
</Grid>
</Button>
<TextBlock Text="内顶杆" Style="{StaticResource TextBlockStyle_FieldHeader}"/>
</StackPanel>
</WrapPanel> </WrapPanel>
<WrapPanel Orientation="Horizontal">
<StackPanel Margin="{StaticResource ControlMargin}">
<ToggleButton Style="{StaticResource ToggleButtonStyle_hand}" IsChecked="{Binding IsTongAuto}" />
<TextBlock Style="{StaticResource TextBlockStyle_hand}" Tag="{Binding IsTongAuto}"/>
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}">
<Button Style="{StaticResource ButtonStyle_resizeIcon}">
<i:Interaction.Behaviors>
<flyctrllib:ResetBehavior Binding="{Binding TongClamp}"/>
</i:Interaction.Behaviors>
<Grid>
<iconPacks:PackIconMaterial Kind="ArrowCollapseHorizontal" />
</Grid>
</Button>
<TextBlock Text="抓手夹紧" Style="{StaticResource TextBlockStyle_FieldHeader}"/>
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}">
<Button Style="{StaticResource ButtonStyle_resizeIcon}">
<i:Interaction.Behaviors>
<flyctrllib:ResetBehavior Binding="{Binding TongLoosen}"/>
</i:Interaction.Behaviors>
<Grid>
<iconPacks:PackIconMaterial Kind="ArrowExpandHorizontal"/>
</Grid>
</Button>
<TextBlock Text="抓手松开" Style="{StaticResource TextBlockStyle_FieldHeader}"/>
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}">
<Button Style="{StaticResource ButtonStyle_resizeIcon}">
<i:Interaction.Behaviors>
<flyctrllib:ResetBehavior Binding="{Binding TongUp}"/>
</i:Interaction.Behaviors>
<Grid>
<Border Background="White" Margin="5" />
<iconPacks:PackIconMaterial Kind="ArrowUpBoldBox"/>
</Grid>
</Button>
<TextBlock Text="抓手上升" Style="{StaticResource TextBlockStyle_FieldHeader}"/>
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}">
<Button Style="{StaticResource ButtonStyle_resizeIcon}">
<i:Interaction.Behaviors>
<flyctrllib:ResetBehavior Binding="{Binding TongDown}"/>
</i:Interaction.Behaviors>
<Grid>
<Border Background="White" Margin="5" />
<iconPacks:PackIconMaterial Kind="ArrowDownBoldBox"/>
</Grid>
</Button>
<TextBlock Text="抓手下降" Style="{StaticResource TextBlockStyle_FieldHeader}"/>
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}">
<Button Style="{StaticResource ButtonStyle_resizeIcon}">
<i:Interaction.Behaviors>
<flyctrllib:ResetBehavior Binding="{Binding TongIn}"/>
</i:Interaction.Behaviors>
<Grid>
<Border Background="White" Margin="5" />
<iconPacks:PackIconMaterial Kind="ArrowLeftBoldBox"/>
</Grid>
</Button>
<TextBlock Text="抓手进" Style="{StaticResource TextBlockStyle_FieldHeader}"/>
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}">
<Button Style="{StaticResource ButtonStyle_resizeIcon}">
<i:Interaction.Behaviors>
<flyctrllib:ResetBehavior Binding="{Binding TongOut}"/>
</i:Interaction.Behaviors>
<Grid>
<Border Background="White" Margin="5"/>
<iconPacks:PackIconMaterial Kind="ArrowRightBoldBox"/>
</Grid>
</Button>
<TextBlock Text="抓手出" Style="{StaticResource TextBlockStyle_FieldHeader}"/>
</StackPanel>
</WrapPanel>
</StackPanel> </StackPanel>
</Border> </Border>
</StackPanel> </StackPanel>
......
Project.FLY.Winder_20190413/FLY.Winder.UI.Client/UIModule/WdManual/WdManual.xaml.cs
View file @ 2345c155
...@@ -45,17 +45,10 @@ namespace FLY.Winder.UI.Client.UiModule ...@@ -45,17 +45,10 @@ namespace FLY.Winder.UI.Client.UiModule
winderSystem.PLCos, winderSystem.PLCos,
winderSystem.Items[i], winderSystem.Items[i],
new string[] { new string[] {
"IsTongAuto",
"TurnoverInching", "TurnoverInching",
"CuttingFilm", "CuttingFilm",
"TurnoverOrg", "TurnoverOrg",
"PressureArmOffset", "PressureArmOffset"});
"PushRod",
"TongLoosen",
"TongUp",
"TongDown",
"TongIn",
"TongOut" });
} }
} }
......
Project.FLY.Winder_20190413/FLY.Winder.UI.Client/UiModule/CenterWinderPanel/UiModule2_CenterWinderPanel.cs
View file @ 2345c155
...@@ -16,7 +16,7 @@ namespace FLY.Winder.UI.Client.UiModule ...@@ -16,7 +16,7 @@ namespace FLY.Winder.UI.Client.UiModule
/// 控件标题 /// 控件标题
/// 它的值取决于culture /// 它的值取决于culture
/// </summary> /// </summary>
public string Title=>"中心收卷"; public string Title=>"中心收卷设置";
public ComponentType Type => ComponentType.Graph; public ComponentType Type => ComponentType.Graph;
public bool IsUnique => true; public bool IsUnique => true;
/// <summary> /// <summary>
......
Project.FLY.Winder_20190413/FLY.Winder.UI.Client/UiModule/MainPanel/MainPanel2.xaml 0 → 100644
View file @ 2345c155
<UserControl x:Class="FLY.Winder.UI.Client.UiModule.MainPanel2"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:FLY.Winder.UI.Client.UiModule"
xmlns:conv="clr-namespace:FLY.Winder.UI.Client.Converter"
xmlns:sys="clr-namespace:System;assembly=mscorlib"
xmlns:flyctrl="clr-namespace:FLY.ControlLibrary;assembly=FLY.ControlLibrary"
xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
mc:Ignorable="d" >
<UserControl.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="MainPanelStyle.xaml"/>
</ResourceDictionary.MergedDictionaries>
<!--<Style TargetType="{x:Type ToggleButton}" x:Key="ToggleButtonStyle_start" >
<Setter Property="Margin" Value="5"/>
<Setter Property="HorizontalContentAlignment" Value="Center"/>
<Setter Property="VerticalContentAlignment" Value="Center"/>
<Setter Property="Padding" Value="1"/>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type ToggleButton}">
<Canvas x:Name="canvas" Height="55" Width="110" Background="DarkRed">
<Rectangle x:Name="Path_block" Height="45" Width="24" Margin="5" Fill="White" />
<StackPanel x:Name="SP_Text" Orientation="Horizontal" Margin="20,15" Canvas.Right="0">
<TextBlock x:Name="TB_OnOff" Text="停止" Foreground="White" FontSize="24" FontFamily="YouYuan"/>
</StackPanel>
</Canvas>
<ControlTemplate.Triggers>
<Trigger Property="IsChecked" Value="True">
<Setter TargetName="TB_OnOff" Property="Text" Value="运行"/>
<Setter TargetName="Path_block" Property="Canvas.Right" Value="0"/>
<Setter TargetName="SP_Text" Property="Canvas.Left" Value="0"/>
<Setter TargetName="canvas" Property="Background" Value="Green"/>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>-->
<!--<conv:IsGTMultiValueConverter x:Key="isgtconv"/>-->
</ResourceDictionary>
</UserControl.Resources>
<Grid d:DataContext="{StaticResource unittests_windersystem}">
<Grid.RowDefinitions>
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
<RowDefinition />
</Grid.RowDefinitions>
<Grid x:Name="grid_winder" d:DataContext="{StaticResource unittests_windersystem}"/>
<Grid x:Name="grid_accessory" DataContext="{Binding DataContext.Accessory,ElementName=grid_winder}"/>
<Grid x:Name="grid_winder0" DataContext="{Binding DataContext.Items[0],ElementName=grid_winder}"/>
<Grid x:Name="grid_winder1" DataContext="{Binding DataContext.Items[1],ElementName=grid_winder}"/>
<Border Grid.Row="0" Margin="5" CornerRadius="5" Background="{StaticResource Color_theme_background}" >
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition SharedSizeGroup="A"/>
<ColumnDefinition SharedSizeGroup="A"/>
<ColumnDefinition SharedSizeGroup="A"/>
<ColumnDefinition Width="auto"/>
</Grid.ColumnDefinitions>
<Viewbox x:Name="viewbox_velocity" Margin="10" MaxHeight="{StaticResource MaxHeight_viewer1}" HorizontalAlignment="Left">
<Button Style="{StaticResource ButtonStyle_empty}" Click="button_v_set_Click">
<Grid DataContext="{Binding Accessory}">
<Grid.RowDefinitions>
<RowDefinition Height="auto"/>
<RowDefinition />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="auto"/>
<ColumnDefinition/>
<ColumnDefinition Width="auto"/>
</Grid.ColumnDefinitions>
<TextBlock Grid.Row="0" Grid.Column="0" Text="设定" FontSize="{StaticResource FontSize_title}" Margin="3,0" Foreground="{StaticResource Color_theme_activity}"/>
<StackPanel Grid.Row="1" Grid.Column="0" Margin="3,0">
<TextBlock Text="实际" FontSize="{StaticResource FontSize_title}" Foreground="{StaticResource Color_theme_static}"/>
</StackPanel>
<StackPanel Grid.Row="0" Grid.Column="1" Orientation="Horizontal" VerticalAlignment="Top">
<TextBlock Text="{Binding VelocitySet,StringFormat={}{0:F1}}" Style="{StaticResource TextBlockStyle_FieldContent}" FontSize="{StaticResource FontSize_context_min}" Foreground="DarkBlue" VerticalAlignment="Bottom"/>
<TextBlock Text="m/min" Style="{StaticResource TextBlockStyle_FieldContent_mm}" FontSize="{StaticResource FontSize_unit}"/>
</StackPanel>
<TextBlock Text="速度" Grid.Column="2" FontSize="35" Margin="3" Padding="4,0" Background="#FF636363" Foreground="White"/>
<Grid Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="2" >
<StackPanel Orientation="Horizontal">
<TextBlock Text="{Binding Velocity,StringFormat={}{0:F1}}" Style="{StaticResource TextBlockStyle_FieldContent}" FontSize="{StaticResource FontSize_context_max}" VerticalAlignment="Bottom"/>
<TextBlock Text="m/min" Style="{StaticResource TextBlockStyle_FieldContent_mm}"/>
</StackPanel>
</Grid>
</Grid>
</Button>
</Viewbox>
<Viewbox Grid.Column="1" Margin="10" MaxHeight="{StaticResource MaxHeight_viewer1}" HorizontalAlignment="Left">
<Grid DataContext="{Binding Items[0]}">
<Grid.RowDefinitions>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="auto"/>
<ColumnDefinition/>
<ColumnDefinition Width="auto"/>
</Grid.ColumnDefinitions>
<ToggleButton Grid.Row="2" Grid.Column="0" Margin="3,0" Style="{StaticResource ToggleButtonStyle_measure}" IsChecked="{Binding MeasureStop}"/>
<Button Style="{StaticResource ButtonStyle_empty}" Grid.RowSpan="2" Grid.ColumnSpan="2" Click="button_measure_Click" Tag="{Binding .}">
<StackPanel >
<StackPanel Orientation="Horizontal">
<TextBlock Text="设定" FontSize="{StaticResource FontSize_title}" Margin="3,0" Foreground="{StaticResource Color_theme_activity}"/>
<TextBlock Text="{Binding MeasureLenSet,StringFormat={}{0:F0}}" Style="{StaticResource TextBlockStyle_FieldContent}" FontSize="{StaticResource FontSize_context_min}" Foreground="DarkBlue"/>
<TextBlock Text="m" Style="{StaticResource TextBlockStyle_FieldContent_mm}" FontSize="{StaticResource FontSize_unit}"/>
</StackPanel>
<StackPanel Orientation="Horizontal">
<TextBlock Text="预警" FontSize="{StaticResource FontSize_title}" Margin="3,0" Foreground="Red"/>
<TextBlock Text="{Binding MeasurePreWarning,StringFormat={}{0:F0}}" Style="{StaticResource TextBlockStyle_FieldContent}" FontSize="{StaticResource FontSize_context_min}" Foreground="DarkRed"/>
<TextBlock Text="m" Style="{StaticResource TextBlockStyle_FieldContent_mm}" FontSize="{StaticResource FontSize_unit}"/>
</StackPanel>
</StackPanel>
</Button>
<TextBlock Text="内收卷" Grid.Column="2" Grid.RowSpan="2" FontSize="35" Margin="3" Padding="4,0" Background="#FF636363" Foreground="White"/>
<Grid Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="2" >
<Grid.ColumnDefinitions>
<ColumnDefinition/>
<ColumnDefinition Width="auto"/>
</Grid.ColumnDefinitions>
<StackPanel Orientation="Horizontal">
<TextBlock Text="{Binding MeasureLen,StringFormat={}{0:F0}}" Style="{StaticResource TextBlockStyle_FieldContent}" FontSize="{StaticResource FontSize_context_max}" VerticalAlignment="Bottom" HorizontalAlignment="Right"/>
<TextBlock Text="m" Style="{StaticResource TextBlockStyle_FieldContent_mm}" HorizontalAlignment="Left" VerticalAlignment="Bottom"/>
</StackPanel>
<StackPanel HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,-25,-25,0">
<Button x:Name="button_clear0" Style="{StaticResource ButtonStyle_resizeIcon}" Foreground="Red">
<i:Interaction.Behaviors>
<flyctrl:ResetBehavior Binding="{Binding MeasureReset}"/>
</i:Interaction.Behaviors>
<Grid>
<Rectangle Width="40" Height="40" Fill="White"/>
<iconPacks:PackIconMaterial Kind="CloseBox" />
</Grid>
</Button>
</StackPanel>
</Grid>
</Grid>
</Viewbox>
<Viewbox Grid.Column="2" Margin="15,10" MaxHeight="{StaticResource MaxHeight_viewer1}" HorizontalAlignment="Left">
<Grid DataContext="{Binding Items[1]}">
<Grid.RowDefinitions>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="auto"/>
<ColumnDefinition/>
<ColumnDefinition Width="auto"/>
</Grid.ColumnDefinitions>
<ToggleButton Grid.Row="2" Grid.Column="0" Margin="3,0" Style="{StaticResource ToggleButtonStyle_measure}" IsChecked="{Binding MeasureStop}"/>
<Button Style="{StaticResource ButtonStyle_empty}" Grid.RowSpan="2" Grid.ColumnSpan="2" Click="button_measure_Click" Tag="{Binding .}">
<StackPanel >
<StackPanel Orientation="Horizontal">
<TextBlock Text="设定" FontSize="{StaticResource FontSize_title}" Margin="3,0" Foreground="{StaticResource Color_theme_activity}"/>
<TextBlock Text="{Binding MeasureLenSet,StringFormat={}{0:F0}}" Style="{StaticResource TextBlockStyle_FieldContent}" FontSize="{StaticResource FontSize_context_min}" Foreground="DarkBlue"/>
<TextBlock Text="m" Style="{StaticResource TextBlockStyle_FieldContent_mm}" FontSize="{StaticResource FontSize_unit}"/>
</StackPanel>
<StackPanel Orientation="Horizontal">
<TextBlock Text="预警" FontSize="{StaticResource FontSize_title}" Margin="3,0" Foreground="Red"/>
<TextBlock Text="{Binding MeasurePreWarning,StringFormat={}{0:F0}}" Style="{StaticResource TextBlockStyle_FieldContent}" FontSize="{StaticResource FontSize_context_min}" Foreground="DarkRed"/>
<TextBlock Text="m" Style="{StaticResource TextBlockStyle_FieldContent_mm}" FontSize="{StaticResource FontSize_unit}"/>
</StackPanel>
</StackPanel>
</Button>
<TextBlock Text="外收卷" Grid.Column="2" Grid.RowSpan="2" FontSize="35" Margin="3" Padding="4,0" Background="#FF636363" Foreground="White"/>
<Grid Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="2" >
<Grid.ColumnDefinitions>
<ColumnDefinition/>
<ColumnDefinition Width="auto"/>
</Grid.ColumnDefinitions>
<StackPanel Orientation="Horizontal">
<TextBlock Text="{Binding MeasureLen,StringFormat={}{0:F0}}" Style="{StaticResource TextBlockStyle_FieldContent}" FontSize="{StaticResource FontSize_context_max}" VerticalAlignment="Bottom" HorizontalAlignment="Right"/>
<TextBlock Text="m" Style="{StaticResource TextBlockStyle_FieldContent_mm}" HorizontalAlignment="Left" VerticalAlignment="Bottom"/>
</StackPanel>
<StackPanel HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,-25,-25,0">
<Button x:Name="button_clear1" Style="{StaticResource ButtonStyle_resizeIcon}" Foreground="Red">
<i:Interaction.Behaviors>
<flyctrl:ResetBehavior Binding="{Binding MeasureReset}"/>
</i:Interaction.Behaviors>
<Grid>
<Rectangle Width="40" Height="40" Fill="White"/>
<iconPacks:PackIconMaterial Kind="CloseBox" />
</Grid>
</Button>
</StackPanel>
</Grid>
</Grid>
</Viewbox>
</Grid>
</Border>
<Border Grid.Row="1" Margin="5" CornerRadius="5" Background="{StaticResource Color_theme_background}" >
<Grid DataContext="{Binding Accessory}" >
<Grid.ColumnDefinitions>
<ColumnDefinition Width="auto"/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<Viewbox Margin="10" MaxHeight="{StaticResource MaxHeight_viewer1}" Height="{Binding Path=ActualHeight, ElementName=viewbox_velocity}">
<Grid >
<Grid.RowDefinitions>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="auto"/>
<ColumnDefinition/>
<ColumnDefinition Width="auto"/>
</Grid.ColumnDefinitions>
<Button Grid.RowSpan="2" Grid.ColumnSpan="2" Style="{StaticResource ButtonStyle_empty}" Click="button_freq_Click">
<StackPanel >
<StackPanel Orientation="Horizontal">
<TextBlock Text="设定" FontSize="{StaticResource FontSize_title}" Margin="3,0" Foreground="{StaticResource Color_theme_activity}"/>
<StackPanel Orientation="Horizontal">
<TextBlock Text="{Binding RotaryFreqSet,StringFormat={}{0:F1}}" Style="{StaticResource TextBlockStyle_FieldContent}" FontSize="{StaticResource FontSize_context_min}" Foreground="DarkBlue"/>
<TextBlock Text="Hz" Style="{StaticResource TextBlockStyle_FieldContent_mm}" FontSize="{StaticResource FontSize_unit}"/>
</StackPanel>
</StackPanel>
<StackPanel Orientation="Horizontal">
<TextBlock Text="电流" FontSize="{StaticResource FontSize_title}" Margin="3,0" Foreground="{StaticResource Color_theme_static}"/>
<StackPanel Orientation="Horizontal">
<TextBlock Text="{Binding RotaryCurrent,StringFormat={}{0:F2}}" Style="{StaticResource TextBlockStyle_FieldContent}" FontSize="{StaticResource FontSize_context_min}" />
<TextBlock Text="A" Style="{StaticResource TextBlockStyle_FieldContent_mm}" FontSize="{StaticResource FontSize_unit}"/>
</StackPanel>
</StackPanel>
</StackPanel>
</Button>
<flyctrl:NoToggleButton Style="{StaticResource ButonStyle_rOn}" Grid.Row="2" IsChecked="{Binding IsRotaryOn}">
<i:Interaction.Behaviors>
<flyctrl:ResetBehavior Binding="{Binding RotaryOn}"/>
</i:Interaction.Behaviors>
</flyctrl:NoToggleButton>
<TextBlock Text="旋转塔" Grid.Column="2" Grid.RowSpan="2" FontSize="35" Margin="3" Padding="4,0" Background="#FF636363" Foreground="White"/>
<Grid Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="2" >
<StackPanel Orientation="Horizontal">
<TextBlock Text="{Binding RotaryFreq,StringFormat={}{0:F1}}" Style="{StaticResource TextBlockStyle_FieldContent}" FontSize="{StaticResource FontSize_context_max}"/>
<TextBlock Text="Hz" Style="{StaticResource TextBlockStyle_FieldContent_mm}"/>
</StackPanel>
<flyctrl:NoToggleButton Style="{StaticResource ButonStyle_rOrg}" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,-25,0,0" IsChecked="{Binding IsRotaryOrg}">
<i:Interaction.Behaviors>
<flyctrl:ResetBehavior Binding="{Binding RotaryOrg}"/>
</i:Interaction.Behaviors>
</flyctrl:NoToggleButton>
</Grid>
</Grid>
</Viewbox>
<Viewbox Grid.Column="1" Margin="10" MaxHeight="110" HorizontalAlignment="Left" VerticalAlignment="Top">
<WrapPanel Orientation="Horizontal" >
<StackPanel >
<flyctrl:NoToggleButton Style="{StaticResource NoToggleButtonStyle_light}" IsChecked="{Binding IsRotaryForw}">
正转运转中
</flyctrl:NoToggleButton>
<flyctrl:NoToggleButton Style="{StaticResource NoToggleButtonStyle_light}" IsChecked="{Binding IsRotaryBackw}">
反转运转中
</flyctrl:NoToggleButton>
</StackPanel>
<StackPanel >
<flyctrl:NoToggleButton Style="{StaticResource NoToggleButtonStyle_light}" IsChecked="{Binding IsRotaryForwTurn}">
正转换向
</flyctrl:NoToggleButton>
<flyctrl:NoToggleButton Style="{StaticResource NoToggleButtonStyle_light}" IsChecked="{Binding IsRotaryOrgSign}">
复位原点
</flyctrl:NoToggleButton>
<flyctrl:NoToggleButton Style="{StaticResource NoToggleButtonStyle_light}" IsChecked="{Binding IsRotaryBackwTurn}">
反转换向
</flyctrl:NoToggleButton>
</StackPanel>
<StackPanel >
<flyctrl:NoToggleButton Style="{StaticResource NoToggleButtonStyle_light}" IsChecked="{Binding IsRotaryForwLimit}">
正向限位
</flyctrl:NoToggleButton>
<flyctrl:NoToggleButton Style="{StaticResource NoToggleButtonStyle_light}" IsChecked="{Binding IsRotaryBackwLimit}">
反向限位
</flyctrl:NoToggleButton>
</StackPanel>
</WrapPanel>
</Viewbox>
</Grid>
</Border>
<Border Grid.Row="2" Margin="5" CornerRadius="5" Background="{StaticResource Color_theme_background}" >
<Grid>
<Viewbox VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10">
<Grid >
<Grid.ColumnDefinitions>
<ColumnDefinition Width="auto"/>
<ColumnDefinition Width="auto" SharedSizeGroup="A"/>
<ColumnDefinition Width="auto" SharedSizeGroup="A"/>
<ColumnDefinition Width="auto" SharedSizeGroup="A"/>
<ColumnDefinition Width="auto" SharedSizeGroup="A"/>
<ColumnDefinition Width="auto" SharedSizeGroup="A"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="auto" SharedSizeGroup="B"/>
<RowDefinition SharedSizeGroup="B"/>
<RowDefinition SharedSizeGroup="B"/>
<RowDefinition SharedSizeGroup="B"/>
<RowDefinition SharedSizeGroup="B"/>
</Grid.RowDefinitions>
<!--背景-->
<Rectangle Fill="{StaticResource Color_row0}" Grid.ColumnSpan="6" Grid.Row="1"/>
<Rectangle Fill="{StaticResource Color_row0}" Grid.ColumnSpan="6" Grid.Row="3"/>
<Border Grid.RowSpan="5" Grid.Column="1" BorderThickness="1" BorderBrush="{StaticResource Color_theme_static}"/>
<Border Grid.RowSpan="5" Grid.Column="2" BorderThickness="1" BorderBrush="{StaticResource Color_theme_static}"/>
<Border Grid.RowSpan="5" Grid.Column="3" BorderThickness="1" BorderBrush="{StaticResource Color_theme_static}"/>
<Border Grid.RowSpan="5" Grid.Column="4" BorderThickness="1" BorderBrush="{StaticResource Color_theme_static}"/>
<Border Grid.RowSpan="5" Grid.Column="5" BorderThickness="1" BorderBrush="{StaticResource Color_theme_static}"/>
<Border Grid.RowSpan="5" Grid.Column="1" Grid.ColumnSpan="5" BorderThickness="2" BorderBrush="{StaticResource Color_theme_static}"/>
<Rectangle Style="{StaticResource RectStyle_RowHeaderEditBackground}" Grid.Column="1" />
<Rectangle Style="{StaticResource RectStyle_RowHeaderBackground}" Grid.Column="2"/>
<Rectangle Style="{StaticResource RectStyle_RowHeaderBackground}" Grid.Column="3"/>
<Rectangle Style="{StaticResource RectStyle_RowHeaderEditBackground}" Grid.Column="4"/>
<Rectangle Style="{StaticResource RectStyle_RowHeaderEditBackground}" Grid.Column="5"/>
<Rectangle Style="{StaticResource RectStyle_RowHeaderEditBackground}" Grid.Row="1" />
<Rectangle Style="{StaticResource RectStyle_RowHeaderEditBackground}" Grid.Row="2" />
<Rectangle Style="{StaticResource RectStyle_RowHeaderEditBackground}" Grid.Row="3" />
<Rectangle Style="{StaticResource RectStyle_RowHeaderEditBackground}" Grid.Row="4" />
<!--列标题-->
<TextBlock Text="设定张力" Grid.Column="1" Style="{StaticResource TextBlockStyle_Header}"/>
<TextBlock Text="实际张力" Grid.Column="2" Style="{StaticResource TextBlockStyle_Header}"/>
<TextBlock Text="电机电流" Grid.Column="3" Style="{StaticResource TextBlockStyle_Header}"/>
<TextBlock Text="控制模式" Grid.Column="4" Style="{StaticResource TextBlockStyle_Header}"/>
<TextBlock Text="控制开关" Grid.Column="5" Style="{StaticResource TextBlockStyle_Header}"/>
<!--行标题-->
<TextBlock Text="上牵引" Grid.Row="1" Style="{StaticResource TextBlockStyle_RowHeader}"/>
<TextBlock Text="二牵引" Grid.Row="2" Style="{StaticResource TextBlockStyle_RowHeader}"/>
<TextBlock Text="内收卷" Grid.Row="3" Style="{DynamicResource TextBlockStyle_RowHeader}" />
<TextBlock Text="外收卷" Grid.Row="4" Style="{StaticResource TextBlockStyle_RowHeader}"/>
<!--一牵引-->
<StackPanel Style="{StaticResource SpStyle_ReadOnly}" Grid.Column="3" Grid.Row="1" >
<TextBlock Style="{StaticResource TextBlockStyle_Content}" Text="{Binding Accessory.Traction1Current,StringFormat={}{0:F1}}"/>
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="A"/>
</StackPanel>
<flyctrl:NoToggleButton Grid.Column="5" Grid.Row="1"
IsChecked="{Binding Accessory.IsTraction1On}"
OffLabel="停止"
OffBrush="DarkRed"
OnLabel="运行"
OnBrush="Green"
>
<i:Interaction.Behaviors>
<flyctrl:ResetBehavior Binding="{Binding Accessory.IsTraction1OnSet}"/>
</i:Interaction.Behaviors>
</flyctrl:NoToggleButton>
<!--二牵引-->
<StackPanel Style="{StaticResource SpStyle_Editable}" Grid.Column="1" Grid.Row="2" >
<TextBox Style="{StaticResource TextBoxStyle_Content}" Text="{Binding Accessory.Traction2TensionKgSet,StringFormat={}{0:F1}}" />
<TextBlock Text="kg" Style="{StaticResource TextBlockStyle_FieldContent_mm}" />
</StackPanel>
<StackPanel Style="{StaticResource SpStyle_ReadOnly}" Grid.Column="2" Grid.Row="2" >
<TextBlock Style="{StaticResource TextBlockStyle_Content}" Text="{Binding Accessory.Traction2TensionKg,StringFormat={}{0:F1}}" />
<TextBlock Text="kg" Style="{StaticResource TextBlockStyle_FieldContent_mm}" />
</StackPanel>
<StackPanel Style="{StaticResource SpStyle_ReadOnly}" Grid.Column="3" Grid.Row="2" >
<TextBlock Style="{StaticResource TextBlockStyle_Content}" Text="{Binding Accessory.Traction2Current,StringFormat={}{0:F1}}" />
<TextBlock Text="A" Style="{StaticResource TextBlockStyle_FieldContent_mm}" />
</StackPanel>
<ToggleButton Grid.Column="4" Grid.Row="2" Style="{StaticResource ToggleButtonStyle_auto}" IsChecked="{Binding Accessory.IsTraction2Manual}"/>
<flyctrl:NoToggleButton Grid.Column="5" Grid.Row="2"
IsChecked="{Binding Accessory.IsTraction2On}"
OffLabel="停止"
OffBrush="DarkRed"
OnLabel="运行"
OnBrush="Green"
>
<i:Interaction.Behaviors>
<flyctrl:ResetBehavior Binding="{Binding Accessory.IsTraction2OnSet}"/>
</i:Interaction.Behaviors>
</flyctrl:NoToggleButton>
<!--内收卷-->
<StackPanel Style="{StaticResource SpStyle_Editable}" Grid.Column="1" Grid.Row="3" >
<TextBox Style="{StaticResource TextBoxStyle_Content}" Text="{Binding Items[0].TensionKgSet,StringFormat={}{0:F1}}" />
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="kg" />
</StackPanel>
<StackPanel Style="{StaticResource SpStyle_ReadOnly}" Grid.Column="2" Grid.Row="3" >
<TextBlock Style="{StaticResource TextBlockStyle_Content}" Text="{Binding Items[0].TensionKg,StringFormat={}{0:F1}}" />
<TextBlock Text="kg" Style="{StaticResource TextBlockStyle_FieldContent_mm}" />
</StackPanel>
<StackPanel Style="{StaticResource SpStyle_ReadOnly}" Grid.Column="3" Grid.Row="3" >
<TextBlock Style="{StaticResource TextBlockStyle_Content}" Text="{Binding Items[0].Current,StringFormat={}{0:F1}}" />
<TextBlock Text="A" Style="{StaticResource TextBlockStyle_FieldContent_mm}" />
</StackPanel>
<ToggleButton Grid.Column="4" Grid.Row="3" Style="{StaticResource ToggleButtonStyle_auto}" IsChecked="{Binding Items[0].IsManual}"/>
<flyctrl:NoToggleButton x:Name="btnWind0On" Grid.Column="5" Grid.Row="3"
IsChecked="{Binding Items[0].IsOn}"
OffLabel="停止"
OffBrush="DarkRed"
OnLabel="运行"
OnBrush="Green"
>
<i:Interaction.Behaviors>
<flyctrl:ResetBehavior Binding="{Binding Items[0].IsOnSet}"/>
</i:Interaction.Behaviors>
</flyctrl:NoToggleButton>
<!--外收卷-->
<StackPanel Style="{StaticResource SpStyle_Editable}" Grid.Column="1" Grid.Row="4" >
<TextBox Style="{StaticResource TextBoxStyle_Content}" Text="{Binding Items[1].TensionKgSet,StringFormat={}{0:F1}}" />
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="kg" />
</StackPanel>
<StackPanel Style="{StaticResource SpStyle_ReadOnly}" Grid.Column="2" Grid.Row="4" >
<TextBlock Style="{StaticResource TextBlockStyle_Content}" Text="{Binding Items[1].TensionKg,StringFormat={}{0:F1}}" />
<TextBlock Text="kg" Style="{StaticResource TextBlockStyle_FieldContent_mm}" />
</StackPanel>
<StackPanel Style="{StaticResource SpStyle_ReadOnly}" Grid.Column="3" Grid.Row="4" >
<TextBlock Style="{StaticResource TextBlockStyle_Content}" Text="{Binding Items[1].Current,StringFormat={}{0:F1}}" />
<TextBlock Text="A" Style="{StaticResource TextBlockStyle_FieldContent_mm}" />
</StackPanel>
<ToggleButton Grid.Column="4" Grid.Row="4" Style="{StaticResource ToggleButtonStyle_auto}" IsChecked="{Binding Items[1].IsManual}"/>
<flyctrl:NoToggleButton x:Name="btnWind1On" Grid.Column="5" Grid.Row="4"
IsChecked="{Binding Items[1].IsOn}"
OffLabel="停止"
OffBrush="DarkRed"
OnLabel="运行"
OnBrush="Green"
>
<i:Interaction.Behaviors>
<flyctrl:ResetBehavior Binding="{Binding Items[1].IsOnSet}"/>
</i:Interaction.Behaviors>
</flyctrl:NoToggleButton>
</Grid>
</Viewbox>
</Grid>
</Border>
<Button Grid.Row="1" Click="button_manual_Click" Style="{StaticResource ButtonStyle_empty}" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="10" >
<Grid Style="{StaticResource GridStyle_ButtonShadow}">
<Ellipse Fill="Red" Stretch="Uniform" HorizontalAlignment="Center" VerticalAlignment="Center" Height="60" Width="60"/>
<TextBlock Margin="0,0,0,-10" Text="手动" Padding="2" Background="Red" Foreground="White" FontSize="20" VerticalAlignment="Bottom" HorizontalAlignment="Center" FontFamily="YouYuan"/>
<iconPacks:PackIconMaterial Kind="GestureTap" Height="40" Width="40" Foreground="White"/>
</Grid>
</Button>
</Grid>
</UserControl>
Project.FLY.Winder_20190413/FLY.Winder.UI.Client/UiModule/MainPanel/MainPanel2.xaml.cs 0 → 100644
View file @ 2345c155
using FLY.OBJComponents.Client;
using FLY.Winder.Common;
using FLY.Winder.IService;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
using Unity;
namespace FLY.Winder.UI.Client.UiModule
{
/// <summary>
/// MainPanel.xaml 的交互逻辑
/// </summary>
public partial class MainPanel2 : UserControl
{
IUnityContainer container;
IWinderSystemService winderSystem;
SetPLCUpdatePlan setPlan_accessory;
SetPLCUpdatePlan[] setPlan_winders = new SetPLCUpdatePlan[2];
public MainPanel2()
{
InitializeComponent();
}
[InjectionMethod]
public void Init(
IUnityContainer container,
IWinderSystemService winderSystem)
{
this.container = container;
this.winderSystem = winderSystem;
this.DataContext = winderSystem;
grid_winder.DataContext = winderSystem;
//注册属性更新计划
setPlan_accessory = new SetPLCUpdatePlan(
winderSystem.PLCos,
winderSystem.Accessory,
new string[] {
"VelocitySet",
"IsVelocityChanged",
"Velocity",
"RotaryFreqSet",
"IsRotaryFreqChanged",
"RotaryCurrent",
"RotaryFreq",
"IsRotaryOn",
"IsRotaryOrg",
"IsRotaryForw",
"IsRotaryBackw",
"IsRotaryForwLimit",
"IsRotaryForwTurn",
"IsRotaryOrgSign",
"IsRotaryBackwLimit",
"IsRotaryBackwTurn",
"Traction1Current",
"IsTraction1On",
"IsTraction2Manual",
"Traction2TensionKgSet",
"Traction2TensionKg",
"Traction2Current",
"IsTraction2Manual",
"IsTraction2On"
});
for (int i = 0; i < 2; i++)
{
setPlan_winders[i] = new SetPLCUpdatePlan(
winderSystem.PLCos,
winderSystem.Items[i],
new string[] {
"MeasureLenSet",
"MeasurePreWarning",
"MeasureLen",
"MeasureStop",
"TensionKgSet",
"TensionKg",
"Current",
"IsManual",
"IsOn"
});
}
}
private void button_v_set_Click(object sender, RoutedEventArgs e)
{
var w = container.Resolve<WdVelocity>();
w.Owner = FLY.ControlLibrary.COMMON.GetWindow(this);
w.ShowDialog();
}
private void button_manual_Click(object sender, RoutedEventArgs e)
{
var w = container.Resolve<WdManual2>();
w.Owner = FLY.ControlLibrary.COMMON.GetWindow(this);
w.ShowDialog();
}
private void button_freq_Click(object sender, RoutedEventArgs e)
{
var w = container.Resolve<WdFreq>();
w.Owner = FLY.ControlLibrary.COMMON.GetWindow(this);
w.ShowDialog();
}
private void button_measure_Click(object sender, RoutedEventArgs e)
{
Button button = sender as Button;
WinderInsideOutside item = (WinderInsideOutside)(button.Tag);
WdMeasure w = new WdMeasure();
w.Init((int)(item.MeasureLenSet), (int)(item.MeasurePreWarning));
w.Owner = FLY.ControlLibrary.COMMON.GetWindow(this);
if (w.ShowDialog() == true)
{
item.MeasureLenSet = w.viewmodel.MeasureLenSet;
item.MeasurePreWarning = w.viewmodel.MeasurePreWarning;
}
}
}
}
Project.FLY.Winder_20190413/FLY.Winder.UI.Client/UiModule/MainPanel/UiModule2_MainPanel.cs
View file @ 2345c155
...@@ -26,9 +26,9 @@ namespace FLY.Winder.UI.Client.UiModule ...@@ -26,9 +26,9 @@ namespace FLY.Winder.UI.Client.UiModule
/// <returns></returns> /// <returns></returns>
public FrameworkElement GetComponent(int id, IUnityContainer container) public FrameworkElement GetComponent(int id, IUnityContainer container)
{ {
MainPanel graph = new MainPanel(); var p = container.Resolve<MainPanel>();
container.BuildUp(graph);
return graph; return p;
} }
/// <summary> /// <summary>
......
Project.FLY.Winder_20190413/FLY.Winder.UI.Client/UiModule/MainPanel/UiModule2_MainPanel2.cs 0 → 100644
View file @ 2345c155
using MultiLayout.UiModule;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using Unity;
namespace FLY.Winder.UI.Client.UiModule
{
public class UiModule2_MainPanel2 : IUiModule2
{
/// <summary>
/// 控件标题
/// 它的值取决于culture
/// </summary>
public string Title=>"中心收卷主界面";
public ComponentType Type => ComponentType.Graph;
public bool IsUnique => true;
/// <summary>
/// 控件
/// 创建时，需要给它唯一ID，让加载自己的数据
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
public FrameworkElement GetComponent(int id, IUnityContainer container)
{
var p = container.Resolve<MainPanel2>();
return p;
}
/// <summary>
/// 控件缩略图，用于编辑界面时，大致看看
/// 创建时，需要给它唯一ID，让加载自己的数据
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
public FrameworkElement GetThumbnail()
{
return new System.Windows.Controls.Grid();
}
/// <summary>
/// 给出全部控件ID, 控件自行删除没有的参数
/// </summary>
/// <param name="IDs"></param>
public void MatchParam(int[] IDs)
{
}
}
}
Project.FLY.Winder_20190413/FLY.Winder.UI.Client/UiModule/WdManual/WdManual2.xaml 0 → 100644
View file @ 2345c155
<flyctrllib:WindowBigClose x:Class="FLY.Winder.UI.Client.UiModule.WdManual2"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:flyctrllib="clr-namespace:FLY.ControlLibrary;assembly=FLY.ControlLibrary"
xmlns:local="clr-namespace:FLY.Winder.UI.Client.UiModule"
xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
mc:Ignorable="d"
d:DataContext="{d:DesignData Source=../../UnitTests/WinderSystemUt.xaml}"
Title="Window_Manual" WindowStartupLocation="CenterScreen" SizeToContent="WidthAndHeight"
Unloaded="WindowBigClose_Unloaded">
<Window.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="WdManualStyle.xaml"/>
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</Window.Resources>
<StackPanel Background="#4f4f4f">
<Border Margin="5" CornerRadius="5" Background="{StaticResource Color_background}" DataContext="{Binding Items[0]}">
<StackPanel >
<TextBlock Text="内收卷" FontSize="35" Margin="3" Padding="4,0" Background="#FF636363" Foreground="White"/>
<WrapPanel Orientation="Horizontal">
<StackPanel Margin="{StaticResource ControlMargin}">
<Button Style="{StaticResource ButtonStyle_resizeIcon}" Grid.Row="10">
<i:Interaction.Behaviors>
<flyctrllib:ResetBehavior Binding="{Binding TurnoverInching}"/>
</i:Interaction.Behaviors>
<Grid>
<Ellipse Fill="White" Margin="10"/>
<iconPacks:PackIconMaterial Kind="Sync" />
</Grid>
</Button>
<TextBlock Text="翻转点动" Style="{StaticResource TextBlockStyle_FieldHeader}"/>
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}">
<Button Style="{StaticResource ButtonStyle_resizeIcon}">
<i:Interaction.Behaviors>
<flyctrllib:ResetBehavior Binding="{Binding TurnoverOrg}"/>
</i:Interaction.Behaviors>
<Grid>
<Ellipse Fill="White" Margin="3"/>
<iconPacks:PackIconMaterial Kind="Bullseye" />
</Grid>
</Button>
<TextBlock Text="翻转原点" Style="{StaticResource TextBlockStyle_FieldHeader}"/>
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}">
<Button Style="{StaticResource ButtonStyle_resizeIcon}">
<i:Interaction.Behaviors>
<flyctrllib:ResetBehavior Binding="{Binding CuttingFilm}"/>
</i:Interaction.Behaviors>
<Grid>
<iconPacks:PackIconMaterial Kind="ContentCut" />
</Grid>
</Button>
<TextBlock Text="切膜飞刀" Style="{StaticResource TextBlockStyle_FieldHeader}"/>
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}">
<Button Style="{StaticResource ButtonStyle_resizeIcon}">
<i:Interaction.Behaviors>
<flyctrllib:ResetBehavior Binding="{Binding PressureArmOffset}"/>
</i:Interaction.Behaviors>
<Grid>
<Ellipse Fill="White" Margin="4"/>
<iconPacks:PackIconMaterial Kind="SwapHorizontalCircle" />
</Grid>
</Button>
<TextBlock Text="压臂平移" Style="{StaticResource TextBlockStyle_FieldHeader}"/>
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}">
<Button Style="{StaticResource ButtonStyle_resizeIcon}">
<i:Interaction.Behaviors>
<flyctrllib:ResetBehavior Binding="{Binding PushRod}"/>
</i:Interaction.Behaviors>
<Grid>
<Border Background="White" Margin="2" CornerRadius="0 0 5 5"/>
<iconPacks:PackIconMaterial Kind="FormatVerticalAlignTop" />
</Grid>
</Button>
<TextBlock Text="内顶杆" Style="{StaticResource TextBlockStyle_FieldHeader}"/>
</StackPanel>
</WrapPanel>
<WrapPanel Orientation="Horizontal">
<StackPanel Margin="{StaticResource ControlMargin}">
<ToggleButton Style="{StaticResource ToggleButtonStyle_hand}" IsChecked="{Binding IsTongAuto}" />
<TextBlock Style="{StaticResource TextBlockStyle_hand}" Tag="{Binding IsTongAuto}"/>
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}">
<Button Style="{StaticResource ButtonStyle_resizeIcon}">
<i:Interaction.Behaviors>
<flyctrllib:ResetBehavior Binding="{Binding TongClamp}"/>
</i:Interaction.Behaviors>
<Grid>
<iconPacks:PackIconMaterial Kind="ArrowCollapseHorizontal" />
</Grid>
</Button>
<TextBlock Text="抓手夹紧" Style="{StaticResource TextBlockStyle_FieldHeader}"/>
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}">
<Button Style="{StaticResource ButtonStyle_resizeIcon}">
<i:Interaction.Behaviors>
<flyctrllib:ResetBehavior Binding="{Binding TongLoosen}"/>
</i:Interaction.Behaviors>
<Grid>
<iconPacks:PackIconMaterial Kind="ArrowExpandHorizontal"/>
</Grid>
</Button>
<TextBlock Text="抓手松开" Style="{StaticResource TextBlockStyle_FieldHeader}"/>
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}">
<Button Style="{StaticResource ButtonStyle_resizeIcon}">
<i:Interaction.Behaviors>
<flyctrllib:ResetBehavior Binding="{Binding TongUp}"/>
</i:Interaction.Behaviors>
<Grid>
<Border Background="White" Margin="5" />
<iconPacks:PackIconMaterial Kind="ArrowUpBoldBox"/>
</Grid>
</Button>
<TextBlock Text="抓手上升" Style="{StaticResource TextBlockStyle_FieldHeader}"/>
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}">
<Button Style="{StaticResource ButtonStyle_resizeIcon}">
<i:Interaction.Behaviors>
<flyctrllib:ResetBehavior Binding="{Binding TongDown}"/>
</i:Interaction.Behaviors>
<Grid>
<Border Background="White" Margin="5" />
<iconPacks:PackIconMaterial Kind="ArrowDownBoldBox"/>
</Grid>
</Button>
<TextBlock Text="抓手下降" Style="{StaticResource TextBlockStyle_FieldHeader}"/>
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}">
<Button Style="{StaticResource ButtonStyle_resizeIcon}">
<i:Interaction.Behaviors>
<flyctrllib:ResetBehavior Binding="{Binding TongIn}"/>
</i:Interaction.Behaviors>
<Grid>
<Border Background="White" Margin="5" />
<iconPacks:PackIconMaterial Kind="ArrowLeftBoldBox"/>
</Grid>
</Button>
<TextBlock Text="抓手进" Style="{StaticResource TextBlockStyle_FieldHeader}"/>
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}">
<Button Style="{StaticResource ButtonStyle_resizeIcon}">
<i:Interaction.Behaviors>
<flyctrllib:ResetBehavior Binding="{Binding TongOut}"/>
</i:Interaction.Behaviors>
<Grid>
<Border Background="White" Margin="5"/>
<iconPacks:PackIconMaterial Kind="ArrowRightBoldBox"/>
</Grid>
</Button>
<TextBlock Text="抓手出" Style="{StaticResource TextBlockStyle_FieldHeader}"/>
</StackPanel>
</WrapPanel>
</StackPanel>
</Border>
<Border Grid.Column="1" Margin="5" CornerRadius="5" Background="{StaticResource Color_background}" DataContext="{Binding Items[1]}">
<StackPanel >
<TextBlock Text="外收卷" FontSize="35" Margin="3" Padding="4,0" Background="#FF636363" Foreground="White"/>
<WrapPanel Orientation="Horizontal">
<StackPanel Margin="{StaticResource ControlMargin}">
<Button Style="{StaticResource ButtonStyle_resizeIcon}" Grid.Row="10">
<i:Interaction.Behaviors>
<flyctrllib:ResetBehavior Binding="{Binding TurnoverInching}"/>
</i:Interaction.Behaviors>
<Grid>
<Ellipse Fill="White" Margin="10"/>
<iconPacks:PackIconMaterial Kind="Sync" />
</Grid>
</Button>
<TextBlock Text="翻转点动" Style="{StaticResource TextBlockStyle_FieldHeader}"/>
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}">
<Button Style="{StaticResource ButtonStyle_resizeIcon}">
<i:Interaction.Behaviors>
<flyctrllib:ResetBehavior Binding="{Binding TurnoverOrg}"/>
</i:Interaction.Behaviors>
<Grid>
<Ellipse Fill="White" Margin="3"/>
<iconPacks:PackIconMaterial Kind="Bullseye" />
</Grid>
</Button>
<TextBlock Text="翻转原点" Style="{StaticResource TextBlockStyle_FieldHeader}"/>
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}">
<Button Style="{StaticResource ButtonStyle_resizeIcon}">
<i:Interaction.Behaviors>
<flyctrllib:ResetBehavior Binding="{Binding CuttingFilm}"/>
</i:Interaction.Behaviors>
<Grid>
<iconPacks:PackIconMaterial Kind="ContentCut" />
</Grid>
</Button>
<TextBlock Text="切膜飞刀" Style="{StaticResource TextBlockStyle_FieldHeader}"/>
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}">
<Button Style="{StaticResource ButtonStyle_resizeIcon}">
<i:Interaction.Behaviors>
<flyctrllib:ResetBehavior Binding="{Binding PressureArmOffset}"/>
</i:Interaction.Behaviors>
<Grid>
<Ellipse Fill="White" Margin="4"/>
<iconPacks:PackIconMaterial Kind="SwapHorizontalCircle" />
</Grid>
</Button>
<TextBlock Text="压臂平移" Style="{StaticResource TextBlockStyle_FieldHeader}"/>
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}">
<Button Style="{StaticResource ButtonStyle_resizeIcon}">
<i:Interaction.Behaviors>
<flyctrllib:ResetBehavior Binding="{Binding PushRod}"/>
</i:Interaction.Behaviors>
<Grid>
<Border Background="White" Margin="2" CornerRadius="0 0 5 5"/>
<iconPacks:PackIconMaterial Kind="FormatVerticalAlignTop" />
</Grid>
</Button>
<TextBlock Text="内顶杆" Style="{StaticResource TextBlockStyle_FieldHeader}"/>
</StackPanel>
</WrapPanel>
<WrapPanel Orientation="Horizontal">
<StackPanel Margin="{StaticResource ControlMargin}">
<ToggleButton Style="{StaticResource ToggleButtonStyle_hand}" IsChecked="{Binding IsTongAuto}" />
<TextBlock Style="{StaticResource TextBlockStyle_hand}" Tag="{Binding IsTongAuto}"/>
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}">
<Button Style="{StaticResource ButtonStyle_resizeIcon}">
<i:Interaction.Behaviors>
<flyctrllib:ResetBehavior Binding="{Binding TongClamp}"/>
</i:Interaction.Behaviors>
<Grid>
<iconPacks:PackIconMaterial Kind="ArrowCollapseHorizontal" />
</Grid>
</Button>
<TextBlock Text="抓手夹紧" Style="{StaticResource TextBlockStyle_FieldHeader}"/>
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}">
<Button Style="{StaticResource ButtonStyle_resizeIcon}">
<i:Interaction.Behaviors>
<flyctrllib:ResetBehavior Binding="{Binding TongLoosen}"/>
</i:Interaction.Behaviors>
<Grid>
<iconPacks:PackIconMaterial Kind="ArrowExpandHorizontal"/>
</Grid>
</Button>
<TextBlock Text="抓手松开" Style="{StaticResource TextBlockStyle_FieldHeader}"/>
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}">
<Button Style="{StaticResource ButtonStyle_resizeIcon}">
<i:Interaction.Behaviors>
<flyctrllib:ResetBehavior Binding="{Binding TongUp}"/>
</i:Interaction.Behaviors>
<Grid>
<Border Background="White" Margin="5" />
<iconPacks:PackIconMaterial Kind="ArrowUpBoldBox"/>
</Grid>
</Button>
<TextBlock Text="抓手上升" Style="{StaticResource TextBlockStyle_FieldHeader}"/>
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}">
<Button Style="{StaticResource ButtonStyle_resizeIcon}">
<i:Interaction.Behaviors>
<flyctrllib:ResetBehavior Binding="{Binding TongDown}"/>
</i:Interaction.Behaviors>
<Grid>
<Border Background="White" Margin="5" />
<iconPacks:PackIconMaterial Kind="ArrowDownBoldBox"/>
</Grid>
</Button>
<TextBlock Text="抓手下降" Style="{StaticResource TextBlockStyle_FieldHeader}"/>
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}">
<Button Style="{StaticResource ButtonStyle_resizeIcon}">
<i:Interaction.Behaviors>
<flyctrllib:ResetBehavior Binding="{Binding TongIn}"/>
</i:Interaction.Behaviors>
<Grid>
<Border Background="White" Margin="5" />
<iconPacks:PackIconMaterial Kind="ArrowLeftBoldBox"/>
</Grid>
</Button>
<TextBlock Text="抓手进" Style="{StaticResource TextBlockStyle_FieldHeader}"/>
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}">
<Button Style="{StaticResource ButtonStyle_resizeIcon}">
<i:Interaction.Behaviors>
<flyctrllib:ResetBehavior Binding="{Binding TongOut}"/>
</i:Interaction.Behaviors>
<Grid>
<Border Background="White" Margin="5"/>
<iconPacks:PackIconMaterial Kind="ArrowRightBoldBox"/>
</Grid>
</Button>
<TextBlock Text="抓手出" Style="{StaticResource TextBlockStyle_FieldHeader}"/>
</StackPanel>
</WrapPanel>
</StackPanel>
</Border>
</StackPanel>
</flyctrllib:WindowBigClose>
Project.FLY.Winder_20190413/FLY.Winder.UI.Client/UiModule/WdManual/WdManual2.xaml.cs 0 → 100644
View file @ 2345c155
using FLY.OBJComponents.Client;
using FLY.Winder.IService;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Shapes;
using Unity;
namespace FLY.Winder.UI.Client.UiModule
{
/// <summary>
/// Window_Frequency.xaml 的交互逻辑
/// </summary>
public partial class WdManual2 : FLY.ControlLibrary.WindowBigClose
{
IWinderSystemService winderSystem;
SetPLCUpdatePlan[] setPlan_winders = new SetPLCUpdatePlan[2];
public WdManual2()
{
InitializeComponent();
}
[InjectionMethod]
public void Init(
IWinderSystemService winderSystem)
{
this.winderSystem = winderSystem;
this.DataContext = winderSystem;
//IsTongAuto
//注册属性更新计划
for (int i = 0; i < 2; i++)
{
setPlan_winders[i] = new SetPLCUpdatePlan(
winderSystem.PLCos,
winderSystem.Items[i],
new string[] {
"IsTongAuto",
"TurnoverInching",
"CuttingFilm",
"TurnoverOrg",
"PressureArmOffset",
"PushRod",
"TongLoosen",
"TongUp",
"TongDown",
"TongIn",
"TongOut" });
}
}
private void WindowBigClose_Unloaded(object sender, RoutedEventArgs e)
{
for (int i = 0; i < 2; i++)
{
setPlan_winders[i].Dispose();
}
}
}
}
Project.FLY.Winder_20190413/FLY.Winder.UI.Client/UiModule/WdVelocity.xaml
View file @ 2345c155
...@@ -4,10 +4,11 @@ ...@@ -4,10 +4,11 @@
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:flyctrllib="clr-namespace:FLY.ControlLibrary;assembly=FLY.ControlLibrary" xmlns:flyctrllib="clr-namespace:FLY.ControlLibrary;assembly=FLY.ControlLibrary"
xmlns:local="clr-namespace:FLY.Winder.UI.Client" xmlns:iCommon="clr-namespace:FLY.Winder.Common;assembly=FLY.Winder"
xmlns:i="http://schemas.microsoft.com/xaml/behaviors" d:DataContext="{d:DesignInstance iCommon:WinderAccessory}"
xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
mc:Ignorable="d" mc:Ignorable="d"
Title="Window_Frequency" WindowStartupLocation="CenterScreen" d:DesignWidth="334.492" d:DesignHeight="318.246" > Title="Window_Frequency" WindowStartupLocation="CenterScreen" SizeToContent="WidthAndHeight" >
<Window.Resources> <Window.Resources>
<ResourceDictionary> <ResourceDictionary>
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>
...@@ -15,37 +16,43 @@ ...@@ -15,37 +16,43 @@
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
</ResourceDictionary> </ResourceDictionary>
</Window.Resources> </Window.Resources>
<StackPanel Orientation="Vertical" Margin="5,20"> <StackPanel Margin="5,20">
<StackPanel Orientation="Vertical" Margin="5"> <StackPanel Margin="5">
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeader}" Text="速度设置" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="44" /> <TextBlock Style="{StaticResource TextBlockStyle_FieldHeader}" Text="速度设置" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="44" />
</StackPanel> </StackPanel>
<Grid > <Grid >
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="auto"/> <ColumnDefinition Width="auto"/>
<ColumnDefinition Width="auto"/> <ColumnDefinition Width="auto"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<StackPanel Orientation="Horizontal" Grid.Column="1"> <StackPanel Margin="5">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="设定速度" />
<StackPanel Orientation="Vertical" Margin="5">
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="设定速度" />
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource ResourceKey=TextBoxStyle_FieldContent}" Text="{Binding VelocitySet,StringFormat={}{0:F1}}"/> <TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding VelocitySet,StringFormat={}{0:F1}}" MinWidth="60"/>
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent_mm}" Text="m/min" /> <TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="m/min" />
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
<Button Style="{StaticResource ButtonStyle_empty}" Background="Transparent" Click="button_minus_Click" Margin="5"> </Grid>
<Path Data="{StaticResource Geometry_minus-circle}" Fill="{StaticResource Color_theme_activity}" Stretch="Fill" Height="80" Width="80" /> <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
</Button> <Button Style="{StaticResource ButtonStyle_largeIcon}" Foreground="{StaticResource AccentColorBrush}"
<Button Style="{StaticResource ButtonStyle_empty}" Background="Transparent" Click="button_plus_Click" Margin="5"> VerticalAlignment="Top"
<Path Data="{StaticResource Geometry_plus-circle}" Fill="{StaticResource Color_theme_activity}" Stretch="Fill" Height="80" Width="80" /> Click="btnPlusClick" >
<Grid Style="{StaticResource GridStyle_ButtonShadow}">
<Ellipse Fill="{StaticResource WhiteBrush}" Stretch="Fill" Margin="1"/>
<iconPacks:PackIconMaterial Kind="PlusCircle" Width="60"/>
</Grid>
</Button> </Button>
</StackPanel> <Button Style="{StaticResource ButtonStyle_largeIcon}" Foreground="{StaticResource ValidationSummaryColor5}"
VerticalAlignment="Top"
Click="btnMinusClick" >
<Grid Style="{StaticResource GridStyle_ButtonShadow}">
<Ellipse Fill="{StaticResource WhiteBrush}" Stretch="Fill" Margin="1"/>
<iconPacks:PackIconMaterial Kind="MinusCircle" Width="60">
</iconPacks:PackIconMaterial>
</Grid> </Grid>
<Button x:Name="button_ok" Style="{StaticResource ButtonStyle2}" Content="确定" Width="auto" Margin="5" Click="button_ok_Click" >
<i:Interaction.Behaviors>
<flyctrllib:ResetBehavior Binding="{Binding Accessory.IsVelocityChanged}"/>
</i:Interaction.Behaviors>
</Button> </Button>
</StackPanel> </StackPanel>
</StackPanel>
</flyctrllib:WindowBigClose> </flyctrllib:WindowBigClose>
Project.FLY.Winder_20190413/FLY.Winder.UI.Client/UiModule/WdVelocity.xaml.cs
View file @ 2345c155
...@@ -33,29 +33,20 @@ namespace FLY.Winder.UI.Client.UiModule ...@@ -33,29 +33,20 @@ namespace FLY.Winder.UI.Client.UiModule
IWinderSystemService winderSystem) IWinderSystemService winderSystem)
{ {
this.winderSystem = winderSystem; this.winderSystem = winderSystem;
this.DataContext = winderSystem; this.DataContext = winderSystem.Accessory;
} }
private void button_minus_Click(object sender, RoutedEventArgs e)
{
if (winderSystem.Accessory.VelocitySet >= 0.1)
{
winderSystem.Accessory.VelocitySet -= 0.1f;
}
}
private void button_plus_Click(object sender, RoutedEventArgs e) private void btnPlusClick(object sender, RoutedEventArgs e)
{ {
if (winderSystem.Accessory.VelocitySet < 200) if (winderSystem.Accessory.VelocitySet < 200)
winderSystem.Accessory.VelocitySet += 0.1f; winderSystem.Accessory.VelocitySet += 0.1f;
} }
private void button_ok_Click(object sender, RoutedEventArgs e) private void btnMinusClick(object sender, RoutedEventArgs e)
{ {
this.DialogResult = true; if (winderSystem.Accessory.VelocitySet >= 0.1)
this.Close(); winderSystem.Accessory.VelocitySet -= 0.1f;
} }
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment