Skip to content

H
hemei
Commit be41225f authored by 冯伟球's avatar 冯伟球
Browse files
Options

更改界面基础版，主要更改了布局，满足基本使用，但还没美化按钮本文的样式显示。

parent f900d651
Expand all Show whitespace changes
Inline Side-by-side
Showing with 297 additions and 110 deletions
Project.FLY.ThickHeatAnalyst.Fix/FLY.HeatingHelper.UI/UIModule/HeatThickDetector/HeatThickDetector.xaml
View file @ be41225f
......@@ -25,7 +25,26 @@
</ResourceDictionary>
</Page.Resources>
<Button Style="{StaticResource ButtonStyle_empty}" Background="Transparent" Click="Button_Click">
<Border Style="{StaticResource BorderStyle_module}">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="Auto"></RowDefinition>
<RowDefinition Height="Auto"></RowDefinition>
</Grid.RowDefinitions>
<TextBlock Text="{Binding Path=Dat.State,Converter={StaticResource StateToMessage}}" HorizontalAlignment="Center" FontFamily="YouYuan" FontSize="25" Margin="0,10,0,3"/>
<StackPanel Grid.Row="1" Background="#FF119EDA" Margin="5">
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
<TextBlock Text="风环偏转" FontFamily="YouYuan" FontSize="25" Margin="0,3,0,3"/>
<TextBlock Text="{Binding Path=Dat.AirRingShift}" Background="AliceBlue" FontFamily="YouYuan" Margin="15,3,0,3" FontSize="25"/>
</StackPanel>
</StackPanel>
<!--<StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
<TextBlock Text="风环偏转" FontFamily="YouYuan" FontSize="25" Margin="0,3,0,3"/>
<TextBlock Text="{Binding Path=Dat.AirRingShift}" Background="AliceBlue" FontFamily="YouYuan" Margin="15,3,0,3" FontSize="25"/>
</StackPanel>-->
</Grid>
</Border>
<!--<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="Auto"></RowDefinition>
<RowDefinition Height="Auto"></RowDefinition>
......@@ -37,6 +56,6 @@
<TextBlock Text="风环偏转"/>
<TextBlock Text="{Binding Path=Dat.AirRingShift}" Background="AliceBlue"/>
</StackPanel>
</Grid>
</Grid>-->
</Button>
</Page>
Project.FLY.ThickHeatAnalyst.Fix/FLY.HeatingHelper.UI/UIModule/UC_FrameDiff.xaml
View file @ be41225f
......@@ -20,7 +20,8 @@
<RowDefinition Height="*"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<lvc:CartesianChart Grid.Row="0" x:Name="myChart" Series="{Binding MySeries}"
<Border>
<lvc:CartesianChart x:Name="myChart" Series="{Binding MySeries}"
DisableAnimations="True"
Hoverable="False"
DataTooltip="{x:Null}"
......@@ -37,9 +38,27 @@
</lvc:Axis>
</lvc:CartesianChart.AxisY>
</lvc:CartesianChart>
</Border>
<!--<lvc:CartesianChart Grid.Row="0" x:Name="myChart" Series="{Binding MySeries}"
DisableAnimations="True"
Hoverable="False"
DataTooltip="{x:Null}"
LegendLocation="Top"
FontSize="16"
Margin="2,2,2,2">
<lvc:CartesianChart.AxisY>
<lvc:Axis Foreground="DodgerBlue" Title="厚度变化量">
</lvc:Axis>
<lvc:Axis x:Name="yax2" Foreground="IndianRed" Position="RightTop" Title="加热变化量">
<lvc:Axis.Separator>
<lvc:Separator IsEnabled="False"></lvc:Separator>
</lvc:Axis.Separator>
</lvc:Axis>
</lvc:CartesianChart.AxisY>
</lvc:CartesianChart>-->
<StackPanel Orientation="Horizontal" Grid.Row="1">
<TextBlock Text="{Binding FrameIdx1, StringFormat=第一幅号：{0}}" Style="{StaticResource TextBlockStyle_FieldHeader}"/>
<TextBlock Text="{Binding FrameIdx2, StringFormat=第二幅号：{0}}" Style="{StaticResource TextBlockStyle_FieldHeader}"/>
<TextBlock Text="{Binding FrameIdx1, StringFormat=第一幅号：{0}}" Style="{StaticResource TextBlockStyle_FieldHeader}" FontSize="18" Margin="15,5,15,5"/>
<TextBlock Text="{Binding FrameIdx2, StringFormat=第二幅号：{0}}" Style="{StaticResource TextBlockStyle_FieldHeader}" FontSize="18" Margin="15,5,15,5"/>
</StackPanel>
</Grid>
......
Project.FLY.ThickHeatAnalyst.Fix/FLY.HeatingHelper.UI/UIModule/UC_FramePicker.xaml
View file @ be41225f
......@@ -65,15 +65,15 @@
</Border>
<DockPanel Grid.Row="1">
<StackPanel Orientation="Horizontal" DockPanel.Dock="Right">
<Button Content="前一幅" Command="{Binding PreCmd}" FontFamily="YouYuan" Style="{DynamicResource SquareButtonStyle}" FontSize="18" Margin="3,0,3,0" />
<Button Content="后一幅" Command="{Binding NxtCmd}" FontFamily="YouYuan" Style="{DynamicResource SquareButtonStyle}" FontSize="18" Margin="3,0,3,0" />
<Button Content="前一幅" Command="{Binding PreCmd}" FontFamily="YouYuan" Style="{DynamicResource AccentedSquareButtonStyle}" FontSize="20" Margin="3,0,3,0" />
<Button Content="后一幅" Command="{Binding NxtCmd}" FontFamily="YouYuan" Style="{DynamicResource SquareButtonStyle}" FontSize="20" Margin="3,0,5,0" />
</StackPanel>
<StackPanel Orientation="Horizontal" DockPanel.Dock="Left" >
<TextBlock Text="{Binding FrameID, Mode=OneWay, StringFormat=ID:\{0\}}" Style="{StaticResource TextBlockStyle_FieldHeader}" FontSize="18" Margin="5"/>
<TextBlock Text="{Binding FrameTime, Mode=OneWay, StringFormat=\{0:MM/dd HH:mm:ss\}}" Style="{StaticResource TextBlockStyle_FieldHeader}" FontSize="18" Margin="10,5,10,5"/>
<TextBlock Text="{Binding ResetBolt, StringFormat=复位分区：\{0\}}" Style="{StaticResource TextBlockStyle_FieldHeader}" FontSize="18" Margin="10,5,10,5"/>
<TextBlock Text="{Binding RotAngle, StringFormat=旋转角度：\{0:f1\}}" Style="{StaticResource TextBlockStyle_FieldHeader}" FontSize="18" Margin="10,5,10,5"/>
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeader}" FontSize="18" Margin="10,5,10,5">
<TextBlock Text="{Binding FrameTime, Mode=OneWay, StringFormat=\{0:MM/dd HH:mm:ss\}}" Style="{StaticResource TextBlockStyle_FieldHeader}" FontSize="18" Margin="15,5,15,5"/>
<TextBlock Text="{Binding ResetBolt, StringFormat=复位分区：\{0\}}" Style="{StaticResource TextBlockStyle_FieldHeader}" FontSize="18" Margin="15,5,15,5"/>
<TextBlock Text="{Binding RotAngle, StringFormat=旋转角度：\{0:f1\}}" Style="{StaticResource TextBlockStyle_FieldHeader}" FontSize="18" Margin="15,5,15,5"/>
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeader}" FontSize="18" Margin="15,5,15,5">
<TextBlock.Text >
<MultiBinding StringFormat="{}{0}/({1})-({2})">
<Binding Path="SelectedFrame" />
......
Project.FLY.ThickHeatAnalyst.Fix/FLY.HeatingHelper.UI/UIModule/UC_HeatBoltAnalyst.xaml
View file @ be41225f
......@@ -21,32 +21,46 @@
<ColumnDefinition Width="2*"/>
<ColumnDefinition Width="5*"/>
</Grid.ColumnDefinitions>
<StackPanel Orientation="Vertical" Grid.Column="0" Name="SP_0">
<StackPanel Orientation="Horizontal">
<TextBlock Text="最大幅间隔" Background="LightBlue" Style="{StaticResource TextBlockStyle_FieldHeader}" />
<TextBox Text="{Binding MaxFrameInterval}" Style="{StaticResource TextBoxStyle1}"/>
</StackPanel>
<StackPanel Orientation="Horizontal">
<TextBlock Text="总加热变化量" Background="LightBlue" Style="{StaticResource TextBlockStyle_FieldHeader}"/>
<TextBox Text="{Binding HeatRateVar}" Style="{StaticResource TextBoxStyle1}"/>
</StackPanel>
<StackPanel Orientation="Horizontal">
<TextBlock Text="忽略加热变化量" Background="LightBlue" Style="{StaticResource TextBlockStyle_FieldHeader}"/>
<TextBox Text="{Binding NeglectHeatRate}" Style="{StaticResource TextBoxStyle1}"/>
</StackPanel>
<StackPanel Orientation="Horizontal">
<TextBlock Text="分离螺丝数" Background="LightBlue" Style="{StaticResource TextBlockStyle_FieldHeader}"/>
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="auto"/>
<RowDefinition Height="*"/>
</Grid.RowDefinitions>
<StackPanel Orientation="Vertical" Name="SP_0">
<DockPanel>
<TextBlock Text="最大幅间隔" Background="LightBlue" Style="{StaticResource TextBlockStyle_FieldHeader}" DockPanel.Dock="Left" />
<TextBox Text="{Binding MaxFrameInterval}" Style="{StaticResource TextBoxStyle1}" DockPanel.Dock="Right" />
</DockPanel>
<DockPanel>
<TextBlock Text="总加热变化量" Background="LightBlue" Style="{StaticResource TextBlockStyle_FieldHeader}" />
<TextBox Text="{Binding HeatRateVar}" Style="{StaticResource TextBoxStyle1}" />
</DockPanel>
<DockPanel>
<TextBlock Text="忽略加热变化量" Background="LightBlue" Style="{StaticResource TextBlockStyle_FieldHeader}" />
<TextBox Text="{Binding NeglectHeatRate}" Style="{StaticResource TextBoxStyle1}" />
</DockPanel>
<DockPanel>
<TextBlock Text="分离螺丝数" Background="LightBlue" Style="{StaticResource TextBlockStyle_FieldHeader}" />
<TextBox Text="{Binding Separation}" Style="{StaticResource TextBoxStyle1}" />
</StackPanel>
<StackPanel Orientation="Horizontal">
<TextBlock Text="{Binding Path=HeatBoltItems.Count, StringFormat=搜索结果：{0}}" Background="LightCyan" Style="{StaticResource TextBlockStyle_FieldContent}" FontSize="25"/>
<CheckBox Content="过滤" IsChecked="{Binding IsFilter}"/>
<Button Content="搜索" Click="Button_Click"
</DockPanel>
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="3*"/>
<ColumnDefinition Width="2*"/>
</Grid.ColumnDefinitions>
<TextBlock Text="{Binding Path=HeatBoltItems.Count, StringFormat=搜索结果：{0}}" Background="LightBlue" Style="{StaticResource TextBlockStyle_FieldHeader}" />
<Grid Grid.Column="1">
<DockPanel>
<Controls:ToggleSwitch Content="过滤" IsChecked="{Binding IsFilter}" Style="{StaticResource MahApps.Metro.Styles.ToggleSwitch.Win10}" FontSize="22" Margin="5"/>
<Button Content="搜索" Click="Button_Click" FontFamily="YouYuan" Margin="5"
Style="{DynamicResource AccentedSquareButtonStyle}" />
</DockPanel>
</Grid>
</Grid>
</StackPanel>
<ListView x:Name="lv_result" ItemsSource="{Binding HeatBoltItems}"
MaxHeight="250" SelectionChanged="Lv_result_SelectionChanged"
SelectedIndex="{Binding SelectItem}">
<ListView x:Name="lv_result" ItemsSource="{Binding HeatBoltItems}" Grid.Row="1" Margin="5,5,5,20"
SelectionChanged="Lv_result_SelectionChanged"
SelectedIndex="{Binding SelectItem}" FontFamily="YouYuan" >
<ListView.View>
<GridView>
<GridView.Columns>
......@@ -66,7 +80,7 @@
</GridView>
</ListView.View>
</ListView>
</StackPanel>
</Grid>
<Grid Grid.Column="1">
<Grid.RowDefinitions>
<RowDefinition Height="*"/>
......
Project.FLY.ThickHeatAnalyst.Fix/FLY.HeatingHelper.UI/UIModule/UC_SelectData/UC_SelectData.xaml
View file @ be41225f
......@@ -44,28 +44,28 @@
<ColumnDefinition Width="auto"/>
<ColumnDefinition Width="auto"/>
</Grid.ColumnDefinitions>
<StackPanel Orientation="Vertical" Grid.Column="0" Margin="0,0,5,0">
<Label x:Uid="123" Content="数据范围:" Margin="0,0,0,3"/>
<Controls:DateTimePicker Controls:TextBoxHelper.UseFloatingWatermark="False"
<StackPanel Orientation="Vertical" Grid.Column="0" Margin="15,0,15,0">
<Label x:Uid="123" Content="数据范围:" Margin="0,0,0,3" FontFamily="YouYuan"/>
<Controls:DateTimePicker Controls:TextBoxHelper.UseFloatingWatermark="False" MinWidth="180"
SelectedDateTime="{Binding Dat.TotalDataFrom, Mode=OneWay}"
Margin="0,0,0,1"
Margin="0,0,0,5"
IsEnabled="False">
</Controls:DateTimePicker>
<Controls:DateTimePicker Controls:TextBoxHelper.UseFloatingWatermark="False"
<Controls:DateTimePicker Controls:TextBoxHelper.UseFloatingWatermark="False" MinWidth="180"
SelectedDateTime="{Binding Path=Dat.TotalDataTo, Mode=OneWay}"
Margin="0,1,0,0" IsEnabled="False">
</Controls:DateTimePicker>
</StackPanel>
<StackPanel Orientation="Vertical" Grid.Column="1" Margin="0,0,5,0">
<Label Content="加载数据范围:" Margin="0,0,0,3"/>
<Controls:DateTimePicker Controls:TextBoxHelper.UseFloatingWatermark="False"
<StackPanel Orientation="Vertical" Grid.Column="1" Margin="15,0,15,0">
<Label Content="加载数据范围:" Margin="0,0,0,3" FontFamily="YouYuan"/>
<Controls:DateTimePicker Controls:TextBoxHelper.UseFloatingWatermark="False" MinWidth="180"
SelectedDateTime="{Binding Path=Dat.LoadDataFrom}"
Margin="0,0,0,1">
Margin="0,0,0,5">
</Controls:DateTimePicker>
<Controls:DateTimePicker Controls:TextBoxHelper.UseFloatingWatermark="False"
<Controls:DateTimePicker Controls:TextBoxHelper.UseFloatingWatermark="False" MinWidth="180"
SelectedDateTime="{Binding Path=Dat.LoadDataTo}"
Name="dtp4"
Margin="0,1,0,0">
......@@ -73,18 +73,18 @@
</Controls:DateTimePicker>
</StackPanel>
<StackPanel Orientation="Vertical" Grid.Column="2" Margin="0,0,5,0">
<CheckBox Content="过滤加热重复项" Margin="0,5,0,5" IsChecked="{Binding Path=Dat.IsDataFilter}"/>
<Button Content="缺省数据范围"
<StackPanel Orientation="Vertical" Grid.Column="2" Margin="15,0,15,0">
<Controls:ToggleSwitch Content="过滤加热重复项" Margin="0,10,0,15" IsChecked="{Binding Path=Dat.IsDataFilter}" FontFamily="YouYuan" Style="{StaticResource MahApps.Metro.Styles.ToggleSwitch.Win10}" FontSize="20"/>
<Button Content="缺省数据范围" FontFamily="YouYuan" Margin="0,0,0,10"
Style="{DynamicResource AccentedSquareButtonStyle}"
Command="{Binding DefaultLoadDataRange}"/>
<Button Content="加载数据"
<Button Content="加载数据" FontFamily="YouYuan"
Style="{DynamicResource AccentedSquareButtonStyle}"
Command="{Binding ReloadData}"/>
</StackPanel>
<StackPanel Orientation="Vertical" Grid.Column="3" Margin="0,0,5,0">
<Label Content="加载数据数量:"/>
<TextBox Controls:TextBoxHelper.Watermark="Watermark"
<StackPanel Orientation="Vertical" Grid.Column="3" Margin="15,0,0,0">
<Label Content="加载数据数量:" FontFamily="YouYuan"/>
<TextBox Controls:TextBoxHelper.Watermark="Watermark" Margin="0,5" FontSize="25"
Text="{Binding RecordCount, Mode=OneWay}"
IsEnabled="False" />
</StackPanel>
......@@ -97,8 +97,8 @@
<ColumnDefinition Width="auto"/>
<ColumnDefinition Width="auto"/>
</Grid.ColumnDefinitions>
<StackPanel Orientation="Vertical" Grid.Column="0" Margin="0,0,5,0">
<Label Content="分析数据范围:"/>
<StackPanel Orientation="Vertical" Grid.Column="0" Margin="15,0,15,0">
<Label Content="分析数据范围:" FontFamily="YouYuan"/>
<Controls:RangeSlider Minimum="0"
Maximum="{Binding RecordCount, Mode=OneWay}"
LowerValue="{Binding Dat.AnalystIndexFrom}"
......@@ -107,17 +107,17 @@
</Controls:RangeSlider>
</StackPanel>
<Button Content="前一项" Style="{DynamicResource AccentedSquareButtonStyle}"
Grid.Column="1" MinWidth="80" Margin="0,0,5,0"
<Button Content="前一项" Style="{DynamicResource AccentedSquareButtonStyle}" FontFamily="YouYuan"
Grid.Column="1" MinWidth="80" Margin="5"
Command="{Binding PreData}"/>
<Button Content="后一项" Style="{DynamicResource AccentedSquareButtonStyle}"
Grid.Column="2" MinWidth="80" Margin="0,0,5,0"
<Button Content="后一项" Style="{DynamicResource AccentedSquareButtonStyle}" FontFamily="YouYuan"
Grid.Column="2" MinWidth="80" Margin="5"
Command="{Binding NextData}"/>
<Button Content="缺省项" Style="{DynamicResource AccentedSquareButtonStyle}"
Grid.Column="3" MinWidth="80"
<Button Content="缺省项" Style="{DynamicResource AccentedSquareButtonStyle}" FontFamily="YouYuan"
Grid.Column="3" MinWidth="80" Margin="5"
Command="{Binding DefaultAnalystData}"/>
<Button Content="test" Click="Button_Click" Grid.Column="4"
Command="{Binding Test}"
<Button Content="test" Click="Button_Click" Grid.Column="4" FontFamily="YouYuan"
Command="{Binding Test}" Margin="5" MinWidth="80"
Style="{DynamicResource AccentedSquareButtonStyle}"/>
</Grid>
<Border Grid.Row="2" Margin="2,5,2,2">
......
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