Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
H
hemei
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
潘栩锋
hemei
Commits
55856895
Commit
55856895
authored
Mar 19, 2020
by
冯伟球
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
微调界面布局
parent
14a64597
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
5 deletions
+4
-5
UC_FramePicker.xaml
...yst.Fix/FLY.HeatingHelper.UI/UIModule/UC_FramePicker.xaml
+3
-3
UC_SelectData.xaml
...eatingHelper.UI/UIModule/UC_SelectData/UC_SelectData.xaml
+1
-2
No files found.
Project.FLY.ThickHeatAnalyst.Fix/FLY.HeatingHelper.UI/UIModule/UC_FramePicker.xaml
View file @
55856895
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
xmlns:c1c="clr-namespace:C1.WPF.C1Chart;assembly=C1.WPF.C1Chart.4.5.2"
xmlns:c1c="clr-namespace:C1.WPF.C1Chart;assembly=C1.WPF.C1Chart.4.5.2"
xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks" x:Class="FLY.HeatingHelper.UI.U
I
Module.UC_FramePicker"
xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks" x:Class="FLY.HeatingHelper.UI.U
i
Module.UC_FramePicker"
mc:Ignorable="d"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="600">
d:DesignHeight="450" d:DesignWidth="600">
<UserControl.Resources>
<UserControl.Resources>
...
@@ -114,7 +114,7 @@
...
@@ -114,7 +114,7 @@
<c1c:C1Chart.Data>
<c1c:C1Chart.Data>
<c1c:ChartData>
<c1c:ChartData>
<c1c:DataSeries Values="{Binding DS_thick}" AxisY="ay0" Label="厚度" ChartType="Column"
<c1c:DataSeries Values="{Binding DS_thick}" AxisY="ay0" Label="厚度" ChartType="Column"
PlotElementLoaded="DataSeries_PlotElementLoaded"
/>
PlotElementLoaded="DataSeries_PlotElementLoaded"
/>
<c1c:DataSeries Values="{Binding DS_heat}" AxisY="ay1" Label="加热率"/>
<c1c:DataSeries Values="{Binding DS_heat}" AxisY="ay1" Label="加热率"/>
</c1c:ChartData>
</c1c:ChartData>
</c1c:C1Chart.Data>
</c1c:C1Chart.Data>
...
@@ -133,7 +133,7 @@
...
@@ -133,7 +133,7 @@
</c1c:ChartView>
</c1c:ChartView>
</c1c:C1Chart.View>
</c1c:C1Chart.View>
</c1c:C1Chart>
</c1c:C1Chart>
<Slider Grid.Row="1" Margin="20
,3,20,3
"
<Slider Grid.Row="1" Margin="20"
Minimum="{Binding MinFrame}"
Minimum="{Binding MinFrame}"
Maximum="{Binding MaxFrame}"
Maximum="{Binding MaxFrame}"
Value="{Binding SelectedFrame}"/>
Value="{Binding SelectedFrame}"/>
...
...
Project.FLY.ThickHeatAnalyst.Fix/FLY.HeatingHelper.UI/UIModule/UC_SelectData/UC_SelectData.xaml
View file @
55856895
...
@@ -110,7 +110,6 @@
...
@@ -110,7 +110,6 @@
<Controls:ToggleSwitch Content="过滤加热重复项" Margin="30,10" IsChecked="{Binding Path=Dat.IsDataFilter}" Style="{StaticResource MahApps.Metro.Styles.ToggleSwitch.Win10}" FontSize="15"/>
<Controls:ToggleSwitch Content="过滤加热重复项" Margin="30,10" IsChecked="{Binding Path=Dat.IsDataFilter}" Style="{StaticResource MahApps.Metro.Styles.ToggleSwitch.Win10}" FontSize="15"/>
<Controls:ToggleSwitch Content="过滤不稳定数据" Margin="30,10" IsChecked="{Binding Path=Dat.IsFilterUnstable}" Style="{StaticResource MahApps.Metro.Styles.ToggleSwitch.Win10}" FontSize="15"/>
<Controls:ToggleSwitch Content="过滤不稳定数据" Margin="30,10" IsChecked="{Binding Path=Dat.IsFilterUnstable}" Style="{StaticResource MahApps.Metro.Styles.ToggleSwitch.Win10}" FontSize="15"/>
<Button Content="缺省数据范围" Width="180"
<Button Content="缺省数据范围" Width="180"
Style="{DynamicResource AccentedSquareButtonStyle}"
Command="{Binding DefaultLoadDataRange}"/>
Command="{Binding DefaultLoadDataRange}"/>
<Button Content="加载数据" Width="180"
<Button Content="加载数据" Width="180"
Command="{Binding ReloadData}"/>
Command="{Binding ReloadData}"/>
...
@@ -150,7 +149,7 @@
...
@@ -150,7 +149,7 @@
</TextBlock.Text>
</TextBlock.Text>
</TextBlock>
</TextBlock>
</StackPanel>
</StackPanel>
<Controls:RangeSlider Minimum="0"
<Controls:RangeSlider Minimum="0"
Margin="20,0"
Maximum="{Binding RecordCount, Mode=OneWay}"
Maximum="{Binding RecordCount, Mode=OneWay}"
LowerValue="{Binding Dat.AnalystIndexFrom}"
LowerValue="{Binding Dat.AnalystIndexFrom}"
UpperValue="{Binding Dat.AnalystIndexTo}"
UpperValue="{Binding Dat.AnalystIndexTo}"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment