Skip to content

H
hemei
Commit 9baaa760 authored by 540597360@qq.com's avatar 540597360@qq.com
Browse files
Options

修正使用MahApps.Metro v2.0.0Alpha0316版本

parent 36919024
Hide whitespace changes
Inline Side-by-side
Showing with 46 additions and 41 deletions
Project.FLY.ThickHeatAnalyst.Fix/FLY.HeatingHelper.UI/App.xaml
View file @ 9baaa760
......@@ -6,18 +6,7 @@
<Application.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.xaml" />
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Fonts.xaml" />
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Colors.xaml" />
<!-- accent resource -->
<!-- change "Cobalt" to the accent color you want -->
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/Cobalt.xaml" />
<!-- theme resource -->
<!-- change "BaseLight" to the theme you want -->
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/BaseLight.xaml" />
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</Application.Resources>
......
Project.FLY.ThickHeatAnalyst.Fix/FLY.HeatingHelper.UI/FLY.HeatingHelper.UI.csproj
View file @ 9baaa760
......@@ -224,7 +224,7 @@
<Version>4.2.1</Version>
</PackageReference>
<PackageReference Include="MahApps.Metro">
<Version>1.6.5</Version>
<Version>2.0.0-alpha0316</Version>
</PackageReference>
<PackageReference Include="MahApps.Metro.IconPacks">
<Version>3.1.0</Version>
......
Project.FLY.ThickHeatAnalyst.Fix/FLY.HeatingHelper.UI/UIModule/UC_SelectData/UC_SelectData.xaml
View file @ 9baaa760
......@@ -9,23 +9,28 @@
xmlns:Controls="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro"
xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800" Background="WhiteSmoke">
<UserControl.Resources>
d:DesignHeight="450" d:DesignWidth="800" Background="WhiteSmoke" x:Name="uc1">
<!--<UserControl.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.xaml" />
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Fonts.xaml" />
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Colors.xaml" />
--><!--<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.xaml" />
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Fonts.xaml" />-->
<!--<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Themes/Light.Blue.xaml" />-->
<!--<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Colors.xaml" />-->
<!-- accent resource -->
<!-- change "Cobalt" to the accent color you want -->
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/Cobalt.xaml" />
<!--<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/Cobalt.xaml" />-->
<!-- theme resource -->
<!-- change "BaseLight" to the theme you want -->
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/BaseLight.xaml" />
<!--<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/BaseLight.xaml" />--><!--
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</UserControl.Resources>
</UserControl.Resources>-->
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
......@@ -40,15 +45,14 @@
<ColumnDefinition Width="auto"/>
</Grid.ColumnDefinitions>
<StackPanel Orientation="Vertical" Grid.Column="0" Margin="0,0,5,0">
<Label Content="数据范围:" Margin="0,0,0,3"/>
<Controls:DateTimePicker Controls:TextBoxHelper.UseFloatingWatermark="True"
DisplayDate="{Binding Path=Dat.TotalDataFrom}"
<Label x:Uid="123" Content="数据范围:" Margin="0,0,0,3"/>
<Controls:DateTimePicker Controls:TextBoxHelper.UseFloatingWatermark="False"
SelectedDateTime="{Binding Dat.TotalDataFrom, Mode=OneWay}"
Margin="0,0,0,1"
IsEnabled="False">
</Controls:DateTimePicker>
<Controls:DateTimePicker Controls:TextBoxHelper.UseFloatingWatermark="True"
DisplayDate="{Binding Path=Dat.TotalDataTo}"
<Controls:DateTimePicker Controls:TextBoxHelper.UseFloatingWatermark="False"
SelectedDateTime="{Binding Path=Dat.TotalDataTo, Mode=OneWay}"
Margin="0,1,0,0" IsEnabled="False">
</Controls:DateTimePicker>
......@@ -56,13 +60,14 @@
</StackPanel>
<StackPanel Orientation="Vertical" Grid.Column="1" Margin="0,0,5,0">
<Label Content="选定数据范围:" Margin="0,0,0,3"/>
<Controls:DateTimePicker Controls:TextBoxHelper.UseFloatingWatermark="True"
DisplayDate="{Binding Path=Dat.LoadDataFrom}"
<Controls:DateTimePicker Controls:TextBoxHelper.UseFloatingWatermark="False"
SelectedDateTime="{Binding Path=Dat.LoadDataFrom}"
Margin="0,0,0,1">
</Controls:DateTimePicker>
<Controls:DateTimePicker Controls:TextBoxHelper.UseFloatingWatermark="True"
DisplayDate="{Binding Path=Dat.LoadDataTo}"
<Controls:DateTimePicker Controls:TextBoxHelper.UseFloatingWatermark="False"
SelectedDateTime="{Binding Path=Dat.LoadDataTo}"
Name="dtp4"
Margin="0,1,0,0">
</Controls:DateTimePicker>
......@@ -70,16 +75,17 @@
</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="缺省数据范围" Style="{DynamicResource MahApps.Styles.Button.AccentedSquare}"
<Button Content="缺省数据范围"
Style="{DynamicResource MahApps.Styles.Button.AccentedSquare}"
Command="{Binding DefaultLoadDataRange}"/>
<Button Content="加载数据" Style="{DynamicResource MahApps.Styles.Button.AccentedSquare}"
<Button Content="加载数据"
Style="{DynamicResource MahApps.Styles.Button.AccentedSquare}"
Command="{Binding ReloadData}"/>
</StackPanel>
<StackPanel Orientation="Vertical" Grid.Column="3" Margin="0,0,5,0">
<Label Content="加载数据数量:"/>
<TextBox Margin="{StaticResource ControlMargin}"
Controls:TextBoxHelper.Watermark="Watermark"
Text="{Binding RecordCount}"
<TextBox Controls:TextBoxHelper.Watermark="Watermark"
Text="{Binding RecordCount, Mode=OneWay}"
IsEnabled="False" />
</StackPanel>
</Grid>
......@@ -89,11 +95,12 @@
<ColumnDefinition Width="auto"/>
<ColumnDefinition Width="auto"/>
<ColumnDefinition Width="auto"/>
<ColumnDefinition Width="auto"/>
</Grid.ColumnDefinitions>
<StackPanel Orientation="Vertical" Grid.Column="0" Margin="0,0,5,0">
<Label Content="选择数据范围:"/>
<Controls:RangeSlider Minimum="0"
Maximum="{Binding RecordCount}"
Maximum="{Binding RecordCount, Mode=OneWay}"
LowerValue="{Binding Dat.AnalystIndexFrom}"
UpperValue="{Binding Dat.AnalystIndexTo}"
Style="{DynamicResource MahApps.Styles.RangeSlider.Win10}">
......@@ -109,6 +116,7 @@
<Button Content="缺省项" Style="{DynamicResource MahApps.Styles.Button.AccentedSquare}"
Grid.Column="3" MinWidth="80"
Command="{Binding DefaultAnalystData}"/>
<Button Content="test" Click="Button_Click" Grid.Column="4"/>
</Grid>
<Border Grid.Row="2" Margin="2,5,2,2">
<c1c:C1Chart ChartType="Line" Margin="5,0,0,0">
......
Project.FLY.ThickHeatAnalyst.Fix/FLY.HeatingHelper.UI/UIModule/UC_SelectData/UC_SelectData.xaml.cs
View file @ 9baaa760
......@@ -23,6 +23,12 @@ namespace FLY.HeatingHelper.UI.UIModule.UC_SelectData
public UC_SelectData()
{
InitializeComponent();
this.DataContext = new ViewModel_UC_SelectData(DataManager.GetThickDataInstance());
}
private void Button_Click(object sender, RoutedEventArgs e)
{
}
}
}
Project.FLY.ThickHeatAnalyst.Fix/FLY.HeatingHelper.UI/UIModule/UC_SelectData/ViewModel_UC_SelectData.cs
View file @ 9baaa760
......@@ -21,7 +21,9 @@ namespace FLY.HeatingHelper.UI.UIModule.UC_SelectData
}
#region UI界面
IThickHeatData Dat { get; set; }
public IThickHeatData Dat { get; set; } = null;
public DateTime? TotalDataFrom { get; set; } = null;
public int RecordCount
{
......
Project.FLY.ThickHeatAnalyst.Fix/FLY.HeatingHelper/ThickHeatData.cs
View file @ 9baaa760
......@@ -121,10 +121,10 @@ namespace FLY.HeatingHelper
}
public DateTime TotalDataFrom { get; protected set; } = DateTime.MinValue;
public DateTime TotalDataTo { get; protected set; } = DateTime.MinValue;
public DateTime TotalDataTo { get; protected set; } = DateTime.MaxValue;
public DateTime LoadDataFrom { get; set; }
public DateTime LoadDataTo { get; set; }
public DateTime LoadDataFrom { get; set; } = DateTime.MinValue;
public DateTime LoadDataTo { get; set; } = DateTime.MaxValue;
public TimeSpan LoadDataSpan { get; set; }
public int LoadDataMinID
......
Project.FLY.ThickHeatAnalyst.Fix/FLY.HeatingHelper/ThickHeatData4SQLite_V2.cs
View file @ 9baaa760
......@@ -214,7 +214,7 @@ namespace FLY.HeatingHelper
{
clear = true;
cmdstr = string.Format("select * from [ThickHeat] where IsStable=1 and EndTime>=\"{0}\" and EndTime<=\"{1}\"",
(LoadDataTo - LoadDataSpan).ToString("yyyy-MM-dd HH:mm:ss"),
LoadDataFrom.ToString("yyyy-MM-dd HH:mm:ss"),
LoadDataTo.ToString("yyyy-MM-dd HH:mm:ss"));
}
else
......
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