Skip to content

H
hemei
Commit 9fdd01a9 authored by 潘栩锋's avatar 潘栩锋 🚴
Browse files
Options

中心收卷，手动按钮修正

parent 3cf75cac
Expand all Show whitespace changes
Inline Side-by-side
Showing with 446 additions and 107 deletions
Project.FLY.Winder_20190413/FLY.Winder.UI.Client/FLY.Winder.UI.Client.csproj
View file @ 9fdd01a9
...@@ -97,6 +97,9 @@ ...@@ -97,6 +97,9 @@
</Compile> </Compile>
<Compile Include="UIModule\ResetAction.cs" /> <Compile Include="UIModule\ResetAction.cs" />
<Compile Include="UIModule\UcCenterWinder\UIModule_UcCenterWinder.cs" /> <Compile Include="UIModule\UcCenterWinder\UIModule_UcCenterWinder.cs" />
<Compile Include="UIModule\UcVelocityCtrl\UcVelocityCtrl.xaml.cs">
<DependentUpon>UcVelocityCtrl.xaml</DependentUpon>
</Compile>
<Compile Include="UIModule\Window_Measure.xaml.cs"> <Compile Include="UIModule\Window_Measure.xaml.cs">
<DependentUpon>Window_Measure.xaml</DependentUpon> <DependentUpon>Window_Measure.xaml</DependentUpon>
</Compile> </Compile>
...@@ -170,6 +173,14 @@ ...@@ -170,6 +173,14 @@
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</Page> </Page>
<Page Include="UIModule\UcVelocityCtrl\UcVelocityCtrl.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="UIModule\UcVelocityCtrl\UcVelocityCtrlStyle.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</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>
...@@ -265,6 +276,7 @@ ...@@ -265,6 +276,7 @@
<Version>2.6.1</Version> <Version>2.6.1</Version>
</PackageReference> </PackageReference>
</ItemGroup> </ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\..\Project.FLY.IBC\packages\Fody.3.2.13\build\Fody.targets" Condition="Exists('..\..\Project.FLY.IBC\packages\Fody.3.2.13\build\Fody.targets')" /> <Import Project="..\..\Project.FLY.IBC\packages\Fody.3.2.13\build\Fody.targets" Condition="Exists('..\..\Project.FLY.IBC\packages\Fody.3.2.13\build\Fody.targets')" />
</Project> </Project>
\ No newline at end of file
Project.FLY.Winder_20190413/FLY.Winder.UI.Client/UIModule/UcCenterWinder/UcCenterWinder.xaml
View file @ 9fdd01a9
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
</ResourceDictionary> </ResourceDictionary>
</UserControl.Resources> </UserControl.Resources>
<Border Grid.Row="2" Margin="5" CornerRadius="5" Background="{StaticResource Color_theme_background}"> <Border Margin="5" CornerRadius="5" Background="{StaticResource Color_theme_background}">
<Grid> <Grid>
<Viewbox VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10"> <Viewbox VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10">
<StackPanel> <StackPanel>
......
Project.FLY.Winder_20190413/FLY.Winder.UI.Client/UIModule/UcCenterWinder/UcCenterWinderStyle.xaml
View file @ 9fdd01a9
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
<Setter Property="Orientation" Value="Horizontal"/> <Setter Property="Orientation" Value="Horizontal"/>
<Setter Property="Margin" Value="5"/> <Setter Property="Margin" Value="5"/>
</Style> </Style>
<Style TargetType="{x:Type Button}" x:Key="ButtonStyle_Separate" > <Style TargetType="Button" x:Key="ButtonStyle_Separate" >
<Setter Property="Margin" Value="5"/> <Setter Property="Margin" Value="5"/>
<Setter Property="HorizontalContentAlignment" Value="Center"/> <Setter Property="HorizontalContentAlignment" Value="Center"/>
<Setter Property="VerticalContentAlignment" Value="Center"/> <Setter Property="VerticalContentAlignment" Value="Center"/>
...@@ -66,9 +66,6 @@ ...@@ -66,9 +66,6 @@
</Setter.Value> </Setter.Value>
</Setter> </Setter>
</Style> </Style>
<Style TargetType="Button" x:Key="ButtonStyle_Surface" > <Style TargetType="Button" x:Key="ButtonStyle_Surface" >
<Setter Property="Margin" Value="5"/> <Setter Property="Margin" Value="5"/>
<Setter Property="HorizontalContentAlignment" Value="Center"/> <Setter Property="HorizontalContentAlignment" Value="Center"/>
......
Project.FLY.Winder_20190413/FLY.Winder.UI.Client/UIModule/UcVelocityCtrl/UcVelocityCtrl.xaml.cs 0 → 100644
View file @ 9fdd01a9
using System;
using System.Collections.Generic;
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.Navigation;
using System.Windows.Shapes;
namespace FLY.Winder.UI.Client.UIModule
{
/// <summary>
/// UcVelocityCtrl.xaml 的交互逻辑
/// </summary>
public partial class UcVelocityCtrl : UserControl
{
public UcVelocityCtrl()
{
InitializeComponent();
}
private void UserControl_Unloaded(object sender, RoutedEventArgs e)
{
}
}
}
Project.FLY.Winder_20190413/FLY.Winder.UI.Client/UIModule/UcVelocityCtrl/UcVelocityCtrlStyle.xaml 0 → 100644
View file @ 9fdd01a9
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:FLY.Winder.UI.Client.UIModule">
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/Dictionary_MyStyle.xaml"/>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Converter/Dictionary_MyConv.xaml"/>
<ResourceDictionary Source="pack://application:,,,/FLY.Winder.UI.Client;component/Themes/Dictionary_MyStyle.xaml"/>
</ResourceDictionary.MergedDictionaries>
<Style TargetType="TextBlock" x:Key="TextBlockStyle_Header" BasedOn="{StaticResource TextBlockStyle_FieldHeaderEditable}">
<Setter Property="Margin" Value="30,3"/>
<Setter Property="Foreground" Value="White"/>
</Style>
<Style TargetType="TextBlock" x:Key="TextBlockStyle_RowHeader" BasedOn="{StaticResource TextBlockStyle_FieldHeader}">
<Setter Property="Margin" Value="30,3"/>
<Setter Property="Foreground" Value="White"/>
<Setter Property="VerticalAlignment" Value="Center"/>
</Style>
<Style TargetType="TextBox" x:Key="TextBoxStyle_Content" BasedOn="{StaticResource TextBoxStyle_FieldContent}">
<Setter Property="Background" Value="Transparent"/>
</Style>
<Style TargetType="TextBlock" x:Key="TextBlockStyle_Content" BasedOn="{StaticResource TextBlockStyle_FieldContent}">
</Style>
<SolidColorBrush x:Key="Color_row0" Color="LightGray"/>
<Style TargetType="Rectangle" x:Key="RectStyle_RowHeaderEditBackground">
<Setter Property="Fill" Value="{StaticResource Color_theme_activity}"/>
<Setter Property="Stroke" Value="{StaticResource Color_theme_static}"/>
</Style>
<Style TargetType="Rectangle" x:Key="RectStyle_RowHeaderBackground">
<Setter Property="Fill" Value="{StaticResource Color_theme_static}"/>
<Setter Property="Stroke" Value="{StaticResource Color_theme_activity}"/>
</Style>
<Style TargetType="StackPanel" x:Key="SpStyle_Editable">
<Setter Property="Orientation" Value="Horizontal"/>
<Setter Property="Background" Value="#FF80C3EE"/>
<Setter Property="Margin" Value="5"/>
</Style>
<Style TargetType="StackPanel" x:Key="SpStyle_ReadOnly">
<Setter Property="Orientation" Value="Horizontal"/>
<Setter Property="Margin" Value="5"/>
</Style>
<Style TargetType="{x:Type ToggleButton}" x:Key="ToggleButtonStyle_auto" >
<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="{StaticResource Color_theme_activity}">
<Rectangle x:Name="Path_block" Height="45" Width="24" Margin="5" Fill="White" Canvas.Right="0" />
<StackPanel x:Name="SP_Text" Orientation="Horizontal" Margin="20,15" >
<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.Left" Value="0"/>
<Setter TargetName="SP_Text" Property="Canvas.Right" Value="0"/>
<Setter TargetName="canvas" Property="Background" Value="{StaticResource Color_theme_static}"/>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
<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="Red">
<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>
</ResourceDictionary>
\ No newline at end of file
Project.FLY.Winder_20190413/FLY.Winder.UI.Client/UIModule/WdManual/WdManual.xaml
View file @ 9fdd01a9
...@@ -51,41 +51,8 @@ ...@@ -51,41 +51,8 @@
</WrapPanel> </WrapPanel>
<WrapPanel Orientation="Horizontal"> <WrapPanel Orientation="Horizontal">
<StackPanel Margin="10"> <StackPanel Margin="10">
<Button Style="{StaticResource ButtonStyle_empty}"> <ToggleButton Style="{StaticResource ToggleButtonStyle_hand}" IsChecked="{Binding IsTongAuto}" />
<StackPanel> <TextBlock Style="{StaticResource TextBlockStyle_hand}" Tag="{Binding IsTongAuto}"/>
<Grid HorizontalAlignment="Center">
<iconPacks:PackIconMaterial Kind="HandRight"
HorizontalAlignment="Center" VerticalAlignment="Center"
Width="50" Height="{Binding RelativeSource={RelativeSource Mode=Self},Path=Width}"
Foreground="{StaticResource Color_theme_static}" />
<TextBlock Text="A" Foreground="Red" HorizontalAlignment="Right" VerticalAlignment="Bottom" FontSize="30" Margin="0,0,0,-10">
<TextBlock.Style>
<Style TargetType="TextBlock" >
<Style.Triggers>
<DataTrigger Binding="{Binding IsTongAuto}" Value="False">
<Setter Property="Visibility" Value="Hidden"/>
</DataTrigger>
</Style.Triggers>
</Style>
</TextBlock.Style>
</TextBlock>
</Grid>
<TextBlock >
<TextBlock.Style>
<Style TargetType="TextBlock" BasedOn="{StaticResource TextBlockStyle_FieldHeader}">
<Setter Property="Text" Value="抓手手动"/>
<Style.Triggers>
<DataTrigger Binding="{Binding IsTongAuto}" Value="True">
<Setter Property="Text" Value="抓手自动"/>
</DataTrigger>
</Style.Triggers>
</Style>
</TextBlock.Style>
</TextBlock>
</StackPanel>
</Button>
</StackPanel> </StackPanel>
<StackPanel Margin="10"> <StackPanel Margin="10">
<Button x:Name="button_tongClamp0" Style="{StaticResource ButtonStyle_tongClamp}" /> <Button x:Name="button_tongClamp0" Style="{StaticResource ButtonStyle_tongClamp}" />
...@@ -146,41 +113,8 @@ ...@@ -146,41 +113,8 @@
</WrapPanel> </WrapPanel>
<WrapPanel Orientation="Horizontal"> <WrapPanel Orientation="Horizontal">
<StackPanel Margin="10"> <StackPanel Margin="10">
<Button Style="{StaticResource ButtonStyle_empty}"> <ToggleButton Style="{StaticResource ToggleButtonStyle_hand}" IsChecked="{Binding IsTongAuto}" />
<StackPanel> <TextBlock Style="{StaticResource TextBlockStyle_hand}" Tag="{Binding IsTongAuto}"/>
<Grid HorizontalAlignment="Center">
<iconPacks:PackIconMaterial Kind="HandRight"
HorizontalAlignment="Center" VerticalAlignment="Center"
Width="50" Height="{Binding RelativeSource={RelativeSource Mode=Self},Path=Width}"
Foreground="{StaticResource Color_theme_static}" />
<TextBlock Text="A" Foreground="Red" HorizontalAlignment="Right" VerticalAlignment="Bottom" FontSize="30" Margin="0,0,0,-10">
<TextBlock.Style>
<Style TargetType="TextBlock" >
<Style.Triggers>
<DataTrigger Binding="{Binding IsTongAuto}" Value="False">
<Setter Property="Visibility" Value="Hidden"/>
</DataTrigger>
</Style.Triggers>
</Style>
</TextBlock.Style>
</TextBlock>
</Grid>
<TextBlock >
<TextBlock.Style>
<Style TargetType="TextBlock" BasedOn="{StaticResource TextBlockStyle_FieldHeader}">
<Setter Property="Text" Value="抓手手动"/>
<Style.Triggers>
<DataTrigger Binding="{Binding IsTongAuto}" Value="True">
<Setter Property="Text" Value="抓手自动"/>
</DataTrigger>
</Style.Triggers>
</Style>
</TextBlock.Style>
</TextBlock>
</StackPanel>
</Button>
</StackPanel> </StackPanel>
<StackPanel Margin="10"> <StackPanel Margin="10">
<Button x:Name="button_tongClamp1" Style="{StaticResource ButtonStyle_tongClamp}" /> <Button x:Name="button_tongClamp1" Style="{StaticResource ButtonStyle_tongClamp}" />
......
Project.FLY.Winder_20190413/FLY.Winder.UI.Client/UIModule/WdManual/WdManualStyle.xaml
View file @ 9fdd01a9
...@@ -140,11 +140,13 @@ ...@@ -140,11 +140,13 @@
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="{x:Type Button}"> <ControlTemplate TargetType="{x:Type Button}">
<Border Background="Transparent">
<Grid x:Name="grid" Style="{StaticResource GridStyle_ButtonShadow}"> <Grid x:Name="grid" Style="{StaticResource GridStyle_ButtonShadow}">
<iconPacks:PackIconMaterial x:Name="path" Kind="ArrowCollapseHorizontal" Width="50" Height="{Binding RelativeSource={RelativeSource Mode=Self},Path=Width}" <iconPacks:PackIconMaterial x:Name="path" Kind="ArrowCollapseHorizontal" Width="50" Height="{Binding RelativeSource={RelativeSource Mode=Self},Path=Width}"
HorizontalAlignment="Center" VerticalAlignment="Center" HorizontalAlignment="Center" VerticalAlignment="Center"
Foreground="{StaticResource Color_theme_static}" /> Foreground="{StaticResource Color_theme_static}" />
</Grid> </Grid>
</Border>
<ControlTemplate.Triggers> <ControlTemplate.Triggers>
<Trigger Property="IsMouseOver" Value="True"> <Trigger Property="IsMouseOver" Value="True">
<Setter TargetName="path" Property="Foreground" Value="{StaticResource Color_theme_activity}"/> <Setter TargetName="path" Property="Foreground" Value="{StaticResource Color_theme_activity}"/>
...@@ -162,11 +164,13 @@ ...@@ -162,11 +164,13 @@
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="{x:Type Button}"> <ControlTemplate TargetType="{x:Type Button}">
<Border Background="Transparent">
<Grid x:Name="grid" Style="{StaticResource GridStyle_ButtonShadow}"> <Grid x:Name="grid" Style="{StaticResource GridStyle_ButtonShadow}">
<iconPacks:PackIconMaterial x:Name="path" Kind="ArrowExpandHorizontal" Width="50" Height="{Binding RelativeSource={RelativeSource Mode=Self},Path=Width}" <iconPacks:PackIconMaterial x:Name="path" Kind="ArrowExpandHorizontal" Width="50" Height="{Binding RelativeSource={RelativeSource Mode=Self},Path=Width}"
HorizontalAlignment="Center" VerticalAlignment="Center" HorizontalAlignment="Center" VerticalAlignment="Center"
Foreground="{StaticResource Color_theme_static}" /> Foreground="{StaticResource Color_theme_static}" />
</Grid> </Grid>
</Border>
<ControlTemplate.Triggers> <ControlTemplate.Triggers>
<Trigger Property="IsMouseOver" Value="True"> <Trigger Property="IsMouseOver" Value="True">
<Setter TargetName="path" Property="Foreground" Value="{StaticResource Color_theme_activity}"/> <Setter TargetName="path" Property="Foreground" Value="{StaticResource Color_theme_activity}"/>
...@@ -184,11 +188,13 @@ ...@@ -184,11 +188,13 @@
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="{x:Type Button}"> <ControlTemplate TargetType="{x:Type Button}">
<Border Background="Transparent">
<Grid x:Name="grid" Style="{StaticResource GridStyle_ButtonShadow}"> <Grid x:Name="grid" Style="{StaticResource GridStyle_ButtonShadow}">
<iconPacks:PackIconMaterial x:Name="path" Kind="ArrowUpBoldBox" Width="50" Height="{Binding RelativeSource={RelativeSource Mode=Self},Path=Width}" <iconPacks:PackIconMaterial x:Name="path" Kind="ArrowUpBoldBox" Width="50" Height="{Binding RelativeSource={RelativeSource Mode=Self},Path=Width}"
HorizontalAlignment="Center" VerticalAlignment="Center" HorizontalAlignment="Center" VerticalAlignment="Center"
Foreground="{StaticResource Color_theme_static}" /> Foreground="{StaticResource Color_theme_static}" />
</Grid> </Grid>
</Border>
<ControlTemplate.Triggers> <ControlTemplate.Triggers>
<Trigger Property="IsMouseOver" Value="True"> <Trigger Property="IsMouseOver" Value="True">
<Setter TargetName="path" Property="Foreground" Value="{StaticResource Color_theme_activity}"/> <Setter TargetName="path" Property="Foreground" Value="{StaticResource Color_theme_activity}"/>
...@@ -206,11 +212,13 @@ ...@@ -206,11 +212,13 @@
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="{x:Type Button}"> <ControlTemplate TargetType="{x:Type Button}">
<Border Background="Transparent">
<Grid x:Name="grid" Style="{StaticResource GridStyle_ButtonShadow}"> <Grid x:Name="grid" Style="{StaticResource GridStyle_ButtonShadow}">
<iconPacks:PackIconMaterial x:Name="path" Kind="ArrowDownBoldBox" Width="50" Height="{Binding RelativeSource={RelativeSource Mode=Self},Path=Width}" <iconPacks:PackIconMaterial x:Name="path" Kind="ArrowDownBoldBox" Width="50" Height="{Binding RelativeSource={RelativeSource Mode=Self},Path=Width}"
HorizontalAlignment="Center" VerticalAlignment="Center" HorizontalAlignment="Center" VerticalAlignment="Center"
Foreground="{StaticResource Color_theme_static}" /> Foreground="{StaticResource Color_theme_static}" />
</Grid> </Grid>
</Border>
<ControlTemplate.Triggers> <ControlTemplate.Triggers>
<Trigger Property="IsMouseOver" Value="True"> <Trigger Property="IsMouseOver" Value="True">
<Setter TargetName="path" Property="Foreground" Value="{StaticResource Color_theme_activity}"/> <Setter TargetName="path" Property="Foreground" Value="{StaticResource Color_theme_activity}"/>
...@@ -228,11 +236,13 @@ ...@@ -228,11 +236,13 @@
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="{x:Type Button}"> <ControlTemplate TargetType="{x:Type Button}">
<Border Background="Transparent">
<Grid x:Name="grid" Style="{StaticResource GridStyle_ButtonShadow}"> <Grid x:Name="grid" Style="{StaticResource GridStyle_ButtonShadow}">
<iconPacks:PackIconMaterial x:Name="path" Kind="ArrowLeftBoldBox" Width="50" Height="{Binding RelativeSource={RelativeSource Mode=Self},Path=Width}" <iconPacks:PackIconMaterial x:Name="path" Kind="ArrowLeftBoldBox" Width="50" Height="{Binding RelativeSource={RelativeSource Mode=Self},Path=Width}"
HorizontalAlignment="Center" VerticalAlignment="Center" HorizontalAlignment="Center" VerticalAlignment="Center"
Foreground="{StaticResource Color_theme_static}" /> Foreground="{StaticResource Color_theme_static}" />
</Grid> </Grid>
</Border>
<ControlTemplate.Triggers> <ControlTemplate.Triggers>
<Trigger Property="IsMouseOver" Value="True"> <Trigger Property="IsMouseOver" Value="True">
<Setter TargetName="path" Property="Foreground" Value="{StaticResource Color_theme_activity}"/> <Setter TargetName="path" Property="Foreground" Value="{StaticResource Color_theme_activity}"/>
...@@ -250,11 +260,13 @@ ...@@ -250,11 +260,13 @@
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="{x:Type Button}"> <ControlTemplate TargetType="{x:Type Button}">
<Border Background="Transparent">
<Grid x:Name="grid" Style="{StaticResource GridStyle_ButtonShadow}"> <Grid x:Name="grid" Style="{StaticResource GridStyle_ButtonShadow}">
<iconPacks:PackIconMaterial x:Name="path" Kind="ArrowRightBoldBox" Width="50" Height="{Binding RelativeSource={RelativeSource Mode=Self},Path=Width}" <iconPacks:PackIconMaterial x:Name="path" Kind="ArrowRightBoldBox" Width="50" Height="{Binding RelativeSource={RelativeSource Mode=Self},Path=Width}"
HorizontalAlignment="Center" VerticalAlignment="Center" HorizontalAlignment="Center" VerticalAlignment="Center"
Foreground="{StaticResource Color_theme_static}" /> Foreground="{StaticResource Color_theme_static}" />
</Grid> </Grid>
</Border>
<ControlTemplate.Triggers> <ControlTemplate.Triggers>
<Trigger Property="IsMouseOver" Value="True"> <Trigger Property="IsMouseOver" Value="True">
<Setter TargetName="path" Property="Foreground" Value="{StaticResource Color_theme_activity}"/> <Setter TargetName="path" Property="Foreground" Value="{StaticResource Color_theme_activity}"/>
...@@ -268,4 +280,42 @@ ...@@ -268,4 +280,42 @@
</Setter.Value> </Setter.Value>
</Setter> </Setter>
</Style> </Style>
<Style TargetType="{x:Type ToggleButton}" x:Key="ToggleButtonStyle_hand" >
<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}">
<Grid HorizontalAlignment="Center">
<iconPacks:PackIconMaterial x:Name="path" Kind="HandRight"
HorizontalAlignment="Center" VerticalAlignment="Center"
Width="50" Height="{Binding RelativeSource={RelativeSource Mode=Self},Path=Width}"
Foreground="{StaticResource Color_theme_static}" />
<TextBlock x:Name="blocka" Text="A" Foreground="Red" HorizontalAlignment="Right" VerticalAlignment="Bottom" FontSize="30" Margin="0,0,0,-10" Visibility="Hidden"/>
</Grid>
<ControlTemplate.Triggers>
<Trigger Property="IsChecked" Value="True">
<Setter TargetName="blocka" Property="Visibility" Value="Visible"/>
<Setter TargetName="path" Property="Foreground" Value="{StaticResource Color_theme_activity}"/>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
<Style TargetType="TextBlock" x:Key="TextBlockStyle_hand" BasedOn="{StaticResource TextBlockStyle_FieldHeader}">
<Setter Property="Text" Value="抓手手动"/>
<Style.Triggers>
<DataTrigger Binding="{Binding Tag,RelativeSource={RelativeSource Mode=Self}}" Value="True">
<Setter Property="Text" Value="抓手自动"/>
</DataTrigger>
</Style.Triggers>
</Style>
</ResourceDictionary> </ResourceDictionary>
\ No newline at end of file
WpfApplication1/Page_Main.xaml.cs
View file @ 9fdd01a9
...@@ -46,6 +46,7 @@ namespace WpfApplication1 ...@@ -46,6 +46,7 @@ namespace WpfApplication1
//FLY.FeedbackRenZiJia.UI.Client.UIModule.Page_Graph p = new FLY.FeedbackRenZiJia.UI.Client.UIModule.Page_Graph(); //FLY.FeedbackRenZiJia.UI.Client.UIModule.Page_Graph p = new FLY.FeedbackRenZiJia.UI.Client.UIModule.Page_Graph();
//var p = new FLY.IBC.UI.Client.UIModule.Page_Main(); //var p = new FLY.IBC.UI.Client.UIModule.Page_Main();
//FLY.Winder.UI.Client.UIModule.UcCenterWinder p = new FLY.Winder.UI.Client.UIModule.UcCenterWinder();
FLY.Winder.UI.Client.UIModule.Page_Main p = new FLY.Winder.UI.Client.UIModule.Page_Main(); FLY.Winder.UI.Client.UIModule.Page_Main p = new FLY.Winder.UI.Client.UIModule.Page_Main();
//FLY.Weight.UI.Client.UIModule.Page_Main p = new FLY.Weight.UI.Client.UIModule.Page_Main(); //FLY.Weight.UI.Client.UIModule.Page_Main p = new FLY.Weight.UI.Client.UIModule.Page_Main();
......
脚本/install/脚本/graphcustom/graphcustom_all_weight3.xml
View file @ 9fdd01a9
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<FLYLayout DynAreaWidth="250" IsDynAreaVisible="True" Left="0" Top="2" Width="1366" Height="768" WindowState="Maximized"> <FLYLayout DynAreaWidth="250" IsDynAreaVisible="True" IsGraphReverse="False" Left="0" Top="2" Width="1366" Height="768" WindowState="Maximized" IsLogoHidden="False" IsYAxisTitleHidden="False">
<Items> <Items>
<GraphTabItem Header="收 卷" ColumnCount="1" RowCount="1"> <GraphTabItem Header="收 卷" ColumnCount="1" RowCount="1">
<ColumnDefinitions> <ColumnDefinitions>
...@@ -111,6 +111,10 @@ ...@@ -111,6 +111,10 @@
<ControllerStateTabItem ControllerState="SCAN" No="1" /> <ControllerStateTabItem ControllerState="SCAN" No="1" />
</ControllerStates> </ControllerStates>
<DynAreaItems> <DynAreaItems>
<DynAreaComponent ID="16937562" Module="dyareathick" />
<DynAreaComponent ID="18220335" Module="dyareaprofile" />
<DynAreaComponent ID="29765295" Module="dyareablowing" />
<DynAreaComponent ID="66561065" Module="dyareaio" />
<DynAreaComponent ID="43395070" Module="FLY.FeedbackRenZiJia.UI.Client.UIModule.UIModule_DynAreaFB" /> <DynAreaComponent ID="43395070" Module="FLY.FeedbackRenZiJia.UI.Client.UIModule.UIModule_DynAreaFB" />
<DynAreaComponent ID="55011311" Module="FLY.IBC.UI.Client.UIModule.UIModule_DynArea" /> <DynAreaComponent ID="55011311" Module="FLY.IBC.UI.Client.UIModule.UIModule_DynArea" />
<DynAreaComponent ID="25339754" Module="FLY.Weight.UI.Client.UIModule.UIModule_DynArea" /> <DynAreaComponent ID="25339754" Module="FLY.Weight.UI.Client.UIModule.UIModule_DynArea" />
......
脚本/install/脚本/graphcustom/graphcustom_AirRingWeight5.xml → 脚本/install/脚本/graphcustom/graphcustom_all_weight5.xml
View file @ 9fdd01a9
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<FLYLayout DynAreaWidth="250" IsDynAreaVisible="True" Left="0" Top="2" Width="1366" Height="768" WindowState="Maximized"> <FLYLayout DynAreaWidth="250" IsDynAreaVisible="True" IsGraphReverse="False" Left="0" Top="2" Width="1366" Height="768" WindowState="Maximized" IsLogoHidden="False" IsYAxisTitleHidden="False">
<Items> <Items>
<GraphTabItem Header="收 卷" ColumnCount="1" RowCount="1">
<ColumnDefinitions>
<Boolean value="False" />
</ColumnDefinitions>
<RowDefinitions>
<Boolean value="False" />
</RowDefinitions>
<Graphs>
<GraphComponent ID="49956960" Module="FLY.Winder.UI.Client.UIModule.UIModule_Main" Row="0" Column="0" RowSpan="1" ColumnSpan="1" />
</Graphs>
</GraphTabItem>
<GraphTabItem Header="称 重" ColumnCount="1" RowCount="2"> <GraphTabItem Header="称 重" ColumnCount="1" RowCount="2">
<ColumnDefinitions> <ColumnDefinitions>
<Boolean value="False" /> <Boolean value="False" />
...@@ -11,7 +22,19 @@ ...@@ -11,7 +22,19 @@
</RowDefinitions> </RowDefinitions>
<Graphs> <Graphs>
<GraphComponent ID="60426628" Module="FLY.Weight.UI.Client.UIModule.UIModule_Main" Row="0" Column="0" RowSpan="1" ColumnSpan="1" /> <GraphComponent ID="60426628" Module="FLY.Weight.UI.Client.UIModule.UIModule_Main" Row="0" Column="0" RowSpan="1" ColumnSpan="1" />
<GraphComponent ID="25136147" Module="FLY.Weight.UI.Client.UIModule.UIModule_FlowGraph" Row="1" Column="0" RowSpan="1" ColumnSpan="1" /> <GraphComponent ID="51839388" Module="FLY.Weight.UI.Client.UIModule.UIModule_FlowGraph" Row="1" Column="0" RowSpan="1" ColumnSpan="1" />
</Graphs>
</GraphTabItem>
<GraphTabItem Header="I B C" ColumnCount="1" RowCount="1">
<ColumnDefinitions>
<Boolean value="False" />
</ColumnDefinitions>
<RowDefinitions>
<Boolean value="False" />
<Boolean value="False" />
</RowDefinitions>
<Graphs>
<GraphComponent ID="65203096" Module="FLY.IBC.UI.Client.UIModule.UIModule_Main" Row="0" Column="0" RowSpan="1" ColumnSpan="1" />
</Graphs> </Graphs>
</GraphTabItem> </GraphTabItem>
<GraphTabItem Header="风 环" ColumnCount="1" RowCount="4"> <GraphTabItem Header="风 环" ColumnCount="1" RowCount="4">
...@@ -67,8 +90,7 @@ ...@@ -67,8 +90,7 @@
<Boolean value="False" /> <Boolean value="False" />
</RowDefinitions> </RowDefinitions>
<Graphs> <Graphs>
<GraphComponent ID="56082556" Module="trendgraph" Row="1" Column="0" RowSpan="1" ColumnSpan="1" /> <GraphComponent ID="56082556" Module="trendgraph" Row="0" Column="0" RowSpan="1" ColumnSpan="1" />
<GraphComponent ID="24898733" Module="scangraph" Row="0" Column="0" RowSpan="1" ColumnSpan="1" />
</Graphs> </Graphs>
</GraphTabItem> </GraphTabItem>
<GraphTabItem Header="定 点" ColumnCount="1" RowCount="2"> <GraphTabItem Header="定 点" ColumnCount="1" RowCount="2">
...@@ -90,7 +112,13 @@ ...@@ -90,7 +112,13 @@
<ControllerStateTabItem ControllerState="SCAN" No="1" /> <ControllerStateTabItem ControllerState="SCAN" No="1" />
</ControllerStates> </ControllerStates>
<DynAreaItems> <DynAreaItems>
<DynAreaComponent ID="16937562" Module="dyareathick" />
<DynAreaComponent ID="18220335" Module="dyareaprofile" />
<DynAreaComponent ID="29765295" Module="dyareablowing" />
<DynAreaComponent ID="66561065" Module="dyareaio" />
<DynAreaComponent ID="43395070" Module="FLY.FeedbackRenZiJia.UI.Client.UIModule.UIModule_DynAreaFB" /> <DynAreaComponent ID="43395070" Module="FLY.FeedbackRenZiJia.UI.Client.UIModule.UIModule_DynAreaFB" />
<DynAreaComponent ID="55011311" Module="FLY.IBC.UI.Client.UIModule.UIModule_DynArea" />
<DynAreaComponent ID="25339754" Module="FLY.Weight.UI.Client.UIModule.UIModule_DynArea" /> <DynAreaComponent ID="25339754" Module="FLY.Weight.UI.Client.UIModule.UIModule_DynArea" />
<DynAreaComponent ID="26731201" Module="FLY.Winder.UI.Client.UIModule.UIModule_DynArea" />
</DynAreaItems> </DynAreaItems>
</FLYLayout> </FLYLayout>
\ No newline at end of file
脚本/install/脚本/graphcustom/graphcustom_AirRingWeight3.xml → 脚本/install/脚本/graphcustom/graphcustom_all_weight5_center.xml
View file @ 9fdd01a9
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<FLYLayout DynAreaWidth="250" IsDynAreaVisible="True" Left="0" Top="2" Width="1366" Height="768" WindowState="Maximized"> <FLYLayout DynAreaWidth="250" IsDynAreaVisible="True" IsGraphReverse="False" Left="0" Top="2" Width="1366" Height="768" WindowState="Maximized" IsLogoHidden="False" IsYAxisTitleHidden="False">
<Items> <Items>
<GraphTabItem Header="称 重" ColumnCount="1" RowCount="1"> <GraphTabItem Header="收 卷" ColumnCount="1" RowCount="1">
<ColumnDefinitions> <ColumnDefinitions>
<Boolean value="False" /> <Boolean value="False" />
</ColumnDefinitions> </ColumnDefinitions>
<RowDefinitions> <RowDefinitions>
<Boolean value="False" /> <Boolean value="False" />
</RowDefinitions> </RowDefinitions>
<Graphs>
<GraphComponent ID="49956960" Module="FLY.Winder.UI.Client.UIModule.UIModule_Main" Row="0" Column="0" RowSpan="1" ColumnSpan="1" />
</Graphs>
</GraphTabItem>
<GraphTabItem Header="中心收卷" ColumnCount="1" RowCount="3">
<ColumnDefinitions>
<Boolean value="False" />
</ColumnDefinitions>
<RowDefinitions>
<Boolean value="False" />
<Boolean value="False" />
<Boolean value="False" />
</RowDefinitions>
<Graphs>
<GraphComponent ID="18840050" Module="FLY.Winder.UI.Client.UIModule.UIModule_UcCenterWinder" Row="0" Column="0" RowSpan="2" ColumnSpan="1" />
</Graphs>
</GraphTabItem>
<GraphTabItem Header="称 重" ColumnCount="1" RowCount="2">
<ColumnDefinitions>
<Boolean value="False" />
</ColumnDefinitions>
<RowDefinitions>
<Boolean value="False" />
<Boolean value="False" />
</RowDefinitions>
<Graphs> <Graphs>
<GraphComponent ID="60426628" Module="FLY.Weight.UI.Client.UIModule.UIModule_Main" Row="0" Column="0" RowSpan="1" ColumnSpan="1" /> <GraphComponent ID="60426628" Module="FLY.Weight.UI.Client.UIModule.UIModule_Main" Row="0" Column="0" RowSpan="1" ColumnSpan="1" />
<GraphComponent ID="51839388" Module="FLY.Weight.UI.Client.UIModule.UIModule_FlowGraph" Row="1" Column="0" RowSpan="1" ColumnSpan="1" />
</Graphs>
</GraphTabItem>
<GraphTabItem Header="I B C" ColumnCount="1" RowCount="1">
<ColumnDefinitions>
<Boolean value="False" />
</ColumnDefinitions>
<RowDefinitions>
<Boolean value="False" />
<Boolean value="False" />
</RowDefinitions>
<Graphs>
<GraphComponent ID="65203096" Module="FLY.IBC.UI.Client.UIModule.UIModule_Main" Row="0" Column="0" RowSpan="1" ColumnSpan="1" />
</Graphs> </Graphs>
</GraphTabItem> </GraphTabItem>
<GraphTabItem Header="风 环" ColumnCount="1" RowCount="4"> <GraphTabItem Header="风 环" ColumnCount="1" RowCount="4">
...@@ -66,7 +104,6 @@ ...@@ -66,7 +104,6 @@
</RowDefinitions> </RowDefinitions>
<Graphs> <Graphs>
<GraphComponent ID="56082556" Module="trendgraph" Row="0" Column="0" RowSpan="1" ColumnSpan="1" /> <GraphComponent ID="56082556" Module="trendgraph" Row="0" Column="0" RowSpan="1" ColumnSpan="1" />
<GraphComponent ID="36196647" Module="FLY.Weight.UI.Client.UIModule.UIModule_FlowGraph" Row="1" Column="0" RowSpan="1" ColumnSpan="1" />
</Graphs> </Graphs>
</GraphTabItem> </GraphTabItem>
<GraphTabItem Header="定 点" ColumnCount="1" RowCount="2"> <GraphTabItem Header="定 点" ColumnCount="1" RowCount="2">
...@@ -88,7 +125,13 @@ ...@@ -88,7 +125,13 @@
<ControllerStateTabItem ControllerState="SCAN" No="1" /> <ControllerStateTabItem ControllerState="SCAN" No="1" />
</ControllerStates> </ControllerStates>
<DynAreaItems> <DynAreaItems>
<DynAreaComponent ID="16937562" Module="dyareathick" />
<DynAreaComponent ID="18220335" Module="dyareaprofile" />
<DynAreaComponent ID="29765295" Module="dyareablowing" />
<DynAreaComponent ID="66561065" Module="dyareaio" />
<DynAreaComponent ID="43395070" Module="FLY.FeedbackRenZiJia.UI.Client.UIModule.UIModule_DynAreaFB" /> <DynAreaComponent ID="43395070" Module="FLY.FeedbackRenZiJia.UI.Client.UIModule.UIModule_DynAreaFB" />
<DynAreaComponent ID="55011311" Module="FLY.IBC.UI.Client.UIModule.UIModule_DynArea" />
<DynAreaComponent ID="25339754" Module="FLY.Weight.UI.Client.UIModule.UIModule_DynArea" /> <DynAreaComponent ID="25339754" Module="FLY.Weight.UI.Client.UIModule.UIModule_DynArea" />
<DynAreaComponent ID="26731201" Module="FLY.Winder.UI.Client.UIModule.UIModule_DynArea" />
</DynAreaItems> </DynAreaItems>
</FLYLayout> </FLYLayout>
\ No newline at end of file
脚本/install/脚本/graphcustom/graphcustom_justAirRing.xml
View file @ 9fdd01a9
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<GraphComponent ID="51984031" Module="FLY.FeedbackRenZiJia.UI.Client.UIModule.UIModule_GraphFB" Row="2" Column="0" RowSpan="2" ColumnSpan="1" /> <GraphComponent ID="51984031" Module="FLY.FeedbackRenZiJia.UI.Client.UIModule.UIModule_GraphFB" Row="2" Column="0" RowSpan="2" ColumnSpan="1" />
</Graphs> </Graphs>
</GraphTabItem> </GraphTabItem>
<GraphTabItem Header="扫 描" ColumnCount="1" RowCount="4"> <GraphTabItem Header="扫 描" ColumnCount="1" RowCount="2">
<ColumnDefinitions> <ColumnDefinitions>
<Boolean value="False" /> <Boolean value="False" />
</ColumnDefinitions> </ColumnDefinitions>
...@@ -28,10 +28,7 @@ ...@@ -28,10 +28,7 @@
<Boolean value="False" /> <Boolean value="False" />
</RowDefinitions> </RowDefinitions>
<Graphs> <Graphs>
<GraphComponent ID="41846616" Module="scangraph" Row="0" Column="0" RowSpan="1" ColumnSpan="1" /> <GraphComponent ID="48011444" Module="scangraph" Row="0" Column="0" RowSpan="1" ColumnSpan="1" />
<GraphComponent ID="4049537" Module="scangraph" Row="1" Column="0" RowSpan="1" ColumnSpan="1" />
<GraphComponent ID="48011444" Module="scangraph" Row="2" Column="0" RowSpan="1" ColumnSpan="1" />
<GraphComponent ID="13031334" Module="scangraph" Row="3" Column="0" RowSpan="1" ColumnSpan="1" />
</Graphs> </Graphs>
</GraphTabItem> </GraphTabItem>
<GraphTabItem Header="环 形" ColumnCount="1" RowCount="1"> <GraphTabItem Header="环 形" ColumnCount="1" RowCount="1">
...@@ -54,7 +51,8 @@ ...@@ -54,7 +51,8 @@
<Boolean value="False" /> <Boolean value="False" />
</RowDefinitions> </RowDefinitions>
<Graphs> <Graphs>
<GraphComponent ID="56082556" Module="trendgraph" Row="0" Column="0" RowSpan="1" ColumnSpan="1" /> <GraphComponent ID="56082556" Module="trendgraph" Row="1" Column="0" RowSpan="1" ColumnSpan="1" />
<GraphComponent ID="24898733" Module="scangraph" Row="0" Column="0" RowSpan="1" ColumnSpan="1" />
</Graphs> </Graphs>
</GraphTabItem> </GraphTabItem>
<GraphTabItem Header="定 点" ColumnCount="1" RowCount="2"> <GraphTabItem Header="定 点" ColumnCount="1" RowCount="2">
...@@ -77,5 +75,6 @@ ...@@ -77,5 +75,6 @@
</ControllerStates> </ControllerStates>
<DynAreaItems> <DynAreaItems>
<DynAreaComponent ID="43395070" Module="FLY.FeedbackRenZiJia.UI.Client.UIModule.UIModule_DynAreaFB" /> <DynAreaComponent ID="43395070" Module="FLY.FeedbackRenZiJia.UI.Client.UIModule.UIModule_DynAreaFB" />
<DynAreaComponent ID="25339754" Module="FLY.Weight.UI.Client.UIModule.UIModule_DynArea" />
</DynAreaItems> </DynAreaItems>
</FLYLayout> </FLYLayout>
\ No newline at end of file
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