Skip to content

H
hemei
Commit a0a30b9c authored by 潘栩锋's avatar 潘栩锋 :bicyclist:
Browse files
Options

添加 称重添加吸料

parent be2ae018
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1217 additions and 400 deletions
Project.FLY.DownBlowing/FLY.DownBlowing.UI.Client/UiModule/FeederPanel/FeederPanel2.xaml.cs
View file @ a0a30b9c
......@@ -44,7 +44,7 @@ namespace FLY.DownBlowing.UI.Client.UiModule
if (this.downBlowingSystemService is DownBlowingSystemServiceClient)
{
(this.downBlowingSystemService as DownBlowingSystemServiceClient).ResetTAreasEvent += ResetItemsEvent;
(this.downBlowingSystemService as DownBlowingSystemServiceClient).ResetFeederDatasEvent += ResetItemsEvent;
}
}
......@@ -83,7 +83,7 @@ namespace FLY.DownBlowing.UI.Client.UiModule
{
if (setPlan_feederDatas.Count() == 0)
{
for (int i = 0; i < this.downBlowingSystemService.TAreas.Count(); i++)
for (int i = 0; i < this.downBlowingSystemService.FeederDatas.Count(); i++)
{
string objname = $"{nameof(IDownBlowingSystemService.FeederDatas)}[{i}]";
SetPLCUpdatePlan plan = new SetPLCUpdatePlan(
......
Project.FLY.Weight/FLY.Weight.UI.Client/App.xaml
View file @ a0a30b9c
<Application x:Class="FLY.Weight.UI.Client.App"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:ut="clr-namespace:FLY.Weight.UI.Client.UnitTests"
>
<Application.Resources>
<ResourceDictionary>
......@@ -10,6 +11,9 @@
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Themes/Light.Blue.xaml" />
</ResourceDictionary.MergedDictionaries>
<Style TargetType="GroupBox" />
<ut:UnitTests_Weights x:Key="unittests_weighters" />
<ut:UnitTests_FlowGraphModelView x:Key="unittests_flowgraphmv"/>
<ut:FeederSystemServiceUt x:Key="feederSystemUt" />
</ResourceDictionary>
</Application.Resources>
</Application>
Project.FLY.Weight/FLY.Weight.UI.Client/FLY.Weight.UI.Client.csproj
View file @ a0a30b9c
......@@ -92,6 +92,13 @@
<Compile Include="PgReduce.xaml.cs">
<DependentUpon>PgReduce.xaml</DependentUpon>
</Compile>
<Compile Include="UiModule\FeederPanel\FeederPanel2.xaml.cs">
<DependentUpon>FeederPanel2.xaml</DependentUpon>
</Compile>
<Compile Include="UiModule\FeederPanel\UcFeeder2.xaml.cs">
<DependentUpon>UcFeeder2.xaml</DependentUpon>
</Compile>
<Compile Include="UiModule\FeederPanel\UiModule2_FeederPanel.cs" />
<Compile Include="UiModule\V4\MenuSettingV4.xaml.cs">
<DependentUpon>MenuSettingV4.xaml</DependentUpon>
</Compile>
......@@ -215,6 +222,7 @@
<Compile Include="UiModule\V4\WdThicknessV4.xaml.cs">
<DependentUpon>WdThicknessV4.xaml</DependentUpon>
</Compile>
<Compile Include="UnitTests\FeederSystemServiceUt.cs" />
<Compile Include="UnitTests\UnitTests_BufferWindow.cs" />
<Compile Include="UnitTests\WeighterCsService.cs" />
<Compile Include="WdDensitySet.xaml.cs">
......@@ -262,6 +270,10 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Themes\Color.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Themes\DataGridStyle.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
......@@ -270,6 +282,22 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="UiModule\FeederPanel\FeederPanel2.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="UiModule\FeederPanel\FeederPanelStyle.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="UiModule\FeederPanel\FeederStyle.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="UiModule\FeederPanel\UcFeeder2.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="UiModule\V4\MenuSettingV4.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
......@@ -430,15 +458,11 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="UnitTests\UnitTests_Weights.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Themes\ABCTab.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Themes\DarkSkin.xaml">
<Page Include="Themes\Color.Dark.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
......@@ -450,7 +474,7 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Themes\LightSkin.xaml">
<Page Include="Themes\Color.Light.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
......@@ -499,19 +523,6 @@
</None>
<AppDesigner Include="Properties\" />
</ItemGroup>
<ItemGroup>
<Resource Include="Images\info.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Images\close.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Images\gear.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Images\connect.png" />
<Resource Include="Images\disconnect.png" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\thick_public\MultiLayout\MultiLayout.csproj">
<Project>{5BBE76F5-CFD7-4DFA-9EE5-0C47D77D96E6}</Project>
......@@ -564,6 +575,9 @@
<Version>3.3.1</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Images\" />
</ItemGroup>
<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')" />
</Project>
\ No newline at end of file
Project.FLY.Weight/FLY.Weight.UI.Client/Images/close.png deleted 100644 → 0
View file @ be2ae018
Project.FLY.Weight/FLY.Weight.UI.Client/Images/close.png

1.39 KB

Project.FLY.Weight/FLY.Weight.UI.Client/Images/connect.png deleted 100644 → 0
View file @ be2ae018
Project.FLY.Weight/FLY.Weight.UI.Client/Images/connect.png

619 Bytes

Project.FLY.Weight/FLY.Weight.UI.Client/Images/disconnect.png deleted 100644 → 0
View file @ be2ae018
Project.FLY.Weight/FLY.Weight.UI.Client/Images/disconnect.png

1.1 KB

Project.FLY.Weight/FLY.Weight.UI.Client/Images/gear.png deleted 100644 → 0
View file @ be2ae018
Project.FLY.Weight/FLY.Weight.UI.Client/Images/gear.png

1.91 KB

Project.FLY.Weight/FLY.Weight.UI.Client/Images/info.png deleted 100644 → 0
View file @ be2ae018
Project.FLY.Weight/FLY.Weight.UI.Client/Images/info.png

991 Bytes

Project.FLY.Weight/FLY.Weight.UI.Client/PgIngredient.xaml
View file @ a0a30b9c
......@@ -14,7 +14,6 @@
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/Dictionary_MyStyle.xaml"/>
<ResourceDictionary Source="pack://application:,,,/FLY.Weight.UI.Client;component/Themes/ABCTab.xaml"/>
<ResourceDictionary Source="pack://application:,,,/FLY.Weight.UI.Client;component/UnitTests/UnitTests_Weights.xaml"/>
</ResourceDictionary.MergedDictionaries>
<Style x:Key="TabItemStyle_ABC2" TargetType="{x:Type TabItem}">
......@@ -98,28 +97,28 @@
<StackPanel Margin="5">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="偏差" Foreground="{Binding BorderBrush,ElementName=groupbox_1}"/>
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource Styles.Text.FieldContent.Input}" Text="{Binding FeedingDeviation,StringFormat={}{0:F3}}"/>
<TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding FeedingDeviation,StringFormat={}{0:F3}}"/>
<TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" Text="kg" />
</StackPanel>
</StackPanel>
<StackPanel Margin="5">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="设置" Foreground="{Binding BorderBrush,ElementName=groupbox_1}"/>
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource Styles.Text.FieldContent.Input}" Text="{Binding FeedSet,StringFormat={}{0:F3}}"/>
<TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding FeedSet,StringFormat={}{0:F3}}"/>
<TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" Text="kg" />
</StackPanel>
</StackPanel>
<StackPanel Margin="5">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="料仓报警" Foreground="{Binding BorderBrush,ElementName=groupbox_1}"/>
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource Styles.Text.FieldContent.Input}" Text="{Binding BinAlarmSet,StringFormat={}{0:F0}}"/>
<TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding BinAlarmSet,StringFormat={}{0:F0}}"/>
<TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" Text="%" />
</StackPanel>
</StackPanel>
<StackPanel Margin="5">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="配料报警偏差大比例" Foreground="{Binding BorderBrush,ElementName=groupbox_1}"/>
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource Styles.Text.FieldContent.Input}" Text="{Binding DosingLargeDeviationPSet,StringFormat={}{0:F2}}"/>
<TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding DosingLargeDeviationPSet,StringFormat={}{0:F2}}"/>
</StackPanel>
</StackPanel>
</StackPanel>
......@@ -157,21 +156,21 @@
<StackPanel Margin="5">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="初始" Foreground="{Binding BorderBrush,ElementName=groupbox_1}"/>
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource Styles.Text.FieldContent.Input}" Text="{Binding InitTime,StringFormat={}{0:F3}}"/>
<TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding InitTime,StringFormat={}{0:F3}}"/>
<TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" Text="s" />
</StackPanel>
</StackPanel>
<StackPanel Margin="5">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="最小" Foreground="{Binding BorderBrush,ElementName=groupbox_1}"/>
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource Styles.Text.FieldContent.Input}" Text="{Binding MinTime,StringFormat={}{0:F3}}"/>
<TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding MinTime,StringFormat={}{0:F3}}"/>
<TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" Text="s" />
</StackPanel>
</StackPanel>
<StackPanel Margin="5">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="稳定" Foreground="{Binding BorderBrush,ElementName=groupbox_1}"/>
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource Styles.Text.FieldContent.Input}" Text="{Binding StableTime,StringFormat={}{0:F3}}"/>
<TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding StableTime,StringFormat={}{0:F3}}"/>
<TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" Text="s" />
</StackPanel>
</StackPanel>
......
Project.FLY.Weight/FLY.Weight.UI.Client/PgMenu.xaml
View file @ a0a30b9c
......@@ -15,7 +15,6 @@
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/Dictionary_MyStyle.xaml"/>
<ResourceDictionary Source="pack://application:,,,/FLY.Weight.UI.Client;component/Converter/Dictionary_MyConv.xaml"/>
<ResourceDictionary Source="pack://application:,,,/FLY.Weight.UI.Client;component/UnitTests/UnitTests_Weights.xaml"/>
</ResourceDictionary.MergedDictionaries>
<misc:Ver x:Key="version" SrcType="{x:Type local:PgMenu}"/>
</ResourceDictionary>
......@@ -30,7 +29,7 @@
<Button Style="{StaticResource ButtonStyle_back}" Command="BrowseBack"/>
</StackPanel>
<StackPanel Orientation="Horizontal" FlowDirection="RightToLeft">
<StackPanel Orientation="Vertical" DataContext="{StaticResource version}">
<StackPanel DataContext="{StaticResource version}">
<Button Style="{StaticResource Styles.Button.Empty}" Background="{x:Null}" Click="button_version_Click" VerticalAlignment="Center">
<TextBlock Text="{Binding .}" FontSize="24" FontWeight="Bold" Margin="15" />
</Button>
......@@ -49,7 +48,7 @@
</Grid.RowDefinitions>
<WrapPanel x:Name="wrappanel_root" Orientation="Vertical" Grid.Column="1" d:DataContext="{StaticResource unittests_weighters}">
<WrapPanel.Resources>
<Style TargetType="Button" BasedOn="{StaticResource ResourceKey=Styles.Button.Empty}">
<Style TargetType="Button" BasedOn="{StaticResource Styles.Button.Empty}">
<Setter Property="Background" Value="#FF0083D7"/>
<Setter Property="Width" Value="225"/>
<Setter Property="Height" Value="140"/>
......
Project.FLY.Weight/FLY.Weight.UI.Client/PgMenuV4.xaml
View file @ a0a30b9c
......@@ -15,7 +15,6 @@
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/Dictionary_MyStyle.xaml"/>
<ResourceDictionary Source="pack://application:,,,/FLY.Weight.UI.Client;component/Converter/Dictionary_MyConv.xaml"/>
<ResourceDictionary Source="pack://application:,,,/FLY.Weight.UI.Client;component/UnitTests/UnitTests_Weights.xaml"/>
</ResourceDictionary.MergedDictionaries>
<misc:Ver x:Key="version" SrcType="{x:Type local:PgMenu}"/>
</ResourceDictionary>
......@@ -30,7 +29,7 @@
<Button Style="{StaticResource ButtonStyle_back}" Command="BrowseBack"/>
</StackPanel>
<StackPanel Orientation="Horizontal" FlowDirection="RightToLeft">
<StackPanel Orientation="Vertical" DataContext="{StaticResource version}">
<StackPanel DataContext="{StaticResource version}">
<Button Style="{StaticResource Styles.Button.Empty}" Background="{x:Null}" Click="button_version_Click" VerticalAlignment="Center">
<TextBlock Text="{Binding .}" FontSize="24" FontWeight="Bold" Margin="15" />
</Button>
......@@ -49,7 +48,7 @@
</Grid.RowDefinitions>
<WrapPanel x:Name="wrappanel_root" Orientation="Vertical" Grid.Column="1" d:DataContext="{StaticResource unittests_weighters}">
<WrapPanel.Resources>
<Style TargetType="Button" BasedOn="{StaticResource ResourceKey=Styles.Button.Empty}">
<Style TargetType="Button" BasedOn="{StaticResource Styles.Button.Empty}">
<Setter Property="Background" Value="#FF0083D7"/>
<Setter Property="Width" Value="225"/>
<Setter Property="Height" Value="140"/>
......
Project.FLY.Weight/FLY.Weight.UI.Client/PgMixTable.xaml
View file @ a0a30b9c
......@@ -24,15 +24,15 @@
<RowDefinition Height="496*" />
</Grid.RowDefinitions>
<Grid Background="{StaticResource Background_Title}">
<Grid Background="{StaticResource Brushes.TitleBar.Background}">
<Grid.ColumnDefinitions>
<ColumnDefinition/>
<ColumnDefinition Width="auto"/>
</Grid.ColumnDefinitions>
<StackPanel Orientation="Horizontal" >
<Button Style="{StaticResource ButtonStyle_back2}" Command="BrowseBack" />
<Button Style="{StaticResource Styles.TitleBar.BackButton2}" Command="BrowseBack" />
<TextBlock Style="{StaticResource TextBlockStyle_Title}" DataContext="{Binding Item}" >
<TextBlock Style="{StaticResource Styles.TitleBar.Text}" DataContext="{Binding Item}" >
<Run Text="{Binding Number}" FontFamily="Arial Black"/><Run Text="配料记录"/>
</TextBlock>
</StackPanel>
......@@ -47,22 +47,22 @@
<WrapPanel>
<StackPanel Orientation="Horizontal" Margin="{StaticResource ControlMargin}">
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="显示" />
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="显示" />
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding WindowSize}" />
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="行"/>
<TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding WindowSize}" />
<TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" Text="行"/>
</StackPanel>
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="按时间查找" />
<ToggleButton Style="{StaticResource ToggleButtonStyle1}" HorizontalAlignment="Left" IsChecked="{Binding IsSearchByTime}" />
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="按时间查找" />
<ToggleButton Style="{StaticResource Styles.ToggleButton.YESNO}" HorizontalAlignment="Left" IsChecked="{Binding IsSearchByTime}" />
</StackPanel>
<Grid Margin="{StaticResource ControlMargin}">
<StackPanel Visibility="{Binding IsSearchByTime,Converter={StaticResource visbilityconv},ConverterParameter=CollapsedWhenTrue}" >
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="查找ID" />
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="查找ID" />
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding SearchId}" />
<TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding SearchId}" />
</StackPanel>
</StackPanel>
<DatePicker
......@@ -77,28 +77,28 @@
controls:TextBoxHelper.WatermarkAlignment="Right"
SelectedDate="{Binding SearchTime}"/>
</Grid>
<Button Style="{StaticResource ButtonStyle_RectangleIcon}" Command="{Binding SearchCmd}">
<Button Style="{StaticResource Styles.Button.Icon.Rectangle}" Command="{Binding SearchCmd}">
<iconPacks:PackIconMaterial Kind="Magnify" />
</Button>
</StackPanel>
<StackPanel Orientation="Horizontal" Margin="{StaticResource ControlMargin}">
<Button Style="{StaticResource ButtonStyle_RectangleIcon}" Command="{Binding PreViewCmd}">
<Button Style="{StaticResource Styles.Button.Icon.Rectangle}" Command="{Binding PreViewCmd}">
<Grid>
<iconPacks:PackIconMaterial Kind="ArrowLeft" />
</Grid>
</Button>
<StackPanel VerticalAlignment="Center">
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" >
<TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" >
<Run Text="最新ID:"/><Run Text="{Binding LastId,Mode=OneWay}"/>
</TextBlock>
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" >
<TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" >
<Run Text="当前ID:"/><Run Text="{Binding Id,Mode=OneWay}"/>
</TextBlock>
</StackPanel>
<Button Command="{Binding NextViewCmd}">
<Button.Style>
<Style TargetType="Button" BasedOn="{StaticResource ButtonStyle_RectangleIcon}">
<Style TargetType="Button" BasedOn="{StaticResource Styles.Button.Icon.Rectangle}">
<Style.Triggers>
<DataTrigger Binding="{Binding IsNewest}" Value="True">
<Setter Property="Foreground" Value="Gray"/>
......@@ -113,7 +113,7 @@
</Button>
<Button Command="{Binding ToNewestCmd}">
<Button.Style>
<Style TargetType="Button" BasedOn="{StaticResource ButtonStyle_RectangleIcon}">
<Style TargetType="Button" BasedOn="{StaticResource Styles.Button.Icon.Rectangle}">
<Style.Triggers>
<DataTrigger Binding="{Binding IsNewest}" Value="True">
<Setter Property="Foreground" Value="Gray"/>
......@@ -126,7 +126,7 @@
</Button>
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent}" VerticalAlignment="Center"
<TextBlock Style="{StaticResource Styles.Text.FieldContent}" VerticalAlignment="Center"
Text="更新中" Visibility="{Binding IsLoading,Converter={StaticResource visbilityconv}}"/>
</StackPanel>
......@@ -141,22 +141,22 @@
<DataGridTextColumn Binding="{Binding ID}" IsReadOnly="True">
<DataGridTextColumn.Header>
<StackPanel Orientation="Horizontal">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeader}" Text="ID" />
<TextBlock Style="{StaticResource Styles.Text.FieldHeader}" Text="ID" />
</StackPanel>
</DataGridTextColumn.Header>
</DataGridTextColumn>
<DataGridTextColumn Binding="{Binding Time,StringFormat={}{0:MM/dd HH:mm}}" IsReadOnly="True">
<DataGridTextColumn.Header>
<StackPanel Orientation="Horizontal">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeader}" Text="时间" />
<TextBlock Style="{StaticResource Styles.Text.FieldHeader}" Text="时间" />
</StackPanel>
</DataGridTextColumn.Header>
</DataGridTextColumn>
<DataGridTextColumn Binding="{Binding Total,StringFormat={}{0:F4}}" IsReadOnly="True">
<DataGridTextColumn.Header>
<StackPanel Orientation="Horizontal">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeader}" Text="∑" />
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="kg" Margin="10,0" />
<TextBlock Style="{StaticResource Styles.Text.FieldHeader}" Text="∑" />
<TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" Text="kg" Margin="10,0" />
</StackPanel>
</DataGridTextColumn.Header>
<DataGridTextColumn.CellStyle>
......
Project.FLY.Weight/FLY.Weight.UI.Client/PgReduce.xaml
View file @ a0a30b9c
......@@ -13,7 +13,6 @@
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/Dictionary_MyStyle.xaml"/>
<ResourceDictionary Source="pack://application:,,,/FLY.Weight.UI.Client;component/Themes/ABCTab.xaml"/>
<ResourceDictionary Source="pack://application:,,,/FLY.Weight.UI.Client;component/UnitTests/UnitTests_Weights.xaml"/>
</ResourceDictionary.MergedDictionaries>
<Style x:Key="TabItemStyle_ABC2" TargetType="{x:Type TabItem}">
......@@ -56,10 +55,10 @@
<RowDefinition Height="496*" />
<RowDefinition Height="auto" />
</Grid.RowDefinitions>
<StackPanel Orientation="Horizontal" Background="{StaticResource Background_Title}">
<Button Style="{StaticResource ButtonStyle_back2}" Click="button_back_Click" />
<TextBlock Style="{StaticResource TextBlockStyle_Title}" Text="精减设置"/>
<StackPanel Orientation="Horizontal" Background="{StaticResource Brushes.TitleBar.Background}">
<Button Style="{StaticResource Styles.TitleBar.BackButton2}" Click="button_back_Click" />
<TextBlock Style="{StaticResource Styles.TitleBar.Text}" Text="精减设置"/>
</StackPanel>
<TabControl Grid.Row="1" ItemsSource="{Binding Items}" Style="{StaticResource TabControlStyle_ABC}">
<TabControl.ItemContainerStyle>
......
Project.FLY.Weight/FLY.Weight.UI.Client/PgRollMixTable.xaml
View file @ a0a30b9c
......@@ -23,14 +23,14 @@
<RowDefinition Height="auto" />
<RowDefinition Height="496*" />
</Grid.RowDefinitions>
<Grid Background="{StaticResource Background_Title}">
<Grid Background="{StaticResource Brushes.TitleBar.Background}">
<Grid.ColumnDefinitions>
<ColumnDefinition/>
<ColumnDefinition Width="auto"/>
</Grid.ColumnDefinitions>
<StackPanel Orientation="Horizontal" >
<Button Style="{StaticResource ButtonStyle_back2}" Command="BrowseBack" />
<TextBlock Style="{StaticResource TextBlockStyle_Title}" DataContext="{Binding Item}" >
<Button Style="{StaticResource Styles.TitleBar.BackButton2}" Command="BrowseBack" />
<TextBlock Style="{StaticResource Styles.TitleBar.Text}" DataContext="{Binding Item}" >
<Run Text="{Binding Number}" FontFamily="Arial Black"/><Run Text="累计记录"/>
</TextBlock>
</StackPanel>
......@@ -43,22 +43,22 @@
<WrapPanel>
<StackPanel Orientation="Horizontal" Margin="{StaticResource ControlMargin}">
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="显示" />
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="显示" />
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding WindowSize}" />
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="行"/>
<TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding WindowSize}" />
<TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" Text="行"/>
</StackPanel>
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="按时间查找" />
<ToggleButton Style="{StaticResource ToggleButtonStyle1}" HorizontalAlignment="Left" IsChecked="{Binding IsSearchByTime}" />
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="按时间查找" />
<ToggleButton Style="{StaticResource Styles.ToggleButton.YESNO}" HorizontalAlignment="Left" IsChecked="{Binding IsSearchByTime}" />
</StackPanel>
<Grid Margin="{StaticResource ControlMargin}">
<StackPanel Visibility="{Binding IsSearchByTime,Converter={StaticResource visbilityconv},ConverterParameter=CollapsedWhenTrue}" >
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="查找ID" />
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="查找ID" />
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding SearchId}" />
<TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding SearchId}" />
</StackPanel>
</StackPanel>
<DatePicker
......@@ -73,28 +73,28 @@
controls:TextBoxHelper.WatermarkAlignment="Right"
SelectedDate="{Binding SearchTime}"/>
</Grid>
<Button Style="{StaticResource ButtonStyle_RectangleIcon}" Command="{Binding SearchCmd}">
<Button Style="{StaticResource Styles.Button.Icon.Rectangle}" Command="{Binding SearchCmd}">
<iconPacks:PackIconMaterial Kind="Magnify" />
</Button>
</StackPanel>
<StackPanel Orientation="Horizontal" Margin="{StaticResource ControlMargin}">
<Button Style="{StaticResource ButtonStyle_RectangleIcon}" Command="{Binding PreViewCmd}">
<Button Style="{StaticResource Styles.Button.Icon.Rectangle}" Command="{Binding PreViewCmd}">
<Grid>
<iconPacks:PackIconMaterial Kind="ArrowLeft" />
</Grid>
</Button>
<StackPanel VerticalAlignment="Center">
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" >
<TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" >
<Run Text="最新ID:"/><Run Text="{Binding LastId,Mode=OneWay}"/>
</TextBlock>
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" >
<TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" >
<Run Text="当前ID:"/><Run Text="{Binding Id,Mode=OneWay}"/>
</TextBlock>
</StackPanel>
<Button Command="{Binding NextViewCmd}">
<Button.Style>
<Style TargetType="Button" BasedOn="{StaticResource ButtonStyle_RectangleIcon}">
<Style TargetType="Button" BasedOn="{StaticResource Styles.Button.Icon.Rectangle}">
<Style.Triggers>
<DataTrigger Binding="{Binding IsNewest}" Value="True">
<Setter Property="Foreground" Value="Gray"/>
......@@ -109,7 +109,7 @@
</Button>
<Button Command="{Binding ToNewestCmd}">
<Button.Style>
<Style TargetType="Button" BasedOn="{StaticResource ButtonStyle_RectangleIcon}">
<Style TargetType="Button" BasedOn="{StaticResource Styles.Button.Icon.Rectangle}">
<Style.Triggers>
<DataTrigger Binding="{Binding IsNewest}" Value="True">
<Setter Property="Foreground" Value="Gray"/>
......@@ -122,7 +122,7 @@
</Button>
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent}" VerticalAlignment="Center"
<TextBlock Style="{StaticResource Styles.Text.FieldContent}" VerticalAlignment="Center"
Text="更新中" Visibility="{Binding IsLoading,Converter={StaticResource visbilityconv}}"/>
</StackPanel>
......@@ -139,22 +139,22 @@
<DataGridTextColumn Binding="{Binding ID}" >
<DataGridTextColumn.Header>
<StackPanel Orientation="Horizontal">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeader}" Text="ID" />
<TextBlock Style="{StaticResource Styles.Text.FieldHeader}" Text="ID" />
</StackPanel>
</DataGridTextColumn.Header>
</DataGridTextColumn>
<DataGridTextColumn Binding="{Binding Time,StringFormat={}{0:MM/dd HH:mm}}" >
<DataGridTextColumn.Header>
<StackPanel Orientation="Horizontal">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeader}" Text="时间" />
<TextBlock Style="{StaticResource Styles.Text.FieldHeader}" Text="时间" />
</StackPanel>
</DataGridTextColumn.Header>
</DataGridTextColumn>
<DataGridTextColumn Binding="{Binding Total,StringFormat={}{0:F1}}" >
<DataGridTextColumn.Header>
<StackPanel Orientation="Horizontal">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeader}" Text="∑" />
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="kg" Margin="10,0" />
<TextBlock Style="{StaticResource Styles.Text.FieldHeader}" Text="∑" />
<TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" Text="kg" Margin="10,0" />
</StackPanel>
</DataGridTextColumn.Header>
<DataGridTextColumn.CellStyle>
......
Project.FLY.Weight/FLY.Weight.UI.Client/PgThickness.xaml
View file @ a0a30b9c
......@@ -12,7 +12,6 @@
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/Dictionary_MyStyle.xaml"/>
<ResourceDictionary Source="pack://application:,,,/FLY.Weight.UI.Client;component/Themes/ABCTab.xaml"/>
<ResourceDictionary Source="pack://application:,,,/FLY.Weight.UI.Client;component/UnitTests/UnitTests_Weights.xaml"/>
<ResourceDictionary Source="pack://application:,,,/FLY.Weight.UI.Client;component/Converter/Dictionary_MyConv.xaml"/>
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
......@@ -22,11 +21,11 @@
<RowDefinition Height="auto" />
<RowDefinition Height="496*" />
</Grid.RowDefinitions>
<StackPanel Orientation="Horizontal" Background="{StaticResource Background_Title}">
<Button Style="{StaticResource ButtonStyle_back2}" Click="button_back_Click" />
<TextBlock Style="{StaticResource TextBlockStyle_Title}" Text="厚度参数设置"/>
<StackPanel Orientation="Horizontal" Background="{StaticResource Brushes.TitleBar.Background}">
<Button Style="{StaticResource Styles.TitleBar.BackButton2}" Click="button_back_Click" />
<TextBlock Style="{StaticResource Styles.TitleBar.Text}" Text="厚度参数设置"/>
</StackPanel>
<StackPanel Orientation="Vertical" Grid.Row="1">
<StackPanel Grid.Row="1">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="auto" />
......@@ -35,29 +34,29 @@
<Border Width="150" Background="{StaticResource Color_theme_activity}" Margin="0,5,5,5" >
<TextBlock Style="{StaticResource TextBlockStyle_ItemHeader}" Text="参数" />
</Border>
<StackPanel Orientation="Vertical" Grid.Column="1">
<StackPanel Grid.Column="1">
<StackPanel Orientation="Horizontal">
<StackPanel Orientation="Vertical" Margin="5">
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="码轮周长" />
<StackPanel Margin="5">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="码轮周长" />
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource ResourceKey=TextBoxStyle_FieldContent}" Text="{Binding Accessory.WheelPerimeter,StringFormat={}{0:F0}}"/>
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent_mm}" Text="mm" />
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding Accessory.WheelPerimeter,StringFormat={}{0:F0}}"/>
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="mm" />
</StackPanel>
</StackPanel>
<StackPanel Orientation="Vertical" Margin="5">
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="码轮脉冲" />
<StackPanel Margin="5">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="码轮脉冲" />
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource ResourceKey=TextBoxStyle_FieldContent}" Text="{Binding Accessory.WheelPulse,StringFormat={}{0:F0}}"/>
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent_mm}" Text="脉冲/转" />
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding Accessory.WheelPulse,StringFormat={}{0:F0}}"/>
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="脉冲/转" />
</StackPanel>
</StackPanel>
</StackPanel>
<StackPanel Orientation="Vertical" Margin="5">
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="原料密度" />
<StackPanel Margin="5">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="原料密度" />
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource ResourceKey=TextBoxStyle_FieldContent}" Text="{Binding Accessory.Density,StringFormat={}{0:F3}}"/>
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent_mm}" Text="kg/m³" />
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding Accessory.Density,StringFormat={}{0:F3}}"/>
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="kg/m³" />
</StackPanel>
</StackPanel>
</StackPanel>
......
Project.FLY.Weight/FLY.Weight.UI.Client/Themes/Color.Dark.xaml 0 → 100644
View file @ a0a30b9c
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<!--颜色 标题-->
<SolidColorBrush x:Key="Color_title" Color="#A0FFFFFF"/>
<!--颜色 单位-->
<SolidColorBrush x:Key="Color_unit" Color="#80FFFFFF"/>
<!--颜色 文字-->
<SolidColorBrush x:Key="Color_text" Color="#FFFFFFFF"/>
<!--颜色 标题.输入框 -->
<SolidColorBrush x:Key="Color_title_activity" Color="#FF008BE5"/>
<!--颜色 文字.输入框 -->
<SolidColorBrush x:Key="Color_text_activity" Color="#FFa8ddff"/>
<!--颜色 文字.输入框.背景 -->
<SolidColorBrush x:Key="Color_text_activity_background" Color="#50587c"/>
<!--颜色 标题.输入框.警告 -->
<SolidColorBrush x:Key="Color_title_activity_warning" Color="#f92649"/>
<!--颜色 文字.输入框.警告 -->
<SolidColorBrush x:Key="Color_text_activity_warning" Color="#f07085"/>
<!--颜色 文字.输入框.背景.警告 -->
<SolidColorBrush x:Key="Color_text_activity_background_warning" Color="#50587c"/>
<!--加减按钮颜色-->
<SolidColorBrush x:Key="Color_theme_minus" Color="#FFEE5610"/>
<SolidColorBrush x:Key="Color_theme_plus" Color="#FF008BE5"/>
<!--颜色 徽章,用于标题 -->
<SolidColorBrush x:Key="Color_badgeBg" Color="#FF636363"/>
<SolidColorBrush x:Key="Color_badgeText" Color="White"/>
<!--颜色 On Off,用于ToggleButton-->
<SolidColorBrush x:Key="Color_on" Color="#10a8a9"/>
<SolidColorBrush x:Key="Color_off" Color="#e44c65"/>
<SolidColorBrush x:Key="Color_static" Color="#FF636363"/>
<!--颜色 警告-->
<SolidColorBrush x:Key="Color_warning" Color="#e44c65"/>
<!--颜色 表格边框-->
<SolidColorBrush x:Key="Color_table_border" Color="#FFFFFFFF"/>
<SolidColorBrush x:Key="Color_table_alter_row" Color="#80587c"/>
<!--颜色 存放很多块 的容器背景色-->
<SolidColorBrush x:Key="Color_bottom" Color="#1c233d"/>
<!--颜色 块的底色-->
<SolidColorBrush x:Key="Color_background" Color="#FF384064"/>
<!--颜色 比块的底色白一点，用于弱强调 -->
<SolidColorBrush x:Key="Color_background2" Color="#50587c"/>
</ResourceDictionary>
\ No newline at end of file
Project.FLY.Weight/FLY.Weight.UI.Client/Themes/Color.Light.xaml 0 → 100644
View file @ a0a30b9c
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<!--颜色 标题-->
<SolidColorBrush x:Key="Color_title" Color="#FF464646"/>
<!--颜色 单位-->
<SolidColorBrush x:Key="Color_unit" Color="#FF464646"/>
<!--颜色 文字-->
<SolidColorBrush x:Key="Color_text" Color="#FF0b0b0b"/>
<!--颜色 标题.输入框 -->
<SolidColorBrush x:Key="Color_title_activity" Color="#FF008BE5"/>
<!--颜色 文字.输入框 -->
<SolidColorBrush x:Key="Color_text_activity" Color="#FF005083"/>
<!--颜色 文字.输入框.背景 -->
<SolidColorBrush x:Key="Color_text_activity_background" Color="#8880C3EE"/>
<!--颜色 标题.输入框.警告 -->
<SolidColorBrush x:Key="Color_title_activity_warning" Color="#f92649"/>
<!--颜色 文字.输入框.警告 -->
<SolidColorBrush x:Key="Color_text_activity_warning" Color="DarkRed"/>
<!--颜色 文字.输入框.背景.警告 -->
<SolidColorBrush x:Key="Color_text_activity_background_warning" Color="#88f07085"/>
<!--加减按钮颜色-->
<SolidColorBrush x:Key="Color_theme_minus" Color="#FFEE5610"/>
<SolidColorBrush x:Key="Color_theme_plus" Color="#FF008BE5"/>
<!--颜色 徽章,用于标题 -->
<SolidColorBrush x:Key="Color_badgeBg" Color="#FF636363"/>
<SolidColorBrush x:Key="Color_badgeText" Color="White"/>
<!--颜色 On Off,用于ToggleButton-->
<SolidColorBrush x:Key="Color_on" Color="Green"/>
<SolidColorBrush x:Key="Color_off" Color="DarkRed"/>
<SolidColorBrush x:Key="Color_static" Color="#FF464646"/>
<!--颜色 警告-->
<SolidColorBrush x:Key="Color_warning" Color="DarkRed"/>
<!--颜色 表格边框-->
<SolidColorBrush x:Key="Color_table_border" Color="#FF0b0b0b"/>
<SolidColorBrush x:Key="Color_table_alter_row" Color="LightGray"/>
<!--颜色 存放很多块 的容器背景色-->
<SolidColorBrush x:Key="Color_bottom" Color="LightGray"/>
<!--颜色 块的底色-->
<SolidColorBrush x:Key="Color_background" Color="White"/>
<!--颜色 比块的底色白一点，用于弱强调 -->
<SolidColorBrush x:Key="Color_background2" Color="#e9e9e9"/>
</ResourceDictionary>
\ No newline at end of file
Project.FLY.Weight/FLY.Weight.UI.Client/Themes/DarkSkin.xaml → Project.FLY.Weight/FLY.Weight.UI.Client/Themes/Color.xaml
View file @ a0a30b9c
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<SolidColorBrush x:Key="Color_title" Color="#A0FFFFFF"/>
<SolidColorBrush x:Key="Color_unit" Color="#80FFFFFF"/>
<SolidColorBrush x:Key="Color_text" Color="#FFFFFFFF"/>
<SolidColorBrush x:Key="Color_title_activity" Color="#FF008BE5"/>
<SolidColorBrush x:Key="Color_text_activity" Color="#FFa8ddff"/>
<SolidColorBrush x:Key="Color_background" Color="#FF384064"/>
<SolidColorBrush x:Key="Color_background2" Color="#50587c"/>
<SolidColorBrush x:Key="Color_off" Color="#e44c65"/>
<SolidColorBrush x:Key="Color_on" Color="#10a8a9"/>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="Color.Light.xaml"/>
</ResourceDictionary.MergedDictionaries>
<!--Blue-->
<!--<SolidColorBrush x:Key="Brushes.ChartArea0" Color="#CC119EDA" />
......@@ -48,4 +39,5 @@
<SolidColorBrush x:Key="Brushes.ChartSeparator" Color="LightGray" />
<SolidColorBrush x:Key="Brushes.ChartAxisLabel" Color="Black" />
</ResourceDictionary>
\ No newline at end of file
Project.FLY.Weight/FLY.Weight.UI.Client/Themes/LightSkin.xaml deleted 100644 → 0
View file @ be2ae018
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<SolidColorBrush x:Key="Color_title" Color="#FF464646"/>
<SolidColorBrush x:Key="Color_unit" Color="#FF464646"/>
<SolidColorBrush x:Key="Color_text" Color="#FF0b0b0b"/>
<SolidColorBrush x:Key="Color_title_activity" Color="#FF008BE5"/>
<SolidColorBrush x:Key="Color_text_activity" Color="#FF005083"/>
<SolidColorBrush x:Key="Color_background" Color="White"/>
<SolidColorBrush x:Key="Color_background2" Color="#FFD0D0D0"/>
<SolidColorBrush x:Key="Color_off" Color="#e44c65"/>
<SolidColorBrush x:Key="Color_on" Color="#10a8a9"/>
<!--Blue-->
<!--<SolidColorBrush x:Key="Brushes.ChartArea0" Color="#CC119EDA" />
<SolidColorBrush x:Key="Brushes.ChartArea1" Color="#CC086F9E"/>
<SolidColorBrush x:Key="Brushes.ChartArea2" Color="#CCEB2F2F" />
<SolidColorBrush x:Key="Brushes.ChartArea3" Color="#CCA59F93" />
<SolidColorBrush x:Key="Brushes.ChartArea4" Color="#22000000" />
<SolidColorBrush x:Key="Brushes.ChartAxisLabel0" Color="#FF119EDA" />
<SolidColorBrush x:Key="Brushes.ChartAxisLabel1" Color="#FF086F9E"/>
<SolidColorBrush x:Key="Brushes.ChartAxisLabel2" Color="#FFEB2F2F" />
<SolidColorBrush x:Key="Brushes.ChartAxisLabel3" Color="#FFA59F93" />-->
<!--Green-->
<!--MahApps.Brushes.Accent-->
<SolidColorBrush x:Key="Brushes.ChartArea0" Color="#CC60A917" />
<!--MahApps.Brushes.ValidationSummary4-->
<SolidColorBrush x:Key="Brushes.ChartArea1" Color="#CCFDC8C8"/>
<!--MahApps.Brushes.ValidationSummary2-->
<SolidColorBrush x:Key="Brushes.ChartArea2" Color="#CCCA000C" />
<SolidColorBrush x:Key="Brushes.ChartArea3" Color="#CCA59F93" />
<SolidColorBrush x:Key="Brushes.ChartArea4" Color="#22000000" />
<!--MahApps.Brushes.Accent-->
<SolidColorBrush x:Key="Brushes.ChartAxisLabel0" Color="#FF60A917" />
<!--MahApps.Brushes.ValidationSummary5-->
<SolidColorBrush x:Key="Brushes.ChartAxisLabel1" Color="#FFFD7070"/>
<!--MahApps.Brushes.ValidationSummary2-->
<SolidColorBrush x:Key="Brushes.ChartAxisLabel2" Color="#FFCA000C" />
<SolidColorBrush x:Key="Brushes.ChartAxisLabel3" Color="#FFA59F93" />
<SolidColorBrush x:Key="Brushes.ChartSeparator" Color="LightGray" />
<SolidColorBrush x:Key="Brushes.ChartAxisLabel" Color="Black" />
</ResourceDictionary>
\ No newline at end of file
Project.FLY.Weight/FLY.Weight.UI.Client/Themes/Styles.xaml
View file @ a0a30b9c
......@@ -2,23 +2,19 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:sys="clr-namespace:System;assembly=mscorlib">
<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.Weight.UI.Client;component/Themes/DarkSkin.xaml"/>-->
<ResourceDictionary Source="pack://application:,,,/FLY.Weight.UI.Client;component/Themes/LightSkin.xaml"/>
<ResourceDictionary Source="pack://application:,,,/FLY.Weight.UI.Client;component/UnitTests/UnitTests_Weights.xaml"/>
<!--<ResourceDictionary Source="pack://application:,,,/FLY.Weight.UI.Client;component/Themes/UcWeighterItemStyle.xaml"/>-->
<ResourceDictionary Source="pack://application:,,,/FLY.Weight.UI.Client;component/Converter/Dictionary_MyConv.xaml"/>
<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.Weight.UI.Client;component/Themes/Color.xaml"/>
<ResourceDictionary Source="pack://application:,,,/FLY.Weight.UI.Client;component/Converter/Dictionary_MyConv.xaml"/>
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary.MergedDictionaries>
<sys:Double x:Key="d100">100</sys:Double>
<sys:Double x:Key="d100">100</sys:Double>
<sys:Double x:Key="FontSize_title">18</sys:Double>
<sys:Double x:Key="FontSize_unit">12</sys:Double>
<sys:Double x:Key="FontSize_context_min">32</sys:Double>
<sys:Double x:Key="FontSize_context_max">48</sys:Double>
<sys:Double x:Key="FontSize_title">18</sys:Double>
<sys:Double x:Key="FontSize_unit">12</sys:Double>
<sys:Double x:Key="FontSize_context_min">32</sys:Double>
<sys:Double x:Key="FontSize_context_max">48</sys:Double>
<Style TargetType="Viewbox" x:Key="ViewerStyle">
<Setter Property="MaxHeight" Value="130"/>
......
Project.FLY.Weight/FLY.Weight.UI.Client/Themes/UcWeighterItemStyle.xaml
View file @ a0a30b9c
......@@ -6,9 +6,6 @@
<ResourceDictionary Source="pack://application:,,,/FLY.Weight.UI.Client;component/Themes/Styles.xaml"/>
</ResourceDictionary.MergedDictionaries>
<SolidColorBrush x:Key="Color_button1_b" Color="#FF008BE5"/>
<SolidColorBrush x:Key="Color_button2_b" Color="#FF919191"/>
<SolidColorBrush x:Key="Color_button_f" Color="#FFf1f1f1"/>
<sys:Double x:Key="FontSize_title">18</sys:Double>
<sys:Double x:Key="FontSize_unit">18</sys:Double>
<sys:Double x:Key="FontSize_text">48</sys:Double>
......
Project.FLY.Weight/FLY.Weight.UI.Client/UIModule/FeederPanel/FeederPanel2.xaml 0 → 100644
View file @ a0a30b9c
<UserControl x:Class="FLY.Weight.UI.Client.UiModule.FeederPanel2"
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:local="clr-namespace:FLY.Weight.UI.Client.UiModule"
mc:Ignorable="d" d:DesignWidth="1600" d:DesignHeight="954" Unloaded="UserControl_Unloaded" Loaded="UserControl_Loaded" >
<UserControl.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="FeederPanelStyle.xaml"/>
<ResourceDictionary Source="FeederStyle.xaml"/>
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</UserControl.Resources>
<Grid d:DataContext="{StaticResource feederSystemUt}">
<ItemsControl x:Name="ic" ItemsSource="{Binding FeederDatas}">
<ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
<UniformGrid Columns="{Binding ElementName=ic,Path=Items.Count}"/>
</ItemsPanelTemplate>
</ItemsControl.ItemsPanel>
<ItemsControl.ItemTemplate>
<DataTemplate>
<ContentControl ContentTemplate="{StaticResource Feeder2Template}" Content="{Binding .}"/>
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
</Grid>
</UserControl>
Project.FLY.Weight/FLY.Weight.UI.Client/UIModule/FeederPanel/FeederPanel2.xaml.cs 0 → 100644
View file @ a0a30b9c
using FLY.OBJComponents.Client;
using FLY.Weight.Client;
using FLY.Weight.IService;
using MultiLayout.UiModule;
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;
using Unity;
namespace FLY.Weight.UI.Client.UiModule
{
/// <summary>
/// FeederPanel.xaml 的交互逻辑
/// </summary>
public partial class FeederPanel2 : UserControl
{
IFeederSystemService feederSystemService;
IUnityContainer container;
List<SetPLCUpdatePlan> setPlan_feederDatas = new List<SetPLCUpdatePlan>();
public FeederPanel2()
{
InitializeComponent();
}
[InjectionMethod]
public void Init(
IUnityContainer container,
IFeederSystemService feederSystemService)
{
this.feederSystemService = feederSystemService;
this.DataContext = this.feederSystemService;
if (this.feederSystemService is FeederSystemServiceClient)
{
(this.feederSystemService as FeederSystemServiceClient).ResetFeederDatasEvent += ResetItemsEvent;
}
}
private void ResetItemsEvent()
{
if (setPlan_feederDatas.Count() == 0)
return;//从来没注册
//把多出来的删除
int remove_cnt = setPlan_feederDatas.Count() - this.feederSystemService.FeederDatas.Count();
if (remove_cnt > 0)
{
for (int i = 0; i < remove_cnt; i++)
{
SetPLCUpdatePlan plan = setPlan_feederDatas[setPlan_feederDatas.Count() - 1 - i];
plan.Dispose();
}
setPlan_feederDatas.RemoveRange(setPlan_feederDatas.Count() - remove_cnt, remove_cnt);
}
else
{
int start_idx = setPlan_feederDatas.Count();
int add_cnt = -remove_cnt;
for (int i = 0; i < add_cnt; i++)
{
string objname = $"{nameof(IFeederSystemService.FeederDatas)}[{start_idx + i}]";
SetPLCUpdatePlan plan = new SetPLCUpdatePlan(
this.feederSystemService.PLCos,
objname,
UcFeeder2.update_propertynames);
setPlan_feederDatas.Add(plan);
}
}
}
private void UserControl_Loaded(object sender, RoutedEventArgs e)
{
if (setPlan_feederDatas.Count() == 0)
{
for (int i = 0; i < this.feederSystemService.FeederDatas.Count(); i++)
{
string objname = $"{nameof(IFeederSystemService.FeederDatas)}[{i}]";
SetPLCUpdatePlan plan = new SetPLCUpdatePlan(
this.feederSystemService.PLCos,
objname,
UcFeeder2.update_propertynames); ;
setPlan_feederDatas.Add(plan);
}
}
}
private void UserControl_Unloaded(object sender, RoutedEventArgs e)
{
for (int i = 0; i < setPlan_feederDatas.Count(); i++)
{
setPlan_feederDatas[i].Dispose();
}
setPlan_feederDatas.Clear();
}
}
}
Project.FLY.Weight/FLY.Weight.UI.Client/UnitTests/UnitTests_Weights.xaml → Project.FLY.Weight/FLY.Weight.UI.Client/UIModule/FeederPanel/FeederPanelStyle.xaml
View file @ a0a30b9c
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:FLY.Weight.UI.Client.UnitTests">
xmlns:sys="clr-namespace:System;assembly=mscorlib"
xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
xmlns:flyctrl="clr-namespace:FLY.ControlLibrary;assembly=FLY.ControlLibrary">
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/FLY.Weight.UI.Client;component/Themes/Dictionary_CellColor.xaml"/>
<ResourceDictionary Source="pack://application:,,,/FLY.Weight.UI.Client;component/Themes/Styles.xaml"/>
</ResourceDictionary.MergedDictionaries>
<local:UnitTests_Weights x:Key="unittests_weighters" />
<!--<local:UnitTests_BufferWindow x:Key="unittests_bufferwindow"
IsFirstPage ="False"
IsLastPage="True"
IsKeepNewest="False"
CurrentPage="10"
TotalPages="10"
/>-->
<local:UnitTests_FlowGraphModelView x:Key="unittests_flowgraphmv"/>
</ResourceDictionary>
\ No newline at end of file
Project.FLY.Weight/FLY.Weight.UI.Client/UIModule/FeederPanel/FeederStyle.xaml 0 → 100644
View file @ a0a30b9c
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:flyctrl="clr-namespace:FLY.ControlLibrary;assembly=FLY.ControlLibrary"
xmlns:i="http://schemas.microsoft.com/xaml/behaviors" >
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="FeederPanelStyle.xaml"/>
</ResourceDictionary.MergedDictionaries>
<!--单层吸料界面模板 横向-->
<DataTemplate x:Key="FeederTemplate">
<Grid >
<Border Style="{StaticResource Styles.Module.Border}" Background="{StaticResource Color_background}">
<Viewbox Margin="{StaticResource ControlMargin}" Stretch="Uniform" StretchDirection="DownOnly" HorizontalAlignment="Left" VerticalAlignment="Top">
<Grid >
<StackPanel>
<Border Width="100" Background="{StaticResource Color_badgeBg}" Margin="3" HorizontalAlignment="Left">
<TextBlock Text="{Binding Number}" Width="100" Height="100" FontSize="100" FontWeight="Bold" FontFamily="Arial Black" Foreground="{StaticResource Color_badgeText}" VerticalAlignment="Top" HorizontalAlignment="Left"/>
</Border>
<ItemsControl ItemsSource="{Binding Feeders}">
<ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
<StackPanel/>
</ItemsPanelTemplate>
</ItemsControl.ItemsPanel>
<ItemsControl.ItemTemplate>
<DataTemplate>
<StackPanel Orientation="Horizontal" Margin="{StaticResource ControlMargin}">
<Grid>
<flyctrl:ToggleButtonOnOff Style="{StaticResource ToggleButtonOnOffStyle}" Width="140"
Margin="{StaticResource ControlMargin}"
OnLabel="吸料开" OnBrush="{StaticResource Color_on}"
OffLabel="吸料关" OffBrush="{StaticResource Color_off}"
IsChecked="{Binding IsFeederOn}"/>
<TextBlock HorizontalAlignment="Right" VerticalAlignment="Top" Padding="6,2" Margin="0,-5,-5,0"
Background="{StaticResource Color_badgeBg}" Foreground="{StaticResource Color_badgeText}"
FontSize="30"
Text="{Binding Number}" />
</Grid>
<Grid Width="20"/>
<Button Style="{StaticResource MahApps.Styles.Button.Square.Accent}"
Padding="20,5" Margin="{StaticResource ControlMargin}"
FontSize="{StaticResource FontSize_title}"
Content="复位"
Visibility="{Binding IsFeederResetValid,Converter={StaticResource visbilityconv}}">
<i:Interaction.Behaviors>
<flyctrl:Set1Behavior Binding="{Binding FeederReset}"/>
</i:Interaction.Behaviors>
</Button>
</StackPanel>
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
</StackPanel>
</Grid>
</Viewbox>
</Border>
</Grid>
</DataTemplate>
<!--单层吸料界面模板 纵向-->
<DataTemplate x:Key="Feeder2Template">
<Grid >
<Border Style="{StaticResource Styles.Module.Border}" Background="{StaticResource Color_background}">
<Viewbox Margin="{StaticResource ControlMargin}" Stretch="Uniform" StretchDirection="DownOnly" HorizontalAlignment="Left" VerticalAlignment="Top">
<Grid >
<StackPanel>
<Border Width="100" Background="{StaticResource Color_badgeBg}" Margin="3" HorizontalAlignment="Left">
<TextBlock Text="{Binding Number}" Width="100" Height="100" FontSize="100" FontWeight="Bold" FontFamily="Arial Black" Foreground="{StaticResource Color_badgeText}" VerticalAlignment="Top" HorizontalAlignment="Left"/>
</Border>
<ItemsControl ItemsSource="{Binding Feeders}">
<ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
<StackPanel/>
</ItemsPanelTemplate>
</ItemsControl.ItemsPanel>
<ItemsControl.ItemTemplate>
<DataTemplate>
<StackPanel Margin="{StaticResource ControlMargin}">
<Grid HorizontalAlignment="Left">
<flyctrl:ToggleButtonOnOff Style="{StaticResource ToggleButtonOnOffStyle}" Width="140"
Margin="{StaticResource ControlMargin}"
OnLabel="吸料开" OnBrush="{StaticResource Color_on}"
OffLabel="吸料关" OffBrush="{StaticResource Color_off}"
IsChecked="{Binding IsFeederOn}"/>
<TextBlock HorizontalAlignment="Right" VerticalAlignment="Top" Padding="6,2" Margin="0,-5,-5,0"
Background="{StaticResource Color_badgeBg}" Foreground="{StaticResource Color_badgeText}"
FontSize="30"
Text="{Binding Number}" />
</Grid>
<Grid Width="20"/>
<Button Style="{StaticResource MahApps.Styles.Button.Square.Accent}"
Padding="20,5" Margin="{StaticResource ControlMargin}"
FontSize="{StaticResource FontSize_title}"
Content="复位"
Visibility="{Binding IsFeederResetValid,Converter={StaticResource visbilityconv}}">
<i:Interaction.Behaviors>
<flyctrl:Set1Behavior Binding="{Binding FeederReset}"/>
</i:Interaction.Behaviors>
</Button>
</StackPanel>
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
</StackPanel>
</Grid>
</Viewbox>
</Border>
</Grid>
</DataTemplate>
</ResourceDictionary>
\ No newline at end of file
Project.FLY.Weight/FLY.Weight.UI.Client/UIModule/FeederPanel/UcFeeder2.xaml 0 → 100644
View file @ a0a30b9c
<UserControl x:Class="FLY.Weight.UI.Client.UiModule.UcFeeder2"
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:flyctrl="clr-namespace:FLY.ControlLibrary;assembly=FLY.ControlLibrary"
xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
mc:Ignorable="d" >
<UserControl.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="FeederPanelStyle.xaml"/>
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</UserControl.Resources>
<Grid d:DataContext="{Binding Source={StaticResource feederSystemUt},Path=FeederDatas[0]}">
<Border Style="{StaticResource Styles.Module.Border}" Background="{StaticResource Color_background}">
<Viewbox Margin="{StaticResource ControlMargin}" Stretch="Uniform" StretchDirection="DownOnly" HorizontalAlignment="Left" VerticalAlignment="Top">
<Grid >
<StackPanel>
<Border Width="100" Background="{StaticResource Color_badgeBg}" Margin="3" HorizontalAlignment="Left">
<TextBlock Text="{Binding Number}" Width="100" Height="100" FontSize="100" FontWeight="Bold" FontFamily="Arial Black" Foreground="{StaticResource Color_badgeText}" VerticalAlignment="Top" HorizontalAlignment="Left"/>
</Border>
<ItemsControl ItemsSource="{Binding Feeders}">
<ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
<StackPanel/>
</ItemsPanelTemplate>
</ItemsControl.ItemsPanel>
<ItemsControl.ItemTemplate>
<DataTemplate>
<StackPanel Margin="{StaticResource ControlMargin}">
<Grid HorizontalAlignment="Left">
<flyctrl:ToggleButtonOnOff Style="{StaticResource ToggleButtonOnOffStyle}" Width="140"
Margin="{StaticResource ControlMargin}"
OnLabel="吸料开" OnBrush="{StaticResource Color_on}"
OffLabel="吸料关" OffBrush="{StaticResource Color_off}"
IsChecked="{Binding IsFeederOn}"/>
<TextBlock HorizontalAlignment="Right" VerticalAlignment="Top" Padding="6,2" Margin="0,-5,-5,0"
Background="{StaticResource Color_badgeBg}" Foreground="{StaticResource Color_badgeText}"
FontSize="30"
Text="{Binding Number}" />
</Grid>
<Grid Width="20"/>
<Button Style="{StaticResource MahApps.Styles.Button.Square.Accent}"
Padding="20,5" Margin="{StaticResource ControlMargin}"
FontSize="{StaticResource FontSize_title}"
Content="复位"
Visibility="{Binding IsFeederResetValid,Converter={StaticResource visbilityconv}}">
<i:Interaction.Behaviors>
<flyctrl:Set1Behavior Binding="{Binding FeederReset}"/>
</i:Interaction.Behaviors>
</Button>
</StackPanel>
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
</StackPanel>
</Grid>
</Viewbox>
</Border>
</Grid>
</UserControl>
Project.FLY.Weight/FLY.Weight.UI.Client/UIModule/FeederPanel/UcFeeder2.xaml.cs 0 → 100644
View file @ a0a30b9c
using FLY.Weight.Common;
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.Weight.UI.Client.UiModule
{
/// <summary>
/// UcFeeder.xaml 的交互逻辑
/// </summary>
public partial class UcFeeder2 : UserControl
{
public static string[] update_propertynames;
static UcFeeder2()
{
string[] propertynames = new string[] {
nameof(FeederData.IsFeederOn1),
nameof(FeederData.IsFeederResetValid1),
nameof(FeederData.FeederReset1)
};
List<string> update_propertynames = new List<string>();
for (int i = 0; i < 6; i++)
{
for (int j = 0; j < propertynames.Count(); j++)
{
update_propertynames.Add(propertynames[j].Replace("1", (i + 1).ToString()));
}
}
UcFeeder2.update_propertynames = update_propertynames.ToArray();
}
public UcFeeder2()
{
InitializeComponent();
}
}
}
Project.FLY.Weight/FLY.Weight.UI.Client/UIModule/FeederPanel/UiModule2_FeederPanel.cs 0 → 100644
View file @ a0a30b9c
using MultiLayout.UiModule;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using Unity;
namespace FLY.Weight.UI.Client.UiModule
{
public class UiModule2_FeederPanel : IUiModule2
{
/// <summary>
/// 控件标题
/// 它的值取决于culture
/// </summary>
public string Title => "称重.吸料";
public ComponentType Type => ComponentType.Graph;
public bool IsUnique => true;
/// <summary>
/// 控件
/// 创建时，需要给它唯一ID，让加载自己的数据
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
public FrameworkElement GetComponent(int id, IUnityContainer container)
{
FeederPanel2 graph = new FeederPanel2();
container.BuildUp(graph);
return graph;
}
/// <summary>
/// 控件缩略图，用于编辑界面时，大致看看
/// 创建时，需要给它唯一ID，让加载自己的数据
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
public FrameworkElement GetThumbnail()
{
return new System.Windows.Controls.Grid();
}
/// <summary>
/// 给出全部控件ID, 控件自行删除没有的参数
/// </summary>
/// <param name="IDs"></param>
public void MatchParam(int[] IDs)
{
}
}
}
Project.FLY.Weight/FLY.Weight.UI.Client/UIModule/FlowGraph.xaml
View file @ a0a30b9c
......@@ -135,7 +135,7 @@
</StackPanel>
</Button>
<Viewbox Grid.Column="3" Grid.RowSpan="2" Panel.ZIndex="1"
HorizontalAlignment="Left" VerticalAlignment="Top" Margin="{StaticResource ControlMargin}" MaxHeight="210" MaxWidth="150">
HorizontalAlignment="Left" VerticalAlignment="Top" Margin="{StaticResource ControlMargin}" MaxHeight="260" MaxWidth="150">
<StackPanel >
<StackPanel.Resources>
<Style TargetType="Button" BasedOn="{StaticResource Styles.Button.Empty}">
......
Project.FLY.Weight/FLY.Weight.UI.Client/UIModule/WdGraphSet.xaml
View file @ a0a30b9c
......@@ -9,7 +9,7 @@
Title="Window_GraphSet" WindowStartupLocation="CenterScreen"
SizeToContent="WidthAndHeight"
Background="WhiteSmoke"
Background="White"
MinWidth="400">
<flyctrllib:WindowBigClose.Resources>
<ResourceDictionary>
......@@ -26,14 +26,14 @@
<StackPanel Orientation="Horizontal" DataContext="{Binding DataContext,ElementName=grid_trend}">
<Button Style="{StaticResource ButtonStyle_RectangleIcon}" Click="btnPreClick">
<Button Style="{StaticResource Styles.Button.Icon.Rectangle}" Click="btnPreClick">
<Grid>
<iconPacks:PackIconMaterial Kind="ArrowLeft" />
</Grid>
</Button>
<Button Click="btnNextClick">
<Button.Style>
<Style TargetType="Button" BasedOn="{StaticResource ButtonStyle_RectangleIcon}">
<Style TargetType="Button" BasedOn="{StaticResource Styles.Button.Icon.Rectangle}">
<Style.Triggers>
<DataTrigger Binding="{Binding IsNewest}" Value="True">
<Setter Property="Foreground" Value="Gray"/>
......@@ -48,7 +48,7 @@
</Button>
<Button Click="btnNewestClick">
<Button.Style>
<Style TargetType="Button" BasedOn="{StaticResource ButtonStyle_RectangleIcon}">
<Style TargetType="Button" BasedOn="{StaticResource Styles.Button.Icon.Rectangle}">
<Style.Triggers>
<DataTrigger Binding="{Binding IsNewest}" Value="True">
<Setter Property="Foreground" Value="Gray"/>
......@@ -75,42 +75,42 @@
</Grid>
</Grid>
</Button>
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent}" Text="更新中" Visibility="{Binding IsLoading,Converter={StaticResource visbilityconv}}"/>
<TextBlock Style="{StaticResource Styles.Text.FieldContent}" Text="更新中" Visibility="{Binding IsLoading,Converter={StaticResource visbilityconv}}"/>
</StackPanel>
<StackPanel Orientation="Horizontal" >
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="间隔" />
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="间隔" />
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding Interval}"/>
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="x10秒" />
<TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding Interval}"/>
<TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" Text="x10秒" />
</StackPanel>
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="自动Y轴" />
<ToggleButton x:Name="tglIsAutoY" Style="{StaticResource ToggleButtonStyle1}" IsChecked="{Binding IsYRangeAuto}"/>
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="自动Y轴" />
<ToggleButton x:Name="tglIsAutoY" Style="{StaticResource Styles.ToggleButton.YESNO}" IsChecked="{Binding IsYRangeAuto}"/>
</StackPanel>
</StackPanel>
<StackPanel Orientation="Horizontal" Visibility="{Binding IsChecked,ElementName=tglIsAutoY,Converter={StaticResource visbilityconv}, ConverterParameter=CollapsedWhenTrue}">
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="Y轴范围按%设置" />
<ToggleButton x:Name="tglIsPercent" Style="{StaticResource ToggleButtonStyle1}" IsChecked="{Binding IsYRangePercent}"/>
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="Y轴范围按%设置" />
<ToggleButton x:Name="tglIsPercent" Style="{StaticResource Styles.ToggleButton.YESNO}" IsChecked="{Binding IsYRangePercent}"/>
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}" >
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="Y轴范围" />
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="Y轴范围" />
<StackPanel Orientation="Horizontal" Visibility="{Binding IsChecked,ElementName=tglIsPercent,Converter={StaticResource visbilityconv}, ConverterParameter=CollapsedWhenTrue}">
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="±" />
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding YRange}"/>
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="kg/h" />
<TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" Text="±" />
<TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding YRange}"/>
<TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" Text="kg/h" />
</StackPanel>
<StackPanel Orientation="Horizontal" Visibility="{Binding IsChecked,ElementName=tglIsPercent,Converter={StaticResource visbilityconv}, ConverterParameter=Collapsed}">
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="±" />
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding YRangePercent,Converter={StaticResource percentConv}}"/>
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="%" />
<TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" Text="±" />
<TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding YRangePercent,Converter={StaticResource percentConv}}"/>
<TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" Text="%" />
</StackPanel>
</StackPanel>
</StackPanel>
<Button Style="{StaticResource ButtonStyle_apply}" Click="btnOkClick"/>
<Button Style="{StaticResource Styles.Button.Apply}" Click="btnOkClick"/>
</StackPanel>
</Grid>
......
Project.FLY.Weight/FLY.Weight.UI.Client/UiModule/V3/DynAreaWeight.xaml
View file @ a0a30b9c
......@@ -14,7 +14,7 @@
<ResourceDictionary Source="pack://application:,,,/FLY.Weight.UI.Client;component/Themes/UcWeighterItemStyle.xaml"/>
<ResourceDictionary Source="pack://application:,,,/FLY.Thick.Base.UI;component/Themes/DynAreaErrorStyle.xaml"/>
</ResourceDictionary.MergedDictionaries>
<baseUiModule:DynAreaErrorVm2 x:Key="errorVm" IsError="True" ErrMsg="枫莱尔控制器连接断开 枫莱尔控制器连接断开"/>
<baseUiModule:DynAreaErrorVm2 x:Key="errorVm" IsError="False" ErrMsg="枫莱尔控制器连接断开 枫莱尔控制器连接断开"/>
</ResourceDictionary>
</UserControl.Resources>
......@@ -42,18 +42,15 @@
ItemValueBinding="CurrentFlow" ItemColorBinding="Color"
ItemsSource="{Binding Items}"
/>
<TextBlock Grid.Column="1" Text="总流量" Style="{StaticResource TextBlockStyle_title}" />
<Viewbox Grid.Column="1" Grid.Row="1" MaxHeight="80" HorizontalAlignment="Left">
<StackPanel Orientation="Horizontal">
<TextBlock Margin="4" >
<Run Text="{Binding Accessory.TotalFlow,StringFormat={}{0:F1}}" Style="{StaticResource RunStyle_text}" FontSize="60" />
</TextBlock>
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent_mm}" Text="kg/h" FontSize="20" />
</StackPanel>
</Viewbox>
<TextBlock Grid.Column="1" Style="{StaticResource Styles.Module.Text.ItemHeader}" Text="总流量" />
<Viewbox Grid.Column="1" Grid.Row="1" MaxHeight="80" HorizontalAlignment="Left">
<StackPanel Orientation="Horizontal">
<TextBlock Style="{StaticResource Styles.Module.Text.ItemValue}" FontSize="60"
Text="{Binding Accessory.TotalFlow,StringFormat={}{0:F1}}" />
<TextBlock Style="{StaticResource Styles.Module.Text.ItemValue.Unit}" FontSize="20"
Text="kg/h" />
</StackPanel>
</Viewbox>
</Grid>
<Grid Margin="2">
......@@ -62,17 +59,17 @@
<ColumnDefinition Width="auto"/>
</Grid.ColumnDefinitions>
<StackPanel Orientation="Horizontal" Margin="2">
<TextBlock Text="平均厚度" FontSize="12" FontWeight="Bold" FontFamily="YouYuan" TextAlignment="Center" HorizontalAlignment="Center" Foreground="#FF3B3B3B" />
<StackPanel Orientation="Horizontal" Margin="5,0">
<TextBlock Text="{Binding Accessory.Thickness, StringFormat={}{0:F1}}" FontSize="24" FontFamily="Microsoft Sans Serif" TextAlignment="Center" HorizontalAlignment="Center" Foreground="{StaticResource Color_theme_activity}" />
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="um" FontSize="12" />
<TextBlock Style="{StaticResource Styles.Module.Text.ItemHeader}" Text="平均厚度" />
<StackPanel Orientation="Horizontal" Margin="2,0">
<TextBlock Style="{StaticResource Styles.Module.Text.ItemValue}" Text="{Binding Accessory.Thickness, StringFormat={}{0:F1}}" />
<TextBlock Style="{StaticResource Styles.Module.Text.ItemValue.Unit}" Text="um" />
</StackPanel>
</StackPanel>
<StackPanel Grid.Column="1" Orientation="Horizontal" Margin="2" >
<TextBlock Text="边料" FontSize="12" FontWeight="Bold" FontFamily="YouYuan" TextAlignment="Center" HorizontalAlignment="Center" Foreground="#FF3B3B3B" />
<StackPanel Orientation="Horizontal" Margin="5,0">
<TextBlock Text="{Binding Accessory.RimCharge, StringFormat={}{0:F1}}" FontSize="24" FontFamily="Microsoft Sans Serif" TextAlignment="Center" HorizontalAlignment="Center" Foreground="{StaticResource Color_theme_activity}" />
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="kg/h" FontSize="12" />
<TextBlock Style="{StaticResource Styles.Module.Text.ItemHeader}" Text="边料" />
<StackPanel Orientation="Horizontal" Margin="2,0">
<TextBlock Style="{StaticResource Styles.Module.Text.ItemValue}" Text="{Binding Accessory.RimCharge, StringFormat={}{0:F1}}" />
<TextBlock Style="{StaticResource Styles.Module.Text.ItemValue.Unit}" Text="kg/h" />
</StackPanel>
</StackPanel>
</Grid>
......
Project.FLY.Weight/FLY.Weight.UI.Client/UiModule/V3/UcThickness.xaml
View file @ a0a30b9c
......@@ -27,7 +27,7 @@
</StackPanel>
<StackPanel Margin="3" >
<TextBlock Text="边料不回收" Style="{StaticResource TextBlockStyle_title_activity}"/>
<ToggleButton Style="{StaticResource ToggleButtonStyle1}" IsChecked="{Binding Accessory.IsRimNoRecycle}" HorizontalAlignment="Left" IsEnabled="False"/>
<ToggleButton Style="{StaticResource Styles.ToggleButton.YESNO}" IsChecked="{Binding Accessory.IsRimNoRecycle}" HorizontalAlignment="Left" IsEnabled="False"/>
</StackPanel>
<StackPanel Margin="3" >
<TextBlock Text="切边" Style="{StaticResource TextBlockStyle_title_activity}"/>
......
Project.FLY.Weight/FLY.Weight.UI.Client/UiModule/V3/UcTotalFlow.xaml
View file @ a0a30b9c
......@@ -29,7 +29,7 @@
ItemValueBinding="CurrentFlow" ItemColorBinding="Color"
ItemsSource="{Binding Items}"
/>
<StackPanel Orientation="Vertical" VerticalAlignment="Bottom">
<StackPanel VerticalAlignment="Bottom">
<StackPanel Margin="3" >
<StackPanel Orientation="Horizontal">
<TextBlock Text="总流量" Style="{StaticResource TextBlockStyle_title_activity}" Margin="3,0"/>
......@@ -99,7 +99,7 @@
<ColumnDefinition Width="auto"/>
<ColumnDefinition />
</Grid.ColumnDefinitions>
<StackPanel Orientation="Vertical">
<StackPanel>
<StackPanel Orientation="Horizontal">
<TextBlock Text="上卷" Style="{StaticResource TextBlockStyle_title}" FontSize="{StaticResource FontSize_title}" Margin="3,0"/>
<Viewbox MaxWidth="135" MaxHeight="40">
......@@ -149,7 +149,7 @@
<ColumnDefinition Width="auto"/>
<ColumnDefinition />
</Grid.ColumnDefinitions>
<StackPanel Orientation="Vertical">
<StackPanel>
<StackPanel Orientation="Horizontal">
<TextBlock Text="上卷" Style="{StaticResource TextBlockStyle_title}" FontSize="{StaticResource FontSize_title}" Margin="3,0"/>
<Viewbox MaxWidth="135" MaxHeight="40">
......
Project.FLY.Weight/FLY.Weight.UI.Client/UiModule/V3/WdThickness.xaml
View file @ a0a30b9c
......@@ -17,7 +17,7 @@
<StackPanel Margin="5,20">
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeader}" Text="厚度设置" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="44" />
<TextBlock Style="{StaticResource Styles.Text.FieldHeader}" Text="厚度设置" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="44" />
</StackPanel>
<Grid >
<Grid.ColumnDefinitions>
......@@ -27,31 +27,31 @@
<StackPanel Grid.Column="1">
<StackPanel Orientation="Horizontal" >
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="吹膜宽度" />
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="吹膜宽度" />
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding FilmWidth}"/>
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="mm" />
<TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding FilmWidth}"/>
<TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" Text="mm" />
</StackPanel>
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="切边" />
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="切边" />
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding RimWidth}"/>
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="mm" />
<TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding RimWidth}"/>
<TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" Text="mm" />
</StackPanel>
</StackPanel>
</StackPanel>
<StackPanel Orientation="Horizontal" >
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="设定厚度" />
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="设定厚度" />
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding SetThickness}"/>
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="um" />
<TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding SetThickness}"/>
<TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" Text="um" />
</StackPanel>
</StackPanel>
<StackPanel Margin="3" Grid.Row="1" Grid.Column="1" VerticalAlignment="Center" >
<TextBlock Text="边料不回收" Style="{StaticResource TextBlockStyle_FieldHeaderEditable}"/>
<ToggleButton Style="{StaticResource ToggleButtonStyle1}" IsChecked="{Binding IsRimNoRecycle}" />
<TextBlock Text="边料不回收" Style="{StaticResource Styles.Text.FieldHeader.Editable}"/>
<ToggleButton Style="{StaticResource Styles.ToggleButton.YESNO}" IsChecked="{Binding IsRimNoRecycle}" />
</StackPanel>
</StackPanel>
</StackPanel>
......
Project.FLY.Weight/FLY.Weight.UI.Client/UiModule/V4/DynAreaWeightV4.xaml
View file @ a0a30b9c
......@@ -42,18 +42,16 @@
ItemValueBinding="CurrentFlow" ItemColorBinding="Color"
ItemsSource="{Binding Items}"
/>
<TextBlock Grid.Column="1" Text="总流量" Style="{StaticResource TextBlockStyle_title}" />
<Viewbox Grid.Column="1" Grid.Row="1" MaxHeight="80" HorizontalAlignment="Left">
<StackPanel Orientation="Horizontal">
<TextBlock Margin="4" >
<Run Text="{Binding Accessory.TotalFlow,StringFormat={}{0:F1}}" Style="{StaticResource RunStyle_text}" FontSize="60" />
</TextBlock>
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent_mm}" Text="kg/h" FontSize="20" />
</StackPanel>
</Viewbox>
<TextBlock Grid.Column="1" Style="{StaticResource Styles.Module.Text.ItemHeader}" Text="总流量" />
<Viewbox Grid.Column="1" Grid.Row="1" MaxHeight="80" HorizontalAlignment="Left">
<StackPanel Orientation="Horizontal">
<TextBlock Style="{StaticResource Styles.Module.Text.ItemValue}" FontSize="60"
Text="{Binding Accessory.TotalFlow,StringFormat={}{0:F1}}" />
<TextBlock Style="{StaticResource Styles.Module.Text.ItemValue.Unit}" FontSize="20"
Text="kg/h" />
</StackPanel>
</Viewbox>
</Grid>
</StackPanel>
......
Project.FLY.Weight/FLY.Weight.UI.Client/UiModule/V4/UcTotalFlowV4.xaml
View file @ a0a30b9c
......@@ -25,7 +25,7 @@
ItemValueBinding="CurrentFlow" ItemColorBinding="Color"
ItemsSource="{Binding Items}"
/>
<StackPanel Orientation="Vertical" VerticalAlignment="Bottom">
<StackPanel VerticalAlignment="Bottom">
<StackPanel Margin="3" >
<StackPanel Orientation="Horizontal">
<TextBlock Text="总流量" Style="{StaticResource TextBlockStyle_title_activity}" Margin="3,0"/>
......
Project.FLY.Weight/FLY.Weight.UI.Client/UiModule/V4/WdThicknessV4.xaml
View file @ a0a30b9c
......@@ -17,26 +17,26 @@
<StackPanel Margin="5,20">
<StackPanel Margin="5">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeader}" Text="厚度设置" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="44" />
<TextBlock Style="{StaticResource Styles.Text.FieldHeader}" Text="厚度设置" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="44" />
</StackPanel>
<StackPanel Grid.Column="1">
<StackPanel Orientation="Horizontal">
<StackPanel Orientation="Horizontal" >
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="设定厚度" />
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="设定厚度" />
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding SetThickness,StringFormat={}{0:F0}}"/>
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="um" />
<TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding SetThickness,StringFormat={}{0:F0}}"/>
<TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" Text="um" />
</StackPanel>
</StackPanel>
</StackPanel>
<StackPanel Orientation="Horizontal" >
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="吹膜宽度" />
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="吹膜宽度" />
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding FilmWidth,StringFormat={}{0:F0}}"/>
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="mm" />
<TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding FilmWidth,StringFormat={}{0:F0}}"/>
<TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" Text="mm" />
</StackPanel>
</StackPanel>
......@@ -45,19 +45,19 @@
<StackPanel Orientation="Horizontal">
<StackPanel Orientation="Horizontal" >
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="原料密度" />
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="原料密度" />
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding Density,StringFormat={}{0:F3}}"/>
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="kg/m³" />
<TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding Density,StringFormat={}{0:F3}}"/>
<TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" Text="kg/m³" />
</StackPanel>
</StackPanel>
</StackPanel>
<StackPanel Orientation="Horizontal" >
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="总流量设定" />
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="总流量设定" />
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding TotalFlowSetting,StringFormat={}{0:F1}}"/>
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="kg/h
<TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding TotalFlowSetting,StringFormat={}{0:F1}}"/>
<TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" Text="kg/h
" />
</StackPanel>
</StackPanel>
......@@ -71,7 +71,7 @@
IsChecked="{Binding IsSync}"/>
</StackPanel>
<Button Style="{StaticResource ButtonStyle_apply}" Click="btnOkClick" />
<Button Style="{StaticResource Styles.Button.Apply}" Click="btnOkClick" />
......
Project.FLY.Weight/FLY.Weight.UI.Client/UiModule/V5/DynAreaWeightV5.xaml
View file @ a0a30b9c
......@@ -43,18 +43,16 @@
ItemValueBinding="CurrentFlow" ItemColorBinding="Color"
ItemsSource="{Binding Items}"
/>
<TextBlock Grid.Column="1" Text="总流量" Style="{StaticResource TextBlockStyle_title}" />
<TextBlock Grid.Column="1" Style="{StaticResource Styles.Module.Text.ItemHeader}" Text="总流量" />
<Viewbox Grid.Column="1" Grid.Row="1" MaxHeight="80" HorizontalAlignment="Left">
<StackPanel Orientation="Horizontal">
<TextBlock Margin="4" >
<Run Text="{Binding Accessory.TotalFlow,StringFormat={}{0:F1}}" Style="{StaticResource RunStyle_text}" FontSize="60" />
</TextBlock>
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent_mm}" Text="kg/h" FontSize="20" />
</StackPanel>
</Viewbox>
<Viewbox Grid.Column="1" Grid.Row="1" MaxHeight="80" HorizontalAlignment="Left">
<StackPanel Orientation="Horizontal">
<TextBlock Style="{StaticResource Styles.Module.Text.ItemValue}" FontSize="60"
Text="{Binding Accessory.TotalFlow,StringFormat={}{0:F1}}" />
<TextBlock Style="{StaticResource Styles.Module.Text.ItemValue.Unit}" FontSize="20"
Text="kg/h" />
</StackPanel>
</Viewbox>
</Grid>
<Grid Margin="2">
......@@ -62,14 +60,14 @@
<ColumnDefinition/>
<ColumnDefinition Width="auto"/>
</Grid.ColumnDefinitions>
<StackPanel Orientation="Horizontal" Margin="2">
<TextBlock Text="平均厚度" FontSize="12" FontWeight="Bold" FontFamily="YouYuan" TextAlignment="Center" HorizontalAlignment="Center" Foreground="#FF3B3B3B" />
<StackPanel Orientation="Horizontal" Margin="5,0">
<TextBlock Text="{Binding Accessory.Thickness, StringFormat={}{0:F1}}" FontSize="24" FontFamily="Microsoft Sans Serif" TextAlignment="Center" HorizontalAlignment="Center" Foreground="{StaticResource Color_theme_activity}" />
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="um" FontSize="12" />
</StackPanel>
<StackPanel Orientation="Horizontal" Margin="2">
<TextBlock Style="{StaticResource Styles.Module.Text.ItemHeader}" Text="平均厚度" />
<StackPanel Orientation="Horizontal" Margin="2,0">
<TextBlock Style="{StaticResource Styles.Module.Text.ItemValue}" Text="{Binding Accessory.Thickness, StringFormat={}{0:F1}}" />
<TextBlock Style="{StaticResource Styles.Module.Text.ItemValue.Unit}" Text="um" />
</StackPanel>
</Grid>
</StackPanel>
</Grid>
</StackPanel>
</Border>
<Button x:Name="grid_error" Style="{StaticResource DynAreaErrorStyle}" d:DataContext="{StaticResource errorVm}"/>
......
Project.FLY.Weight/FLY.Weight.UI.Client/UiModule/V5/WdThicknessV5.xaml
View file @ a0a30b9c
......@@ -17,24 +17,24 @@
<StackPanel Margin="5,20">
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeader}" Text="厚度设置" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="44" />
<TextBlock Style="{StaticResource Styles.Text.FieldHeader}" Text="厚度设置" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="44" />
</StackPanel>
<StackPanel >
<StackPanel Orientation="Horizontal" >
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="吹膜宽度" />
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="吹膜宽度" />
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding FilmWidth}"/>
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="mm" />
<TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding FilmWidth}"/>
<TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" Text="mm" />
</StackPanel>
</StackPanel>
</StackPanel>
<StackPanel Orientation="Horizontal" >
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="设定厚度" />
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="设定厚度" />
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding SetThickness}"/>
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="um" />
<TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding SetThickness}"/>
<TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" Text="um" />
</StackPanel>
</StackPanel>
</StackPanel>
......
Project.FLY.Weight/FLY.Weight.UI.Client/UiModule/V6/UcTotalFlowV6.xaml
View file @ a0a30b9c
......@@ -5,7 +5,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:FLY.Weight.UI.Client.UiModule"
xmlns:control="clr-namespace:FLY.Weight.UI.Client.Control"
xmlns:sys="clr-namespace:System;assembly=mscorlib"
xmlns:sys="clr-namespace:System;assembly=mscorlib" xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
mc:Ignorable="d" d:DesignHeight="80" d:DesignWidth="1024">
<UserControl.Resources>
<ResourceDictionary>
......@@ -66,16 +66,23 @@
<TextBlock Text="累计总产量" Style="{StaticResource TextBlockStyle_title}" Grid.ColumnSpan="2" Margin="0,0,0,40.5" Grid.RowSpan="2" />
<Button Style="{StaticResource Styles.Button.Empty}" HorizontalAlignment="Right" Grid.Column="2" Grid.RowSpan="2" VerticalAlignment="Top" Click="button_clear_Click">
<!--<Button Style="{StaticResource Styles.Button.Empty}" HorizontalAlignment="Right" Grid.Column="2" Grid.RowSpan="2" VerticalAlignment="Top" Click="button_clear_Click">
<Grid Style="{StaticResource Styles.Shadow}">
<Grid Width="50" Height="50">
<Ellipse Fill="White" Stretch="Uniform" Margin="2"/>
<Path Data="{StaticResource Geometry_close-circle}" Fill="{StaticResource Color_off}" Stretch="Uniform" />
</Grid>
</Grid>
</Button>-->
<Button Style="{StaticResource Styles.Button.Icon.Large}"
Foreground="{StaticResource Brushes.Validation}"
HorizontalAlignment="Right" Grid.Column="2" Grid.RowSpan="2" VerticalAlignment="Top" Click="button_clear_Click">
<Grid Style="{StaticResource Styles.Shadow}">
<Rectangle Width="30" Height="30" Fill="White"/>
<iconPacks:PackIconMaterial Kind="CloseBox" Width="40"/>
</Grid>
</Button>
<TextBlock Grid.Row="1" Grid.RowSpan="2" VerticalAlignment="Bottom" Grid.ColumnSpan="2" >
<Run Text="{Binding Accessory.TotalProduction,StringFormat={}{0:F0}}" Style="{StaticResource RunStyle_text}" />
</TextBlock>
......
Project.FLY.Weight/FLY.Weight.UI.Client/UnitTests/FeederSystemServiceUt.cs 0 → 100644
View file @ a0a30b9c
using FLY.OBJComponents.IService;
using FLY.OBJComponents.Server;
using FLY.Weight.Common;
using FLY.Weight.IService;
using MathNet.Numerics;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.ComponentModel;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace FLY.Weight.UI.Client.UnitTests
{
public class FeederSystemServiceUt : IFeederSystemService
{
public event PropertyChangedEventHandler PropertyChanged;
#region IFeederSystemService
/// <summary>
/// 吸料
/// </summary>
public ObservableCollection<FeederData> FeederDatas { get; } = new ObservableCollection<FeederData>();
/// <summary>
/// 报警的寄存器
/// </summary>
public FeederAccessory FeederAccy { get; } = new FeederAccessory();
private PLCProxySystem plcos = new PLCProxySystem();
/// <summary>
/// PLC代理系统
/// </summary>
public IPLCProxySystemService PLCos { get { return plcos; } }
public int[] FeederCntOfEachs { get; set; }
public string Version { get; set; } = "3";
#endregion
public FeederSystemServiceUt() {
FeederCntOfEachs = new int[7];
for (int i = 0; i < 7; i++)
{
FeederCntOfEachs[i] = 4;
}
FeederCntOfEachs[6] = 6;
for (int i = 0; i < FeederCntOfEachs.Count(); i++)
{
string number = FeederIndex2Number(i);
FeederData fd = new FeederData();
fd.Init(number, FeederCntOfEachs[i] );
FeederDatas.Add(fd);
}
}
string FeederIndex2Number(int index)
{
string number = ((char)('A' + (index ))).ToString();
return number;
}
}
}
Project.FLY.Weight/FLY.Weight.UI.Client/WdDensitySet.xaml
View file @ a0a30b9c
......@@ -16,10 +16,8 @@
</ResourceDictionary>
</Window.Resources>
<StackPanel Name="root_grid" Margin="5,20" >
<StackPanel.DataContext>
<StaticResource ResourceKey="unittests_weighters"/>
</StackPanel.DataContext>
<StackPanel Name="root_grid" Margin="5,20" d:DataContext="{StaticResource unittests_weighters}" >
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader}" Text="密度设置" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="44" />
</StackPanel>
......@@ -52,7 +50,7 @@
<Border BorderThickness="1" BorderBrush="White" Margin="3" >
<StackPanel Orientation="Horizontal" Margin="20,3" HorizontalAlignment="Center" VerticalAlignment="Center">
<Viewbox MaxWidth="100">
<TextBox Style="{StaticResource Styles.Text.FieldContent.Input}" Text="{Binding Density, StringFormat={}{0:F3}}" Background="Transparent" Foreground="White"/>
<TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding Density, StringFormat={}{0:F3}}" Background="Transparent" Foreground="White"/>
</Viewbox>
<TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" Text="kg/m³" Foreground="White" />
</StackPanel>
......
Project.FLY.Weight/FLY.Weight.UI.Client/WdFrequency.xaml
View file @ a0a30b9c
......@@ -6,8 +6,7 @@
xmlns:flyctrllib="clr-namespace:FLY.ControlLibrary;assembly=FLY.ControlLibrary"
xmlns:local="clr-namespace:FLY.Weight.UI.Client" xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
mc:Ignorable="d"
Title="Window_Frequency" WindowStartupLocation="CenterScreen" d:DesignWidth="334.492" d:DesignHeight="318.246"
Background="WhiteSmoke">
Title="Window_Frequency" WindowStartupLocation="CenterScreen" d:DesignWidth="334.492" d:DesignHeight="318.246" >
<Window.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
......@@ -30,7 +29,7 @@
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="手动频率" />
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource Styles.Text.FieldContent.Input}" Text="{Binding FrequencySet, StringFormat={}{0:F1}}"/>
<TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding FrequencySet, StringFormat={}{0:F1}}"/>
<TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" Text="Hz" />
</StackPanel>
</StackPanel>
......
Project.FLY.Weight/FLY.Weight.UI.Client/WdIngredient.xaml
View file @ a0a30b9c
......@@ -118,7 +118,7 @@
<StackPanel Margin="10,0">
<Border BorderThickness="1" BorderBrush="White" Margin="3" MinWidth="120">
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource Styles.Text.FieldContent.Input}" Text="{Binding MixPSet,StringFormat={}{0:F1}}" Foreground="White" Background="Transparent"/>
<TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding MixPSet,StringFormat={}{0:F1}}" Foreground="White" Background="Transparent"/>
<TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" Text="%" Foreground="White" />
</StackPanel>
</Border>
......@@ -164,7 +164,7 @@
<TextBlock Text="料斗重量" Style="{StaticResource Styles.Text.FieldHeader}"
Visibility="{Binding BucketValveIsOpen,Converter={StaticResource visbilityconv},ConverterParameter=HiddenWhenTrue}"/>
<TextBlock Text="料斗卸料" Style="{StaticResource Styles.Text.FieldHeader}" Foreground="{StaticResource Brushes.Text.Activity}"
Visibility="{Binding BucketValveIsOpen,Converter={StaticResource ResourceKey=visbilityconv},ConverterParameter=Hidden}"/>
Visibility="{Binding BucketValveIsOpen,Converter={StaticResource visbilityconv},ConverterParameter=Hidden}"/>
</Grid>
<StackPanel Orientation="Horizontal">
<TextBlock Style="{StaticResource Styles.Text.FieldContent}" Text="{Binding MixBucketWeight,StringFormat={}{0:F4}}"/>
......
Project.FLY.Weight/FLY.Weight.UI.Client/WdRatioSet.xaml
View file @ a0a30b9c
......@@ -16,10 +16,8 @@
</ResourceDictionary>
</Window.Resources>
<StackPanel Name="root_grid" Margin="5,20" >
<StackPanel.DataContext>
<StaticResource ResourceKey="unittests_weighters"/>
</StackPanel.DataContext>
<StackPanel Name="root_grid" Margin="5,20" d:DataContext="{StaticResource unittests_weighters}">
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader}" Text="流量设置" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="44" />
</StackPanel>
......@@ -45,7 +43,7 @@
<Border Background="{Binding Color}" Margin="3" >
<Border BorderThickness="1" BorderBrush="White" Margin="3" MinWidth="160">
<StackPanel Orientation="Horizontal" Margin="20,3" HorizontalAlignment="Center" VerticalAlignment="Center">
<TextBox Style="{StaticResource Styles.Text.FieldContent.Input}" Text="{Binding ScrewPSet, StringFormat={}{0:F1}}" Background="Transparent" Foreground="White"/>
<TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding ScrewPSet, StringFormat={}{0:F1}}" Background="Transparent" Foreground="White"/>
<TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" Text="%" Foreground="White" />
</StackPanel>
</Border>
......@@ -63,7 +61,7 @@
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="总流量" />
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource Styles.Text.FieldContent.Input}" Text="{Binding Accessory.TotalFlowSetting, StringFormat={}{0:F1}}"/>
<TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding Accessory.TotalFlowSetting, StringFormat={}{0:F1}}"/>
<TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" Text="kg/h" />
</StackPanel>
</StackPanel>
......
Project.FLY.Weight/FLY.Weight.UI.Server/WdSetupFeeder.xaml
View file @ a0a30b9c
......@@ -7,11 +7,11 @@
mc:Ignorable="d"
Title="WdSetup" SizeToContent="WidthAndHeight" >
<Window.Resources>
<local:BinCntsConverter x:Key="binCntsConv"/>
</Window.Resources>
<Grid>
<StackPanel>
<StackPanel x:Name="sp_sysParam" Orientation="Horizontal" Grid.Column="1" Margin="5">
<StackPanel x:Name="sp_sysParam" Orientation="Horizontal" Grid.Column="1" Margin="5" DataContext="{Binding SysParam}">
<CheckBox Content="有吸料"
IsChecked="{Binding HasFeeder}"/>
</StackPanel>
......@@ -19,18 +19,23 @@
<StackPanel Orientation="Horizontal">
<StackPanel Margin="5">
<TextBlock Text="plcgroup配置文件" Margin="2"/>
<ComboBox MinWidth="200" Margin="2" x:Name="comboBox" >
<ComboBox.ItemTemplate>
<DataTemplate>
<TextBlock Text="{Binding Name}"/>
</DataTemplate>
</ComboBox.ItemTemplate>
</ComboBox>
<ComboBox MinWidth="200" Margin="2" ItemsSource="{Binding PlcGroupItems}" DisplayMemberPath="Name" SelectedItem="{Binding SelectedItem}" />
</StackPanel>
<Button Content="确定" Padding="20,5" Margin="5" VerticalAlignment="Bottom"
Click="btnOkClick" />
</StackPanel>
</GroupBox>
<GroupBox Header="以plcgroup配置文件为模板生成">
<StackPanel Orientation="Horizontal">
<StackPanel Margin="5">
<TextBlock Margin="2"
Text="输入每层吸料机数(例如:64446)" />
<TextBox Margin="2"
Text="{Binding BinCnts,Converter={StaticResource binCntsConv}}"/>
</StackPanel>
<Button Content="生成" Padding="20,5" Margin="5" Click="btnGenClick"/>
</StackPanel>
</GroupBox>
</StackPanel>
</Grid>
......
Project.FLY.Weight/FLY.Weight/Client/FeederSystemServiceClient.cs
View file @ a0a30b9c
......@@ -29,12 +29,12 @@ namespace FLY.Weight.Client
/// <summary>
/// 每层吸料的吸料数量
/// </summary>
public int[] FeederCntOfEachs { get; set; }
public int[] FeederCntOfEachs { get; set; } = new int[] { 4, 4, 4, 4, 4 };
#endregion
#endregion
PLCProxySystemServiceClient plcos;
PLCProxySystemServiceClient plcos;
public IPLCProxySystemService PLCos => plcos;
/// <summary>
......
Project.FLY.Weight/FLY.Weight/Server/FeederSystem.cs
View file @ a0a30b9c
......@@ -30,7 +30,7 @@ namespace FLY.Weight.Server
/// <summary>
/// 每层吸料的吸料数量
/// </summary>
public int[] FeederCntOfEachs { get; private set; }
public int[] FeederCntOfEachs { get; private set; } = new int[] { 4, 4, 4, 4, 4 };
/// <summary>
/// 吸料版本
......@@ -61,7 +61,7 @@ namespace FLY.Weight.Server
}
public void Init(WarningSystem2 warning)
public void Init(WarningSystem2 warning, int plcErrCode)
{
this.warning = warning;
......@@ -72,7 +72,11 @@ namespace FLY.Weight.Server
//--------------------------------------------------------------------------------
//step 2 报警配置
errorConf = new ErrorConf(plcos, this.warning, plcgroup.Devices.Select(d => d.PlcName).ToArray());
errorConf = new ErrorConf(
plcos,
this.warning,
plcgroup.Devices.Select(d => d.PlcName).ToArray(),
plcErrCode);
errorConf.AddErrorAction(FeederAccy);
......
Project.FLY.Weight/FLY.Weight/Server/TDGage.cs
View file @ a0a30b9c
......@@ -95,9 +95,9 @@ namespace FLY.Weight.Server
mWarning.Init(mHistoryDb.ErrorBuffer);
mData.Init(mHistoryDb, mWarning);
if (mFeederSystem != null) {
mFeederSystem.Init(mWarning);
mFeederSystem.Init(mWarning, OBJComponents.Common.PlcErrNos.Instance.ERRNO_PLC_DISCONNECTED.Code+1);
}
string connName = "blowing";
......
thick_public @ 3fc76b07
Subproject commit a20a0d42a00782e17c822af011c952cbee32032f
Subproject commit 3fc76b070e392b2c7b074597836928a351b376bb
脚本/和美扫描客户端容器描述.unity/unity/weighter.component.config
View file @ a0a30b9c
......@@ -12,6 +12,7 @@
<register type="IUiModule2" mapTo="UiModule2_DynAreaWeight" name="weighter_da" />
<register type="IUiModule2" mapTo="UiModule2_FlowGraph" name="weighter_fg" />
<register type="IUiModule2" mapTo="UiModule2_MainGraph" name="weighter_mg" />
<register type="IUiModule2" mapTo="UiModule2_FeederPanel" name="weighter_feeder" />
</container>
</unity>
</configuration>
\ No newline at end of file
脚本/和美扫描客户端容器描述.unity/unity/weighter.service.config
View file @ a0a30b9c
......@@ -42,6 +42,13 @@
<param name="connName" dependencyName="cn2" />
</constructor>
</register>
<register type="IFeederSystemService" mapTo="FeederSystemServiceClient">
<lifetime type="singleton" />
<constructor>
<param name="serviceId" value="35050" />
<param name="connName" dependencyName="cn2" />
</constructor>
</register>
</container>
</unity>
</configuration>
\ No newline at end of file
脚本/和美扫描客户端容器描述.xmind
View file @ a0a30b9c
No preview for this file type
脚本/和美追边客户端容器描述.unity/unity/weighter.component.config
View file @ a0a30b9c
......@@ -12,6 +12,7 @@
<register type="IUiModule2" mapTo="UiModule2_DynAreaWeight" name="weighter_da" />
<register type="IUiModule2" mapTo="UiModule2_FlowGraph" name="weighter_fg" />
<register type="IUiModule2" mapTo="UiModule2_MainGraph" name="weighter_mg" />
<register type="IUiModule2" mapTo="UiModule2_FeederPanel" name="weighter_feeder" />
</container>
</unity>
</configuration>
\ No newline at end of file
脚本/和美追边客户端容器描述.unity/unity/weighter.service.config
View file @ a0a30b9c
......@@ -42,6 +42,13 @@
<param name="connName" dependencyName="cn2" />
</constructor>
</register>
<register type="IFeederSystemService" mapTo="FeederSystemServiceClient">
<lifetime type="singleton" />
<constructor>
<param name="serviceId" value="35050" />
<param name="connName" dependencyName="cn2" />
</constructor>
</register>
</container>
</unity>
</configuration>
\ No newline at end of file
脚本/和美追边客户端容器描述.xmind
View file @ a0a30b9c
No preview for this file type
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