Skip to content

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

把 ThickInWindowTcp 的ScanGraph, TrendGraph 移到 FLY.Thick.Blowing.UI.Fix.Client

parent d2a3ab60
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1318 additions and 60 deletions
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/FLY.Thick.Blowing.UI.Fix.Client.csproj
View file @ c9a7a9f5
...@@ -171,6 +171,18 @@ ...@@ -171,6 +171,18 @@
<Compile Include="UIModule\ScanGraphCircular\ScanGraphCircularConfig.xaml.cs"> <Compile Include="UIModule\ScanGraphCircular\ScanGraphCircularConfig.xaml.cs">
<DependentUpon>ScanGraphCircularConfig.xaml</DependentUpon> <DependentUpon>ScanGraphCircularConfig.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="UIModule\ScanGraph\ScanGraph.xaml.cs">
<DependentUpon>ScanGraph.xaml</DependentUpon>
</Compile>
<Compile Include="UIModule\ScanGraph\ScanGraphConfig.xaml.cs">
<DependentUpon>ScanGraphConfig.xaml</DependentUpon>
</Compile>
<Compile Include="UIModule\TrendGraph\TrendGraph.xaml.cs">
<DependentUpon>TrendGraph.xaml</DependentUpon>
</Compile>
<Compile Include="UIModule\TrendGraph\TrendGraphConfig.xaml.cs">
<DependentUpon>TrendGraphConfig.xaml</DependentUpon>
</Compile>
<Compile Include="WdIOTip.xaml.cs"> <Compile Include="WdIOTip.xaml.cs">
<DependentUpon>WdIOTip.xaml</DependentUpon> <DependentUpon>WdIOTip.xaml</DependentUpon>
</Compile> </Compile>
...@@ -265,6 +277,22 @@ ...@@ -265,6 +277,22 @@
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType> <SubType>Designer</SubType>
</Page> </Page>
<Page Include="UIModule\ScanGraph\ScanGraph.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="UIModule\ScanGraph\ScanGraphConfig.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="UIModule\TrendGraph\TrendGraph.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="UIModule\TrendGraph\TrendGraphConfig.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="WdIOTip.xaml"> <Page Include="WdIOTip.xaml">
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType> <SubType>Designer</SubType>
...@@ -327,14 +355,16 @@ ...@@ -327,14 +355,16 @@
<ProjectReference Include="..\..\Project.FLY.Integrated\FLY.Integrated\FLY.Integrated.csproj"> <ProjectReference Include="..\..\Project.FLY.Integrated\FLY.Integrated\FLY.Integrated.csproj">
<Project>{83971044-3f20-4912-9528-52cbebba0999}</Project> <Project>{83971044-3f20-4912-9528-52cbebba0999}</Project>
<Name>FLY.Integrated</Name> <Name>FLY.Integrated</Name>
</ProjectReference> <ProjectReference Include="..\..\Project.FLY.ThickHeatAnalyst.Fix\FLY.HeatingHelper.UI\FLY.HeatingHelper.UI.csproj"> </ProjectReference>
<ProjectReference Include="..\..\Project.FLY.ThickHeatAnalyst.Fix\FLY.HeatingHelper.UI\FLY.HeatingHelper.UI.csproj">
<Project>{276ee86a-0961-4c69-a38a-696f4d76e931}</Project> <Project>{276ee86a-0961-4c69-a38a-696f4d76e931}</Project>
<Name>FLY.HeatingHelper.UI</Name> <Name>FLY.HeatingHelper.UI</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\Project.FLY.ThickHeatAnalyst.Fix\FLY.HeatingHelper\FLY.HeatingHelper.csproj"> <ProjectReference Include="..\..\Project.FLY.ThickHeatAnalyst.Fix\FLY.HeatingHelper\FLY.HeatingHelper.csproj">
<Project>{973f0eed-3181-4fb9-abd6-196a9e816b77}</Project> <Project>{973f0eed-3181-4fb9-abd6-196a9e816b77}</Project>
<Name>FLY.HeatingHelper</Name> <Name>FLY.HeatingHelper</Name>
</ProjectReference> <ProjectReference Include="..\..\Project.FLY.Weight\FLY.Weight.UI.Client\FLY.Weight.UI.Client.csproj"> </ProjectReference>
<ProjectReference Include="..\..\Project.FLY.Weight\FLY.Weight.UI.Client\FLY.Weight.UI.Client.csproj">
<Project>{654515f2-caae-450b-a344-547321836e8f}</Project> <Project>{654515f2-caae-450b-a344-547321836e8f}</Project>
<Name>FLY.Weight.UI.Client</Name> <Name>FLY.Weight.UI.Client</Name>
</ProjectReference> </ProjectReference>
......
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/PgMain.xaml.cs
View file @ c9a7a9f5
...@@ -63,7 +63,7 @@ namespace FLY.Thick.Blowing.UI.Fix.Client ...@@ -63,7 +63,7 @@ namespace FLY.Thick.Blowing.UI.Fix.Client
mManager.myUIModules.Add("scangraph", mManager.myUIModules.Add("scangraph",
new FLY.UI.Module.UIModuleInfo() new FLY.UI.Module.UIModuleInfo()
{ {
UIModule = new ThickTcpUiInWindow.UIModule.UIModule_ScanGraph(), UIModule = new UIModule.UIModule_ScanGraph(),
Param = new FLY.UI.Module.UIModuleParam() Param = new FLY.UI.Module.UIModuleParam()
{ {
IsGraphCompnonent = true IsGraphCompnonent = true
...@@ -72,7 +72,7 @@ namespace FLY.Thick.Blowing.UI.Fix.Client ...@@ -72,7 +72,7 @@ namespace FLY.Thick.Blowing.UI.Fix.Client
mManager.myUIModules.Add("trendgraph", mManager.myUIModules.Add("trendgraph",
new FLY.UI.Module.UIModuleInfo() new FLY.UI.Module.UIModuleInfo()
{ {
UIModule = new ThickTcpUiInWindow.UIModule.UIModule_TrendGraph(), UIModule = new UIModule.UIModule_TrendGraph(),
Param = new FLY.UI.Module.UIModuleParam() Param = new FLY.UI.Module.UIModuleParam()
{ {
IsGraphCompnonent = true IsGraphCompnonent = true
......
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/UIModule/ScanGraph/ScanGraph.xaml 0 → 100644
View file @ c9a7a9f5
<Page
x:Class="FLY.Thick.Blowing.UI.Fix.Client.UIModule.ScanGraph"
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:ControlLibrary="clr-namespace:FLY.ControlLibrary;assembly=FLY.ControlLibrary"
mc:Ignorable="d"
Title="ScanGraph">
<Grid>
<ControlLibrary:GraphScan x:Name="graphscan"/>
</Grid>
</Page>
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/UIModule/ScanGraph/ScanGraphConfig.xaml 0 → 100644
View file @ c9a7a9f5
<flyctrllib:WindowBigClose x:Class="FLY.Thick.Blowing.UI.Fix.Client.UIModule.ScanGraphConfig"
xmlns:flyctrllib="clr-namespace:FLY.ControlLibrary;assembly=FLY.ControlLibrary"
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"
mc:Ignorable="d"
Title="ScanGraphConfig" SizeToContent="WidthAndHeight" >
<Window.Resources>
<ResourceDictionary>
<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:,,,/ThickTcpUiInWindow;component/Culture/StringResource.zh-CN.xaml"/>-->
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</Window.Resources>
<Grid TextBlock.FontSize="24" TextBlock.FontStyle="Normal" >
<StackPanel Orientation="Vertical" Margin="5,20">
<Grid >
<Grid.ColumnDefinitions>
<ColumnDefinition/>
<ColumnDefinition Width="auto"/>
</Grid.ColumnDefinitions>
<StackPanel Orientation="Vertical" Margin="5">
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strTitle}" />
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource ResourceKey=TextBoxStyle_FieldContent}" Text="{Binding Title}" Tag="Full"/>
</StackPanel>
</StackPanel>
<StackPanel Grid.Column="1" Orientation="Horizontal">
<StackPanel Orientation="Vertical" Margin="5">
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="高级" />
<ToggleButton x:Name="togglebutton_adv" Style="{StaticResource ToggleButtonStyle1}" HorizontalAlignment="Left" />
</StackPanel>
<StackPanel Orientation="Vertical" Margin="5" Visibility="{Binding ElementName=togglebutton_adv, Path=IsChecked,Converter={StaticResource visbilityconv},ConverterParameter=Collapsed}">
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strCurveType}"/>
<ComboBox HorizontalAlignment="Left" Width="120">
<ComboBoxItem IsSelected="{Binding ChartType, Converter={StaticResource e2bconv}, ConverterParameter=Line }">
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent}" FontSize="32" Text="Line"/>
</ComboBoxItem>
<ComboBoxItem IsSelected="{Binding ChartType, Converter={StaticResource e2bconv}, ConverterParameter=Column }">
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent}" FontSize="32" Text="Column"/>
</ComboBoxItem>
<ComboBoxItem IsSelected="{Binding ChartType, Converter={StaticResource e2bconv}, ConverterParameter=Area }">
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent}" FontSize="32" Text="Area"/>
</ComboBoxItem>
</ComboBox>
</StackPanel>
</StackPanel>
</Grid>
<StackPanel Orientation="Horizontal">
<StackPanel Orientation="Vertical" Margin="5">
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strMixCnt}" />
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource ResourceKey=TextBoxStyle_FieldContent}" Text="{Binding Mix}" />
</StackPanel>
</StackPanel>
<StackPanel Orientation="Horizontal">
<StackPanel Orientation="Vertical" Margin="5">
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strMarkNo}" />
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource ResourceKey=TextBoxStyle_FieldContent}" Text="{Binding BM}" />
</StackPanel>
</StackPanel>
<Button Style="{StaticResource ButtonStyle_empty}" HorizontalAlignment="Right" Background="White" BorderThickness="0" VerticalAlignment="Bottom" Click="button1_Click" Margin="5">
<Path Data="{StaticResource Geometry_arrow-left-bold-circle}" Fill="{StaticResource Color_theme_activity}" Stretch="Fill" Height="50" Width="50" />
</Button>
<Button Style="{StaticResource ButtonStyle_empty}" HorizontalAlignment="Right" Background="White" BorderThickness="0" VerticalAlignment="Bottom" Click="button2_Click" Margin="5">
<Path Data="{StaticResource Geometry_arrow-right-bold-circle}" Fill="{StaticResource Color_theme_activity}" Stretch="Fill" Height="50" Width="50" />
</Button>
</StackPanel>
</StackPanel>
<StackPanel Orientation="Horizontal" >
<StackPanel Orientation="Vertical" Margin="5">
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strAutoTarget}" />
<ToggleButton Style="{StaticResource ToggleButtonStyle1}" HorizontalAlignment="Left" IsChecked="{Binding IsAutoTarget}" />
</StackPanel>
<StackPanel Orientation="Vertical" Margin="5">
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strPercentShow}" />
<ToggleButton Style="{StaticResource ToggleButtonStyle1}" HorizontalAlignment="Left" IsChecked="{Binding IsPercent}" />
</StackPanel>
<StackPanel Orientation="Horizontal" Visibility="{Binding ElementName=togglebutton_adv, Path=IsChecked,Converter={StaticResource visbilityconv},ConverterParameter=Collapsed}">
<StackPanel Orientation="Vertical" Margin="5">
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strAxisYMultiple}" />
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding YRangePercent}" />
</StackPanel>
</StackPanel>
<StackPanel Orientation="Vertical" Margin="5">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strAxisXInterval}" />
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding DataContext.XInterval,ElementName=stackpanel_params}" />
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="{DynamicResource strBolt}"/>
</StackPanel>
</StackPanel>
</StackPanel>
</StackPanel>
<StackPanel Orientation="Horizontal" x:Name="stackpanel_params" Visibility="{Binding ElementName=togglebutton_adv, Path=IsChecked,Converter={StaticResource visbilityconv},ConverterParameter=Collapsed}">
<StackPanel Orientation="Vertical" Margin="5">
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strDirectionIsReversed}" />
<ToggleButton Style="{StaticResource ToggleButtonStyle1}" IsChecked="{Binding IsReversed}" HorizontalAlignment="Left"/>
</StackPanel>
<StackPanel Orientation="Vertical" Margin="5">
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strShowLR}" />
<ToggleButton Name="togglebutton_lrisv" Style="{StaticResource ToggleButtonStyle1}" IsChecked="{Binding LRIsVisable}" HorizontalAlignment="Left"/>
</StackPanel>
<StackPanel Orientation="Vertical" Margin="5" Visibility="{Binding IsChecked,Converter={StaticResource ResourceKey=visbilityconv},ConverterParameter=Collapsed, ElementName=togglebutton_lrisv}">
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strLRIsReversed}" />
<ToggleButton Style="{StaticResource ToggleButtonStyle1}" IsChecked="{Binding LRIsReversed}" HorizontalAlignment="Left"/>
</StackPanel>
</StackPanel>
<Button Style="{StaticResource ButtonStyle2}" Content="{DynamicResource strSave}" Width="Auto" Margin="5" Click="button_save_Click"/>
</StackPanel>
</Grid>
</flyctrllib:WindowBigClose>
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/UIModule/ScanGraph/ScanGraphConfig.xaml.cs 0 → 100644
View file @ c9a7a9f5
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.Shapes;
namespace FLY.Thick.Blowing.UI.Fix.Client.UIModule
{
/// <summary>
/// Window_graphscan.xaml 的交互逻辑
/// </summary>
public partial class ScanGraphConfig : FLY.ControlLibrary.WindowBigClose
{
ScanGraphItemParam graphparam_scan;
public ScanGraphConfig()
{
InitializeComponent();
}
public void Init(ScanGraphItemParam graphparam_scan)
{
this.graphparam_scan = graphparam_scan;
this.DataContext = graphparam_scan;
this.stackpanel_params.DataContext = ScanGraphParams.Current;
}
private void button_save_Click(object sender, RoutedEventArgs e)
{
ScanGraphParams.Current.Save();
}
private void button1_Click(object sender, RoutedEventArgs e)
{
graphparam_scan.BM--;
}
private void button2_Click(object sender, RoutedEventArgs e)
{
graphparam_scan.BM++;
}
}
}
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/UIModule/TrendGraph/TrendGraph.xaml 0 → 100644
View file @ c9a7a9f5
<Page x:Class="FLY.Thick.Blowing.UI.Fix.Client.UIModule.TrendGraph"
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:ControlLibrary="clr-namespace:FLY.ControlLibrary;assembly=FLY.ControlLibrary"
mc:Ignorable="d"
d:DesignHeight="300" d:DesignWidth="300"
Title="TrendGraph">
<Grid>
<ControlLibrary:GraphRange x:Name="graphrange"/>
</Grid>
</Page>
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/UIModule/TrendGraph/TrendGraphConfig.xaml 0 → 100644
View file @ c9a7a9f5
<flyctrllib:WindowBigClose x:Class="FLY.Thick.Blowing.UI.Fix.Client.UIModule.TrendGraphConfig"
xmlns:flyctrllib="clr-namespace:FLY.ControlLibrary;assembly=FLY.ControlLibrary"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:props="clr-namespace:ThickTcpUiInWindow.Properties"
xmlns:my="clr-namespace:FLY.ControlLibrary;assembly=FLY.ControlLibrary"
Title="Window_graphtrend"
mc:Ignorable="d"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:ThickTcpUiInWindow"
SizeToContent="WidthAndHeight"
>
<Window.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/Dictionary_MyStyle.xaml"/>
<ResourceDictionary Source="pack://application:,,,/ThickTcpUiInWindow;component/Converter/Dictionary_MyConv.xaml"/>
<!--<ResourceDictionary Source="pack://application:,,,/ThickTcpUiInWindow;component/Culture/StringResource.zh-CN.xaml"/>-->
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</Window.Resources>
<Grid TextBlock.FontSize="24" TextBlock.FontStyle="Normal" Width="400">
<StackPanel Orientation="Vertical" Margin="5,20">
<StackPanel Orientation="Vertical" Margin="5">
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strTitle}" />
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource ResourceKey=TextBoxStyle_FieldContent}" Text="{Binding Title}" Tag="Full"/>
</StackPanel>
</StackPanel>
<WrapPanel Orientation="Horizontal">
<StackPanel Orientation="Vertical" Margin="5">
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strMixCnt}" />
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource ResourceKey=TextBoxStyle_FieldContent}" Text="{Binding Mix}" />
</StackPanel>
</StackPanel>
<StackPanel Orientation="Vertical" Margin="5">
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strDataCnt}" />
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource ResourceKey=TextBoxStyle_FieldContent}" Text="{Binding Len}" />
</StackPanel>
</StackPanel>
<StackPanel Orientation="Vertical" Margin="5">
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strCurveType}"/>
<ComboBox HorizontalAlignment="Left" MinWidth="100">
<ComboBoxItem IsSelected="{Binding Type, Converter={StaticResource e2bconv}, ConverterParameter={x:Static flyctrllib:GraphRangeType.Sigma2} }">
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent}" FontSize="32" Text="2σ"/>
</ComboBoxItem>
<ComboBoxItem IsSelected="{Binding Type, Converter={StaticResource e2bconv}, ConverterParameter={x:Static flyctrllib:GraphRangeType.Avg}}">
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent}" FontSize="32" Text="{DynamicResource strAvg}"/>
</ComboBoxItem>
<ComboBoxItem IsSelected="{Binding Type, Converter={StaticResource e2bconv}, ConverterParameter={x:Static flyctrllib:GraphRangeType.All}}" >
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent}" FontSize="32" >
<Run Text="2σ+"/><Run Text="{DynamicResource strAvg}"/>
</TextBlock>
</ComboBoxItem>
</ComboBox>
</StackPanel>
<StackPanel Orientation="Vertical" Margin="5">
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strAxisXType}" />
<ComboBox HorizontalAlignment="Left" MinWidth="100">
<ComboBoxItem IsSelected="{Binding XType, Converter={StaticResource e2bconv}, ConverterParameter={x:Static flyctrllib:GraphRangeXAxisType.Time}}">
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent}" FontSize="32" Text="{DynamicResource strTime}"/>
</ComboBoxItem>
<ComboBoxItem IsSelected="{Binding XType, Converter={StaticResource e2bconv}, ConverterParameter={x:Static flyctrllib:GraphRangeXAxisType.Index}}">
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent}" FontSize="32" Text="{DynamicResource strIndex}"/>
</ComboBoxItem>
</ComboBox>
</StackPanel>
<StackPanel Orientation="Horizontal" Visibility="{Binding IsChecked,Converter={StaticResource ResourceKey=visbilityconv},ConverterParameter=CollapsedWhenTrue, ElementName=toggleButton_isAll}">
<StackPanel Orientation="Vertical" Margin="5">
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strBeginBoltNo}" />
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource ResourceKey=TextBoxStyle_FieldContent}" Text="{Binding BeginNo}" />
</StackPanel>
</StackPanel>
<StackPanel Orientation="Vertical" Margin="5" >
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strEndBoltNo}" />
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource ResourceKey=TextBoxStyle_FieldContent}" Text="{Binding EndNo}" />
</StackPanel>
</StackPanel>
</StackPanel>
<StackPanel Orientation="Vertical" Margin="5">
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strAllAvg}" />
<ToggleButton Name="toggleButton_isAll" Style="{StaticResource ToggleButtonStyle1}" HorizontalAlignment="Left" IsChecked="{Binding IsAll}" />
</StackPanel>
</WrapPanel>
<StackPanel Orientation="Horizontal" >
<StackPanel Orientation="Vertical" Margin="5">
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strAutoTarget}" />
<ToggleButton Style="{StaticResource ToggleButtonStyle1}" HorizontalAlignment="Left" IsChecked="{Binding IsAutoTarget}" />
</StackPanel>
<StackPanel Orientation="Vertical" Margin="5">
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strPercentShow}" />
<ToggleButton Style="{StaticResource ToggleButtonStyle1}" HorizontalAlignment="Left" IsChecked="{Binding IsPercent}" />
</StackPanel>
<StackPanel Orientation="Vertical" Margin="5">
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strAxisYMultiple}" />
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource ResourceKey=TextBoxStyle_FieldContent}" Text="{Binding YRangePercent}" />
</StackPanel>
</StackPanel>
</StackPanel>
<Button Style="{StaticResource ButtonStyle2}" Content="{DynamicResource strSave}" Width="auto" Margin="5" Click="button_save_Click"/>
</StackPanel>
</Grid>
</flyctrllib:WindowBigClose >
\ No newline at end of file
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/UIModule/TrendGraph/TrendGraphConfig.xaml.cs 0 → 100644
View file @ c9a7a9f5
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.Shapes;
using System.ComponentModel;
using ThickTcpUiInWindow.Converter;
using FLY.ControlLibrary;
namespace FLY.Thick.Blowing.UI.Fix.Client.UIModule
{
/// <summary>
/// Window_graphtrend.xaml 的交互逻辑
/// </summary>
public partial class TrendGraphConfig : FLY.ControlLibrary.WindowBigClose
{
public TrendGraphConfig()
{
InitializeComponent();
}
public event EventHandler SaveEvent;
private void button_save_Click(object sender, RoutedEventArgs e)
{
if (SaveEvent != null)
SaveEvent.Invoke(this, new EventArgs());
}
}
}
hemei.sln
View file @ c9a7a9f5
...@@ -73,14 +73,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TCPManager", "thick_public\ ...@@ -73,14 +73,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TCPManager", "thick_public\
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Thick-Common", "Thick-Common", "{2488C4FB-3677-405B-BE1B-C9F532708DE3}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Thick-Common", "Thick-Common", "{2488C4FB-3677-405B-BE1B-C9F532708DE3}"
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Thick-Scan", "Thick-Scan", "{58EB0B95-13F3-4D21-B6CD-B680E8D3D8AD}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FLY.Thick.BlowingScan", "Project.FLY.Thick.BlowingScan\FLY.Thick.BlowingScan\FLY.Thick.BlowingScan.csproj", "{966D9971-7AA4-4B1B-ABB6-E09C3F04F6EE}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FLY.Thick.BlowingScan.UI.Client", "Project.FLY.Thick.BlowingScan\FLY.Thick.BlowingScan.UI.Client\FLY.Thick.BlowingScan.UI.Client.csproj", "{608CADD8-B4A0-46C9-A60E-A07FFFA9AAF0}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FLY.Thick.BlowingScan.UI.Server", "Project.FLY.Thick.BlowingScan\FLY.Thick.BlowingScan.UI.Server\FLY.Thick.BlowingScan.UI.Server.csproj", "{D42B0F14-C68A-415D-922B-B3BEACC75405}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQLiteHelper", "thick_public\Project.SQLiteHelper\SQLiteHelper\SQLiteHelper.csproj", "{4CBABFAA-1C62-4510-AC63-A51EE5FD50FF}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQLiteHelper", "thick_public\Project.SQLiteHelper\SQLiteHelper\SQLiteHelper.csproj", "{4CBABFAA-1C62-4510-AC63-A51EE5FD50FF}"
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Integrated", "Integrated", "{B3B684FF-D5C5-441F-B69C-E75841AE17F6}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Integrated", "Integrated", "{B3B684FF-D5C5-441F-B69C-E75841AE17F6}"
...@@ -96,7 +88,8 @@ EndProject ...@@ -96,7 +88,8 @@ EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FLY.HeatingHelper", "Project.FLY.ThickHeatAnalyst.Fix\FLY.HeatingHelper\FLY.HeatingHelper.csproj", "{973F0EED-3181-4FB9-ABD6-196A9E816B77}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FLY.HeatingHelper", "Project.FLY.ThickHeatAnalyst.Fix\FLY.HeatingHelper\FLY.HeatingHelper.csproj", "{973F0EED-3181-4FB9-ABD6-196A9E816B77}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FLY.HeatingHelper.UI", "Project.FLY.ThickHeatAnalyst.Fix\FLY.HeatingHelper.UI\FLY.HeatingHelper.UI.csproj", "{276EE86A-0961-4C69-A38A-696F4D76E931}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FLY.HeatingHelper.UI", "Project.FLY.ThickHeatAnalyst.Fix\FLY.HeatingHelper.UI\FLY.HeatingHelper.UI.csproj", "{276EE86A-0961-4C69-A38A-696F4D76E931}"
EndProjectGlobal EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
Debug|Mixed Platforms = Debug|Mixed Platforms Debug|Mixed Platforms = Debug|Mixed Platforms
...@@ -440,38 +433,6 @@ EndProjectGlobal ...@@ -440,38 +433,6 @@ EndProjectGlobal
{7D455950-7D7D-4C79-8E9C-4CF53F09559A}.Release|Mixed Platforms.Build.0 = Release|Any CPU {7D455950-7D7D-4C79-8E9C-4CF53F09559A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{7D455950-7D7D-4C79-8E9C-4CF53F09559A}.Release|x86.ActiveCfg = Release|Any CPU {7D455950-7D7D-4C79-8E9C-4CF53F09559A}.Release|x86.ActiveCfg = Release|Any CPU
{7D455950-7D7D-4C79-8E9C-4CF53F09559A}.Release|x86.Build.0 = Release|Any CPU {7D455950-7D7D-4C79-8E9C-4CF53F09559A}.Release|x86.Build.0 = Release|Any CPU
{966D9971-7AA4-4B1B-ABB6-E09C3F04F6EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{966D9971-7AA4-4B1B-ABB6-E09C3F04F6EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{966D9971-7AA4-4B1B-ABB6-E09C3F04F6EE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{966D9971-7AA4-4B1B-ABB6-E09C3F04F6EE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{966D9971-7AA4-4B1B-ABB6-E09C3F04F6EE}.Debug|x86.ActiveCfg = Debug|Any CPU
{966D9971-7AA4-4B1B-ABB6-E09C3F04F6EE}.Debug|x86.Build.0 = Debug|Any CPU
{966D9971-7AA4-4B1B-ABB6-E09C3F04F6EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{966D9971-7AA4-4B1B-ABB6-E09C3F04F6EE}.Release|Any CPU.Build.0 = Release|Any CPU
{966D9971-7AA4-4B1B-ABB6-E09C3F04F6EE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{966D9971-7AA4-4B1B-ABB6-E09C3F04F6EE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{966D9971-7AA4-4B1B-ABB6-E09C3F04F6EE}.Release|x86.ActiveCfg = Release|Any CPU
{966D9971-7AA4-4B1B-ABB6-E09C3F04F6EE}.Release|x86.Build.0 = Release|Any CPU
{608CADD8-B4A0-46C9-A60E-A07FFFA9AAF0}.Debug|Any CPU.ActiveCfg = Debug|x86
{608CADD8-B4A0-46C9-A60E-A07FFFA9AAF0}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
{608CADD8-B4A0-46C9-A60E-A07FFFA9AAF0}.Debug|Mixed Platforms.Build.0 = Debug|x86
{608CADD8-B4A0-46C9-A60E-A07FFFA9AAF0}.Debug|x86.ActiveCfg = Debug|x86
{608CADD8-B4A0-46C9-A60E-A07FFFA9AAF0}.Debug|x86.Build.0 = Debug|x86
{608CADD8-B4A0-46C9-A60E-A07FFFA9AAF0}.Release|Any CPU.ActiveCfg = Release|x86
{608CADD8-B4A0-46C9-A60E-A07FFFA9AAF0}.Release|Mixed Platforms.ActiveCfg = Release|x86
{608CADD8-B4A0-46C9-A60E-A07FFFA9AAF0}.Release|Mixed Platforms.Build.0 = Release|x86
{608CADD8-B4A0-46C9-A60E-A07FFFA9AAF0}.Release|x86.ActiveCfg = Release|x86
{608CADD8-B4A0-46C9-A60E-A07FFFA9AAF0}.Release|x86.Build.0 = Release|x86
{D42B0F14-C68A-415D-922B-B3BEACC75405}.Debug|Any CPU.ActiveCfg = Debug|x86
{D42B0F14-C68A-415D-922B-B3BEACC75405}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
{D42B0F14-C68A-415D-922B-B3BEACC75405}.Debug|Mixed Platforms.Build.0 = Debug|x86
{D42B0F14-C68A-415D-922B-B3BEACC75405}.Debug|x86.ActiveCfg = Debug|x86
{D42B0F14-C68A-415D-922B-B3BEACC75405}.Debug|x86.Build.0 = Debug|x86
{D42B0F14-C68A-415D-922B-B3BEACC75405}.Release|Any CPU.ActiveCfg = Release|x86
{D42B0F14-C68A-415D-922B-B3BEACC75405}.Release|Mixed Platforms.ActiveCfg = Release|x86
{D42B0F14-C68A-415D-922B-B3BEACC75405}.Release|Mixed Platforms.Build.0 = Release|x86
{D42B0F14-C68A-415D-922B-B3BEACC75405}.Release|x86.ActiveCfg = Release|x86
{D42B0F14-C68A-415D-922B-B3BEACC75405}.Release|x86.Build.0 = Release|x86
{4CBABFAA-1C62-4510-AC63-A51EE5FD50FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4CBABFAA-1C62-4510-AC63-A51EE5FD50FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4CBABFAA-1C62-4510-AC63-A51EE5FD50FF}.Debug|Any CPU.Build.0 = Debug|Any CPU {4CBABFAA-1C62-4510-AC63-A51EE5FD50FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4CBABFAA-1C62-4510-AC63-A51EE5FD50FF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU {4CBABFAA-1C62-4510-AC63-A51EE5FD50FF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
...@@ -508,6 +469,18 @@ EndProjectGlobal ...@@ -508,6 +469,18 @@ EndProjectGlobal
{9C4DA30F-91FF-42B9-A622-6748B753F07E}.Release|Mixed Platforms.Build.0 = Release|Any CPU {9C4DA30F-91FF-42B9-A622-6748B753F07E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{9C4DA30F-91FF-42B9-A622-6748B753F07E}.Release|x86.ActiveCfg = Release|Any CPU {9C4DA30F-91FF-42B9-A622-6748B753F07E}.Release|x86.ActiveCfg = Release|Any CPU
{9C4DA30F-91FF-42B9-A622-6748B753F07E}.Release|x86.Build.0 = Release|Any CPU {9C4DA30F-91FF-42B9-A622-6748B753F07E}.Release|x86.Build.0 = Release|Any CPU
{CC941BE1-1A92-4830-B8DD-E743939BA8BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CC941BE1-1A92-4830-B8DD-E743939BA8BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CC941BE1-1A92-4830-B8DD-E743939BA8BA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{CC941BE1-1A92-4830-B8DD-E743939BA8BA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{CC941BE1-1A92-4830-B8DD-E743939BA8BA}.Debug|x86.ActiveCfg = Debug|Any CPU
{CC941BE1-1A92-4830-B8DD-E743939BA8BA}.Debug|x86.Build.0 = Debug|Any CPU
{CC941BE1-1A92-4830-B8DD-E743939BA8BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CC941BE1-1A92-4830-B8DD-E743939BA8BA}.Release|Any CPU.Build.0 = Release|Any CPU
{CC941BE1-1A92-4830-B8DD-E743939BA8BA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{CC941BE1-1A92-4830-B8DD-E743939BA8BA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{CC941BE1-1A92-4830-B8DD-E743939BA8BA}.Release|x86.ActiveCfg = Release|Any CPU
{CC941BE1-1A92-4830-B8DD-E743939BA8BA}.Release|x86.Build.0 = Release|Any CPU
{973F0EED-3181-4FB9-ABD6-196A9E816B77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {973F0EED-3181-4FB9-ABD6-196A9E816B77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{973F0EED-3181-4FB9-ABD6-196A9E816B77}.Debug|Any CPU.Build.0 = Debug|Any CPU {973F0EED-3181-4FB9-ABD6-196A9E816B77}.Debug|Any CPU.Build.0 = Debug|Any CPU
{973F0EED-3181-4FB9-ABD6-196A9E816B77}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU {973F0EED-3181-4FB9-ABD6-196A9E816B77}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
...@@ -531,18 +504,6 @@ EndProjectGlobal ...@@ -531,18 +504,6 @@ EndProjectGlobal
{276EE86A-0961-4C69-A38A-696F4D76E931}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {276EE86A-0961-4C69-A38A-696F4D76E931}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{276EE86A-0961-4C69-A38A-696F4D76E931}.Release|Mixed Platforms.Build.0 = Release|Any CPU {276EE86A-0961-4C69-A38A-696F4D76E931}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{276EE86A-0961-4C69-A38A-696F4D76E931}.Release|x86.ActiveCfg = Release|Any CPU {276EE86A-0961-4C69-A38A-696F4D76E931}.Release|x86.ActiveCfg = Release|Any CPU
{CC941BE1-1A92-4830-B8DD-E743939BA8BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CC941BE1-1A92-4830-B8DD-E743939BA8BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CC941BE1-1A92-4830-B8DD-E743939BA8BA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{CC941BE1-1A92-4830-B8DD-E743939BA8BA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{CC941BE1-1A92-4830-B8DD-E743939BA8BA}.Debug|x86.ActiveCfg = Debug|Any CPU
{CC941BE1-1A92-4830-B8DD-E743939BA8BA}.Debug|x86.Build.0 = Debug|Any CPU
{CC941BE1-1A92-4830-B8DD-E743939BA8BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CC941BE1-1A92-4830-B8DD-E743939BA8BA}.Release|Any CPU.Build.0 = Release|Any CPU
{CC941BE1-1A92-4830-B8DD-E743939BA8BA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{CC941BE1-1A92-4830-B8DD-E743939BA8BA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{CC941BE1-1A92-4830-B8DD-E743939BA8BA}.Release|x86.ActiveCfg = Release|Any CPU
{CC941BE1-1A92-4830-B8DD-E743939BA8BA}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
...@@ -576,9 +537,6 @@ EndProjectGlobal ...@@ -576,9 +537,6 @@ EndProjectGlobal
{9C46D98F-6500-490B-9E56-C89DFFFA05F8} = {2488C4FB-3677-405B-BE1B-C9F532708DE3} {9C46D98F-6500-490B-9E56-C89DFFFA05F8} = {2488C4FB-3677-405B-BE1B-C9F532708DE3}
{DD8A6858-1261-49F7-86BE-5AC5C3A0EC34} = {2488C4FB-3677-405B-BE1B-C9F532708DE3} {DD8A6858-1261-49F7-86BE-5AC5C3A0EC34} = {2488C4FB-3677-405B-BE1B-C9F532708DE3}
{7D455950-7D7D-4C79-8E9C-4CF53F09559A} = {2488C4FB-3677-405B-BE1B-C9F532708DE3} {7D455950-7D7D-4C79-8E9C-4CF53F09559A} = {2488C4FB-3677-405B-BE1B-C9F532708DE3}
{966D9971-7AA4-4B1B-ABB6-E09C3F04F6EE} = {58EB0B95-13F3-4D21-B6CD-B680E8D3D8AD}
{608CADD8-B4A0-46C9-A60E-A07FFFA9AAF0} = {58EB0B95-13F3-4D21-B6CD-B680E8D3D8AD}
{D42B0F14-C68A-415D-922B-B3BEACC75405} = {58EB0B95-13F3-4D21-B6CD-B680E8D3D8AD}
{4CBABFAA-1C62-4510-AC63-A51EE5FD50FF} = {2488C4FB-3677-405B-BE1B-C9F532708DE3} {4CBABFAA-1C62-4510-AC63-A51EE5FD50FF} = {2488C4FB-3677-405B-BE1B-C9F532708DE3}
{83971044-3F20-4912-9528-52CBEBBA0999} = {B3B684FF-D5C5-441F-B69C-E75841AE17F6} {83971044-3F20-4912-9528-52CBEBBA0999} = {B3B684FF-D5C5-441F-B69C-E75841AE17F6}
{9C4DA30F-91FF-42B9-A622-6748B753F07E} = {B3B684FF-D5C5-441F-B69C-E75841AE17F6} {9C4DA30F-91FF-42B9-A622-6748B753F07E} = {B3B684FF-D5C5-441F-B69C-E75841AE17F6}
......
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