Skip to content

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

中心收卷 v0.9

parent 2b690f92
Hide whitespace changes
Inline Side-by-side
Showing with 836 additions and 237 deletions
Project.FLY.Winder_20190413/FLY.Winder.UI.Client/PgInterstitialParam/PgInterstitialParam.xaml
View file @ 52e9f6b2
......@@ -198,6 +198,12 @@
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent}" Text="{Binding Tension2,StringFormat={}{0:F0}}" />
</StackPanel>
</StackPanel>
<StackPanel Margin="5">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="&#13;张力补偿" />
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding TensionComp,StringFormat={}{0:F3}}" />
</StackPanel>
</StackPanel>
<StackPanel Margin="5">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="接料补偿&#13;长度" />
<StackPanel Orientation="Horizontal">
......@@ -235,12 +241,19 @@
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent}" Text="{Binding Tension2,StringFormat={}{0:F0}}" />
</StackPanel>
</StackPanel>
<StackPanel Margin="5">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="&#13;张力补偿" />
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding TensionComp,StringFormat={}{0:F3}}" />
</StackPanel>
</StackPanel>
<StackPanel Margin="5">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="接料补偿&#13;长度" />
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding SpliceCompLen,StringFormat={}{0:F1}}" />
</StackPanel>
</StackPanel>
<StackPanel Margin="5">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="接料补偿&#13;开始位置" />
<StackPanel Orientation="Horizontal">
......
Project.FLY.Winder_20190413/FLY.Winder.UI.Client/PgInterstitialParam/PgInterstitialParam.xaml.cs
View file @ 52e9f6b2
......@@ -58,6 +58,7 @@ namespace FLY.Winder.UI.Client
"InterstitialWidth",
"InterstitialPressureComp",
"Tension2",
"TensionComp",
"SpliceCompLen",
"SpliceCompBeginPos",
"SpliceCompEndPos"
......
Project.FLY.Winder_20190413/FLY.Winder.UI.Client/UIModule/Page_Main.xaml
View file @ 52e9f6b2
......@@ -79,7 +79,7 @@
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type ToggleButton}">
<Canvas x:Name="canvas" Height="55" Width="110" Background="Red">
<Canvas x:Name="canvas" Height="55" Width="110" Background="DarkRed">
<Rectangle x:Name="Path_block" Height="45" Width="24" Margin="5" Fill="White" />
<StackPanel x:Name="SP_Text" Orientation="Horizontal" Margin="20,15" Canvas.Right="0">
<TextBlock x:Name="TB_OnOff" Text="停止" Foreground="White" FontSize="24" FontFamily="YouYuan"/>
......
Project.FLY.Winder_20190413/FLY.Winder.UI.Client/UIModule/Page_Main.xaml.cs
View file @ 52e9f6b2
......@@ -25,7 +25,7 @@ namespace FLY.Winder.UI.Client.UIModule
SetPLCUpdatePlan setPlan_accessory;
SetPLCUpdatePlan[] setPlan_winders = new SetPLCUpdatePlan[2];
List<ResetAction2> resetActions = new List<ResetAction2>();
public Page_Main()
{
InitializeComponent();
......@@ -34,12 +34,12 @@ namespace FLY.Winder.UI.Client.UIModule
{
winderSystem = TDGage.Current.mWinderSystem;
grid_winder.DataContext = winderSystem;
ResetAction.SetResetAction(button_ron, winderSystem.Accessory, "RotaryOn");
ResetAction.SetResetAction(button_rorg, winderSystem.Accessory, "RotaryOrg");
ResetAction.SetResetAction(button_clear0, winderSystem.Items[0], "MeasureReset");
ResetAction.SetResetAction(button_clear1, winderSystem.Items[1], "MeasureReset");
resetActions.Add(new ResetAction2(button_ron, winderSystem.Accessory, "RotaryOn"));
resetActions.Add(new ResetAction2(button_rorg, winderSystem.Accessory, "RotaryOrg"));
resetActions.Add(new ResetAction2(button_clear0, winderSystem.Items[0], "MeasureReset"));
resetActions.Add(new ResetAction2(button_clear1, winderSystem.Items[1], "MeasureReset"));
//注册属性更新计划
setPlan_accessory = new SetPLCUpdatePlan(
winderSystem.PLCos,
......
Project.FLY.Winder_20190413/FLY.Winder.UI.Client/UIModule/ResetAction.cs
View file @ 52e9f6b2
......@@ -3,54 +3,90 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Windows.Controls;
using System.Windows.Controls.Primitives;
using System.Windows.Input;
namespace FLY.Winder.UI.Client.UIModule
{
public class ResetAction
//public class ResetAction
//{
// public object obj;
// public string propertyname;
// public bool pressIsTrue;
// public ResetAction(object obj, string propertyname, bool pressIsTrue)
// {
// this.obj = obj;
// this.propertyname = propertyname;
// this.pressIsTrue = pressIsTrue;
// }
// public static void SetResetAction(ButtonBase button, object obj, string propertyname, bool pressIsTrue = true)
// {
// button.Tag = new ResetAction(obj, propertyname, pressIsTrue);
// button.PreviewMouseDown += Button_PreviewMouseDown;
// button.PreviewTouchDown += Button_PreviewTouchDown;
// button.PreviewMouseUp += Button_PreviewMouseUp;
// button.PreviewTouchUp += Button_PreviewTouchUp;
// }
// private static void Button_PreviewTouchUp(object sender, TouchEventArgs e)
// {
// ResetAction ra = (sender as Button).Tag as ResetAction;
// ra.Up();
// }
// private static void Button_PreviewMouseUp(object sender, MouseButtonEventArgs e)
// {
// ResetAction ra = (sender as Button).Tag as ResetAction;
// ra.Up();
// }
// private static void Button_PreviewTouchDown(object sender, TouchEventArgs e)
// {
// ResetAction ra = (sender as Button).Tag as ResetAction;
// ra.Down();
// }
// private static void Button_PreviewMouseDown(object sender, MouseButtonEventArgs e)
// {
// ResetAction ra = (sender as Button).Tag as ResetAction;
// ra.Down();
// }
// public void Down()
// {
// if (pressIsTrue)
// Misc.PropertiesManager.SetValue(obj, propertyname, true);
// else
// Misc.PropertiesManager.SetValue(obj, propertyname, false);
// }
// public void Up()
// {
// if (pressIsTrue)
// Misc.PropertiesManager.SetValue(obj, propertyname, false);
// else
// Misc.PropertiesManager.SetValue(obj, propertyname, true);
// }
//}
public class ResetAction2
{
public object obj;
public string propertyname;
public bool pressIsTrue;
public ResetAction(object obj, string propertyname, bool pressIsTrue)
System.Windows.UIElement uIElement;
public ResetAction2(System.Windows.UIElement uIElement, object obj, string propertyname, bool pressIsTrue=true)
{
this.uIElement = uIElement;
this.obj = obj;
this.propertyname = propertyname;
this.pressIsTrue = pressIsTrue;
}
public static void SetResetAction(Button button, object obj, string propertyname, bool pressIsTrue = true)
{
button.Tag = new ResetAction(obj, propertyname, pressIsTrue);
button.PreviewMouseDown += Button_PreviewMouseDown;
button.PreviewTouchDown += Button_PreviewTouchDown;
button.PreviewMouseUp += Button_PreviewMouseUp;
button.PreviewTouchUp += Button_PreviewTouchUp;
}
private static void Button_PreviewTouchUp(object sender, TouchEventArgs e)
{
ResetAction ra = (sender as Button).Tag as ResetAction;
ra.Up();
}
private static void Button_PreviewMouseUp(object sender, MouseButtonEventArgs e)
{
ResetAction ra = (sender as Button).Tag as ResetAction;
ra.Up();
}
private static void Button_PreviewTouchDown(object sender, TouchEventArgs e)
{
ResetAction ra = (sender as Button).Tag as ResetAction;
ra.Down();
}
private static void Button_PreviewMouseDown(object sender, MouseButtonEventArgs e)
{
ResetAction ra = (sender as Button).Tag as ResetAction;
ra.Down();
uIElement.PreviewMouseDown += (s, e) => Down();
uIElement.PreviewTouchDown += (s, e) => Down();
uIElement.PreviewMouseUp += (s, e) => Up();
uIElement.PreviewTouchUp += (s, e) => Up();
}
public void Down()
......
Project.FLY.Winder_20190413/FLY.Winder.UI.Client/UIModule/UcCenterWinder/UcCenterWinder.xaml
View file @ 52e9f6b2
......@@ -18,12 +18,40 @@
<Grid>
<Viewbox VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10">
<StackPanel>
<StackPanel Margin="0,0,0,10">
<TextBlock Text="收卷模式选择" FontSize="20" Margin="3" Padding="4,0" Background="#FF636363" Foreground="White" HorizontalAlignment="Left"/>
<StackPanel Orientation="Horizontal" >
<Button x:Name="btnSurface" Style="{StaticResource ButtonStyle_Surface}" Tag="{Binding Accessory.IsSurfaceWindGet}" />
<Button x:Name="btnCenter" Style="{StaticResource ButtonStyle_Center}" Tag="{Binding Accessory.IsCenterWindGet}"/>
<Button x:Name="btnCs" Style="{StaticResource ButtonStyle_SurfaceCenter}" Tag="{Binding Accessory.IsCsWindGet}"/>
<StackPanel Orientation="Horizontal" Margin="0,0,0,10">
<StackPanel Margin="5">
<TextBlock Text="内收卷模式选择" FontSize="20" Margin="3" Padding="4,0" Background="Orange" Foreground="White" HorizontalAlignment="Left"/>
<StackPanel Orientation="Horizontal" >
<Button x:Name="btnSurface0" Style="{StaticResource ButtonStyle_toggle}"
Tag="{Binding Items[0].IsSurfaceWindGet}" >
表面
</Button>
<Button x:Name="btnCenter0" Style="{StaticResource ButtonStyle_toggle}"
Tag="{Binding Items[0].IsCenterWindGet}">
中心
</Button>
<Button x:Name="btnCs0" Style="{StaticResource ButtonStyle_toggle}" Width="170"
Tag="{Binding Items[0].IsCsWindGet}">
表面+中心
</Button>
</StackPanel>
</StackPanel>
<StackPanel Margin="5">
<TextBlock Text="外收卷模式选择" FontSize="20" Margin="3" Padding="4,0" Background="DarkOrange" Foreground="White" HorizontalAlignment="Left"/>
<StackPanel Orientation="Horizontal" >
<Button x:Name="btnSurface1" Style="{StaticResource ButtonStyle_toggle}"
Tag="{Binding Items[1].IsSurfaceWindGet}" >
表面
</Button>
<Button x:Name="btnCenter1" Style="{StaticResource ButtonStyle_toggle}"
Tag="{Binding Items[1].IsCenterWindGet}">
中心
</Button>
<Button x:Name="btnCs1" Style="{StaticResource ButtonStyle_toggle}" Width="170"
Tag="{Binding Items[1].IsCsWindGet}">
表面+中心
</Button>
</StackPanel>
</StackPanel>
</StackPanel>
......@@ -96,12 +124,12 @@
</StackPanel>
<StackPanel Style="{StaticResource SpStyle_Editable}" Grid.Column="1" Grid.Row="2">
<TextBox Style="{StaticResource TextBoxStyle_Content}" Text="{Binding Items[0].CenterInitDia}" />
<TextBox Style="{StaticResource TextBoxStyle_Content}" Text="{Binding Items[0].CenterInitDia, StringFormat={}{0:F0}}" />
<TextBlock Text="mm" Style="{StaticResource TextBlockStyle_FieldContent_mm}" />
</StackPanel>
<StackPanel Style="{StaticResource SpStyle_Editable}" Grid.Column="1" Grid.Row="3">
<TextBox Style="{StaticResource TextBoxStyle_Content}" Text="{Binding Items[0].CenterTaperSet}" />
<TextBox Style="{StaticResource TextBoxStyle_Content}" Text="{Binding Items[0].CenterTaperSet, StringFormat={}{0:F0}}" />
<TextBlock Text="%" Style="{StaticResource TextBlockStyle_FieldContent_mm}" />
</StackPanel>
......@@ -123,12 +151,12 @@
</StackPanel>
<StackPanel Style="{StaticResource SpStyle_Editable}" Grid.Column="2" Grid.Row="2" >
<TextBox Style="{StaticResource TextBoxStyle_Content}" Text="{Binding Items[1].CenterInitDia}" />
<TextBox Style="{StaticResource TextBoxStyle_Content}" Text="{Binding Items[1].CenterInitDia, StringFormat={}{0:F0}}" />
<TextBlock Text="mm" Style="{StaticResource TextBlockStyle_FieldContent_mm}" />
</StackPanel>
<StackPanel Style="{StaticResource SpStyle_Editable}" Grid.Column="2" Grid.Row="3">
<TextBox Style="{StaticResource TextBoxStyle_Content}" Text="{Binding Items[1].CenterTaperSet}" />
<TextBox Style="{StaticResource TextBoxStyle_Content}" Text="{Binding Items[1].CenterTaperSet, StringFormat={}{0:F0}}" />
<TextBlock Text="%" Style="{StaticResource TextBlockStyle_FieldContent_mm}" />
</StackPanel>
......@@ -157,8 +185,10 @@
<TextBlock Style="{StaticResource TextBlockStyle_Content}" Text="{Binding Items[0].EPAirPressure,StringFormat={}{0:F1}}"/>
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="kg"/>
</StackPanel>
<Button x:Name="btnSeparate0" Style="{StaticResource ButtonStyle_Separate}" Grid.Column="4" Grid.Row="4" Grid.RowSpan="2" Tag="{Binding Items[0].IsEPRollerSeparated}" />
<Button x:Name="btnSeparate0" Style="{StaticResource ButtonStyle_Separate}" Grid.Column="4" Grid.Row="4" Grid.RowSpan="2"
Tag="{Binding Items[0].IsEPRollerClosed}" />
<!--外压辊EP-->
<StackPanel Style="{StaticResource SpStyle_Editable}" Grid.Column="5" Grid.Row="1">
<TextBox Style="{StaticResource TextBoxStyle_Content}" Text="{Binding Items[1].EPInitPressure,StringFormat={}{0:F1}}" />
......@@ -174,7 +204,8 @@
<TextBlock Style="{StaticResource TextBlockStyle_Content}" Text="{Binding Items[1].EPAirPressure,StringFormat={}{0:F1}}"/>
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="kg"/>
</StackPanel>
<Button x:Name="btnSeparate1" Style="{StaticResource ButtonStyle_Separate}" Grid.Column="5" Grid.Row="4" Grid.RowSpan="2" Tag="{Binding Items[1].IsEPRollerSeparated}"/>
<Button x:Name="btnSeparate1" Style="{StaticResource ButtonStyle_Separate}" Grid.Column="5" Grid.Row="4" Grid.RowSpan="2"
Tag="{Binding Items[1].IsEPRollerClosed}"/>
</Grid>
</StackPanel>
......
Project.FLY.Winder_20190413/FLY.Winder.UI.Client/UIModule/UcCenterWinder/UcCenterWinder.xaml.cs
View file @ 52e9f6b2
......@@ -23,9 +23,8 @@ namespace FLY.Winder.UI.Client.UIModule
{
FLY.Winder.Client.WinderSystemServiceClient winderSystem;
SetPLCUpdatePlan setPlan_accessory;
SetPLCUpdatePlan[] setPlan_winders = new SetPLCUpdatePlan[2];
List<ResetAction2> resetActions = new List<ResetAction2>();
public UcCenterWinder()
{
......@@ -35,23 +34,17 @@ namespace FLY.Winder.UI.Client.UIModule
{
winderSystem = TDGage.Current.mWinderSystem;
this.DataContext = winderSystem;
ResetAction.SetResetAction(btnSurface, winderSystem.Accessory, "IsSurfaceWindSet");
ResetAction.SetResetAction(btnCenter, winderSystem.Accessory, "IsCenterWindSet");
ResetAction.SetResetAction(btnCs, winderSystem.Accessory, "IsCsWindSet");
resetActions.Add(new ResetAction2(btnSurface0, winderSystem.Items[0], "IsSurfaceWindSet"));
resetActions.Add(new ResetAction2(btnCenter0, winderSystem.Items[0], "IsCenterWindSet"));
resetActions.Add(new ResetAction2(btnCs0, winderSystem.Items[0], "IsCsWindSet"));
resetActions.Add(new ResetAction2(btnSeparate0, winderSystem.Items[0], "EPRollerSeparateSet"));
ResetAction.SetResetAction(btnSeparate0, winderSystem.Items[0], "EPRollerSeparateSet");
ResetAction.SetResetAction(btnSeparate1, winderSystem.Items[1], "EPRollerSeparateSet");
resetActions.Add(new ResetAction2(btnSurface1, winderSystem.Items[1], "IsSurfaceWindSet"));
resetActions.Add(new ResetAction2(btnCenter1, winderSystem.Items[1], "IsCenterWindSet"));
resetActions.Add(new ResetAction2(btnCs1, winderSystem.Items[1], "IsCsWindSet"));
resetActions.Add(new ResetAction2(btnSeparate1, winderSystem.Items[1], "EPRollerSeparateSet"));
//注册属性更新计划
setPlan_accessory = new SetPLCUpdatePlan(
winderSystem.PLCos,
winderSystem.Accessory,
new string[] {
"IsSurfaceWindGet",
"IsCenterWindGet",
"IsCsWindGet"
});
for (int i = 0; i < 2; i++)
{
setPlan_winders[i] = new SetPLCUpdatePlan(
......@@ -60,17 +53,45 @@ namespace FLY.Winder.UI.Client.UIModule
new string[] {
"CenterTensionSet",
"CenterInitDia",
"IsCenterInitDiaNotify",
"CenterTaperSet",
"CenterTensionKg",
"CenterDia",
"EPInitPressure",
"EPTaperSet",
"EPAirPressure",
"IsEPRollerSeparated"
"IsEPRollerClosed",
"IsSurfaceWindGet",
"IsCenterWindGet",
"IsCsWindGet"
});
}
winderSystem.Items[0].PropertyChanged += Items0_PropertyChanged;
winderSystem.Items[1].PropertyChanged += Items1_PropertyChanged;
}
private async void Items0_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
{
if (e.PropertyName == "CenterInitDia")
{
if (winderSystem.IsInPushValue)
return;
await Task.Delay(1000);//1s后触发通知
winderSystem.Items[0].IsCenterInitDiaNotify = true;
}
}
private async void Items1_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
{
if (e.PropertyName == "CenterInitDia")
{
if (winderSystem.IsInPushValue)
return;
await Task.Delay(1000);//1s后触发通知
winderSystem.Items[1].IsCenterInitDiaNotify = true;
}
}
private void UserControl_Unloaded(object sender, RoutedEventArgs e)
{
......
Project.FLY.Winder_20190413/FLY.Winder.UI.Client/UIModule/UcCenterWinder/UcCenterWinderStyle.xaml
View file @ 52e9f6b2
......@@ -59,83 +59,84 @@
<Setter TargetName="TB_OnOff" Property="Text" Value="分离"/>
<Setter TargetName="Path_block" Property="Canvas.Left" Value="0"/>
<Setter TargetName="SP_Text" Property="Canvas.Right" Value="0"/>
<Setter TargetName="canvas" Property="Background" Value="Red"/>
<Setter TargetName="canvas" Property="Background" Value="DarkRed"/>
</DataTrigger>
<Trigger Property="IsKeyboardFocused" Value="true">
</Trigger>
<Trigger Property="IsEnabled" Value="false">
</Trigger>
<Trigger Property="IsPressed" Value="true">
<Setter Property="Opacity" Value="0.5"/>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
<Style TargetType="Button" x:Key="ButtonStyle_Surface" >
<Setter Property="Margin" Value="5"/>
<Setter Property="HorizontalContentAlignment" Value="Center"/>
<Setter Property="VerticalContentAlignment" Value="Center"/>
<Setter Property="Padding" Value="1"/>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type Button}">
<Canvas x:Name="canvas" Height="55" Width="110" Background="{StaticResource Color_theme_activity}">
<Rectangle x:Name="Path_block" Height="45" Width="24" Margin="5" Fill="White" Canvas.Right="0" />
<StackPanel x:Name="SP_Text" Orientation="Horizontal" Margin="20,15" >
<TextBlock x:Name="TB_OnOff" Text="表面" Foreground="White" FontSize="24" FontFamily="YouYuan"/>
</StackPanel>
</Canvas>
<ControlTemplate.Triggers>
<DataTrigger Binding="{Binding Tag,RelativeSource={RelativeSource Mode=Self}}" Value="False">
<Setter TargetName="Path_block" Property="Canvas.Left" Value="0"/>
<Setter TargetName="SP_Text" Property="Canvas.Right" Value="0"/>
<Setter TargetName="canvas" Property="Background" Value="{StaticResource Color_theme_static}"/>
</DataTrigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
<Style TargetType="Button" x:Key="ButtonStyle_Center" >
<Style TargetType="Button" x:Key="ButtonStyle_toggle" >
<Setter Property="Margin" Value="5"/>
<Setter Property="HorizontalContentAlignment" Value="Center"/>
<Setter Property="VerticalContentAlignment" Value="Center"/>
<Setter Property="Padding" Value="1"/>
<Setter Property="Width" Value="110"/>
<Setter Property="Background" Value="{StaticResource Color_theme_static}" />
<Setter Property="Foreground" Value="{StaticResource Color_theme_activity}" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type Button}">
<Canvas x:Name="canvas" Height="55" Width="110" Background="{StaticResource Color_theme_activity}">
<Rectangle x:Name="Path_block" Height="45" Width="24" Margin="5" Fill="White" Canvas.Right="0" />
<StackPanel x:Name="SP_Text" Orientation="Horizontal" Margin="20,15" >
<TextBlock x:Name="TB_OnOff" Text="中心" Foreground="White" FontSize="24" FontFamily="YouYuan"/>
</StackPanel>
</Canvas>
<Border x:Name="canvas" Height="55" Width="{TemplateBinding Width}" Background="{TemplateBinding Background}">
<Grid>
<Rectangle x:Name="Path_block" Height="45" Width="24" Margin="5" Fill="White" HorizontalAlignment="Left"/>
<StackPanel x:Name="SP_Text" Orientation="Horizontal" Margin="20,15" HorizontalAlignment="Right">
<TextBlock x:Name="TB_OnOff" Text="{TemplateBinding Content}" Foreground="White" FontSize="24" FontFamily="YouYuan"/>
</StackPanel>
</Grid>
</Border>
<ControlTemplate.Triggers>
<DataTrigger Binding="{Binding Tag,RelativeSource={RelativeSource Mode=Self}}" Value="False">
<Setter TargetName="Path_block" Property="Canvas.Left" Value="0"/>
<Setter TargetName="SP_Text" Property="Canvas.Right" Value="0"/>
<Setter TargetName="canvas" Property="Background" Value="{StaticResource Color_theme_static}"/>
<DataTrigger Binding="{Binding Tag,RelativeSource={RelativeSource Mode=Self}}" Value="True">
<Setter TargetName="Path_block" Property="HorizontalAlignment" Value="Right"/>
<Setter TargetName="SP_Text" Property="HorizontalAlignment" Value="Left"/>
<Setter TargetName="canvas" Property="Background" Value="{Binding Foreground,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=Button}}" />
</DataTrigger>
<Trigger Property="IsPressed" Value="true">
<Setter Property="Opacity" Value="0.5"/>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
<Style TargetType="Button" x:Key="ButtonStyle_SurfaceCenter" >
<Style TargetType="ToggleButton" x:Key="ToggleButtonStyle" >
<Setter Property="Margin" Value="5"/>
<Setter Property="HorizontalContentAlignment" Value="Center"/>
<Setter Property="VerticalContentAlignment" Value="Center"/>
<Setter Property="Padding" Value="1"/>
<Setter Property="Width" Value="110"/>
<Setter Property="Background" Value="{StaticResource Color_theme_static}" />
<Setter Property="Foreground" Value="{StaticResource Color_theme_activity}" />
<Setter Property="IsEnabled" Value="False" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type Button}">
<Canvas x:Name="canvas" Height="55" Width="170" Background="{StaticResource Color_theme_activity}">
<Rectangle x:Name="Path_block" Height="45" Width="24" Margin="5" Fill="White" Canvas.Right="0" />
<StackPanel x:Name="SP_Text" Orientation="Horizontal" Margin="20,15" >
<TextBlock x:Name="TB_OnOff" Text="表面+中心" Foreground="White" FontSize="24" FontFamily="YouYuan"/>
</StackPanel>
</Canvas>
<ControlTemplate TargetType="{x:Type ToggleButton}">
<Border x:Name="canvas" Height="55" Width="{TemplateBinding Width}" Background="{TemplateBinding Background}">
<Grid>
<Rectangle x:Name="Path_block" Height="45" Width="24" Margin="5" Fill="White" HorizontalAlignment="Left"/>
<StackPanel x:Name="SP_Text" Orientation="Horizontal" Margin="20,15" HorizontalAlignment="Right">
<TextBlock x:Name="TB_OnOff" Text="{TemplateBinding Content}" Foreground="White" FontSize="24" FontFamily="YouYuan"/>
</StackPanel>
</Grid>
</Border>
<ControlTemplate.Triggers>
<DataTrigger Binding="{Binding Tag,RelativeSource={RelativeSource Mode=Self}}" Value="False">
<Setter TargetName="Path_block" Property="Canvas.Left" Value="0"/>
<Setter TargetName="SP_Text" Property="Canvas.Right" Value="0"/>
<Setter TargetName="canvas" Property="Background" Value="{StaticResource Color_theme_static}"/>
</DataTrigger>
<Trigger Property="IsChecked" Value="True">
<Setter TargetName="Path_block" Property="HorizontalAlignment" Value="Right"/>
<Setter TargetName="SP_Text" Property="HorizontalAlignment" Value="Left"/>
<Setter TargetName="canvas" Property="Background" Value="{Binding Foreground,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=ButtonBase}}" />
</Trigger>
<Trigger Property="IsPressed" Value="true">
<Setter Property="Opacity" Value="0.5"/>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
......
Project.FLY.Winder_20190413/FLY.Winder.UI.Client/UIModule/WdManual/WdManual.xaml.cs
View file @ 52e9f6b2
......@@ -23,6 +23,7 @@ namespace FLY.Winder.UI.Client.UIModule
{
FLY.Winder.Client.WinderSystemServiceClient winderSystem;
SetPLCUpdatePlan[] setPlan_winders = new SetPLCUpdatePlan[2];
List<ResetAction2> resetActions = new List<ResetAction2>();
public WdManual()
{
InitializeComponent();
......@@ -33,35 +34,35 @@ namespace FLY.Winder.UI.Client.UIModule
{
winderSystem = TDGage.Current.mWinderSystem;
this.DataContext = winderSystem;
ResetAction.SetResetAction(button_turn0, winderSystem.Items[0], "TurnoverInching");
ResetAction.SetResetAction(button_cut0, winderSystem.Items[0], "CuttingFilm");
ResetAction.SetResetAction(button_org0, winderSystem.Items[0], "TurnoverOrg");
ResetAction.SetResetAction(button_arm0, winderSystem.Items[0], "PressureArmOffset");
ResetAction.SetResetAction(button_top0, winderSystem.Items[0], "PushRod");
resetActions.Add(new ResetAction2(button_turn0, winderSystem.Items[0], "TurnoverInching"));
resetActions.Add(new ResetAction2(button_cut0, winderSystem.Items[0], "CuttingFilm"));
resetActions.Add(new ResetAction2(button_org0, winderSystem.Items[0], "TurnoverOrg"));
resetActions.Add(new ResetAction2(button_arm0, winderSystem.Items[0], "PressureArmOffset"));
resetActions.Add(new ResetAction2(button_top0, winderSystem.Items[0], "PushRod"));
ResetAction.SetResetAction(button_tongClamp0, winderSystem.Items[0], "TongClamp");
ResetAction.SetResetAction(button_tongLoosen0, winderSystem.Items[0], "TongLoosen");
ResetAction.SetResetAction(button_tongClamp0, winderSystem.Items[0], "TongUp");
ResetAction.SetResetAction(button_tongLoosen0, winderSystem.Items[0], "TongDown");
ResetAction.SetResetAction(button_tongClamp0, winderSystem.Items[0], "TongIn");
ResetAction.SetResetAction(button_tongLoosen0, winderSystem.Items[0], "TongOut");
resetActions.Add(new ResetAction2(button_tongClamp0, winderSystem.Items[0], "TongClamp"));
resetActions.Add(new ResetAction2(button_tongLoosen0, winderSystem.Items[0], "TongLoosen"));
resetActions.Add(new ResetAction2(button_tongClamp0, winderSystem.Items[0], "TongUp"));
resetActions.Add(new ResetAction2(button_tongLoosen0, winderSystem.Items[0], "TongDown"));
resetActions.Add(new ResetAction2(button_tongClamp0, winderSystem.Items[0], "TongIn"));
resetActions.Add(new ResetAction2(button_tongLoosen0, winderSystem.Items[0], "TongOut"));
ResetAction.SetResetAction(button_turn1, winderSystem.Items[1], "TurnoverInching");
ResetAction.SetResetAction(button_cut1, winderSystem.Items[1], "CuttingFilm");
ResetAction.SetResetAction(button_org1, winderSystem.Items[1], "TurnoverOrg");
ResetAction.SetResetAction(button_arm1, winderSystem.Items[1], "PressureArmOffset");
ResetAction.SetResetAction(button_top1, winderSystem.Items[1], "PushRod");
resetActions.Add(new ResetAction2(button_turn1, winderSystem.Items[1], "TurnoverInching"));
resetActions.Add(new ResetAction2(button_cut1, winderSystem.Items[1], "CuttingFilm"));
resetActions.Add(new ResetAction2(button_org1, winderSystem.Items[1], "TurnoverOrg"));
resetActions.Add(new ResetAction2(button_arm1, winderSystem.Items[1], "PressureArmOffset"));
resetActions.Add(new ResetAction2(button_top1, winderSystem.Items[1], "PushRod"));
ResetAction.SetResetAction(button_tongClamp1, winderSystem.Items[1], "TongClamp");
ResetAction.SetResetAction(button_tongLoosen1, winderSystem.Items[1], "TongLoosen");
ResetAction.SetResetAction(button_tongClamp1, winderSystem.Items[1], "TongUp");
ResetAction.SetResetAction(button_tongLoosen1, winderSystem.Items[1], "TongDown");
ResetAction.SetResetAction(button_tongClamp1, winderSystem.Items[1], "TongIn");
ResetAction.SetResetAction(button_tongLoosen1, winderSystem.Items[1], "TongOut");
resetActions.Add(new ResetAction2(button_tongClamp1, winderSystem.Items[1], "TongClamp"));
resetActions.Add(new ResetAction2(button_tongLoosen1, winderSystem.Items[1], "TongLoosen"));
resetActions.Add(new ResetAction2(button_tongClamp1, winderSystem.Items[1], "TongUp"));
resetActions.Add(new ResetAction2(button_tongLoosen1, winderSystem.Items[1], "TongDown"));
resetActions.Add(new ResetAction2(button_tongClamp1, winderSystem.Items[1], "TongIn"));
resetActions.Add(new ResetAction2(button_tongLoosen1, winderSystem.Items[1], "TongOut"));
//IsTongAuto
//注册属性更新计划
......
Project.FLY.Winder_20190413/FLY.Winder.UI.Client/UIModule/Window_Velocity.xaml.cs
View file @ 52e9f6b2
......@@ -21,14 +21,14 @@ namespace FLY.Winder.UI.Client.UIModule
public partial class Window_Velocity : FLY.ControlLibrary.WindowBigClose
{
FLY.Winder.Client.WinderSystemServiceClient winderSystem;
List<ResetAction2> resetActions = new List<ResetAction2>();
public Window_Velocity()
{
InitializeComponent();
winderSystem = TDGage.Current.mWinderSystem;
this.DataContext = winderSystem.Accessory;
ResetAction.SetResetAction(button_ok, winderSystem.Accessory, "IsVelocityChanged");
resetActions.Add(new ResetAction2(button_ok, winderSystem.Accessory, "IsVelocityChanged"));
}
private void button_minus_Click(object sender, RoutedEventArgs e)
......
Project.FLY.Winder_20190413/FLY.Winder.UI.Client/UnitTests/WinderSystemUt.cs
View file @ 52e9f6b2
......@@ -32,7 +32,8 @@ namespace FLY.Winder.UI.Client.UnitTests
Items[0].MeasurePreWarning = 1600;
Items[0].IsTongAuto = false;
Items[0].IsCenterWindGet = true;
Accessory = new WinderAccessory();
Accessory.WinderMeasurePerimeter = 314;
......@@ -44,7 +45,6 @@ namespace FLY.Winder.UI.Client.UnitTests
Accessory.Velocity = 59.7f;
Accessory.VelocitySet = 60;
Accessory.IsSurfaceWindGet = true;
}
public event PropertyChangedEventHandler PropertyChanged;
......
Project.FLY.Winder_20190413/FLY.Winder/Client/WinderSystemServiceClient.cs
View file @ 52e9f6b2
......@@ -32,6 +32,16 @@ namespace FLY.Winder.Client
public event PropertyChangedEventHandler PropertyChanged;
SyncPropServiceClient syncPropServiceClient;
/// <summary>
/// 当前 INotifyPropertyChanged 对象 引发了 PropertyChanged, 是由于 接收到数据导致的
/// </summary>
public bool IsInPushValue {
get
{
return syncPropServiceClient.IsInPushValue;
}
}
public WinderSystemServiceClient()
{
mServerID = OBJ_INTERFACE.OBJ_INTERFACE.WINDER_OBJ_ID;
......
Project.FLY.Winder_20190413/FLY.Winder/Common/WinderAccessory.cs
View file @ 52e9f6b2
......@@ -341,36 +341,6 @@ namespace FLY.Winder.Common
/// </summary>
public bool IsError_RotaryCommErr { get; set; }
/// <summary>
/// 表面收卷写(┷）
/// </summary>
public bool IsSurfaceWindSet { get; set; }
/// <summary>
/// 表面收卷读
/// </summary>
public bool IsSurfaceWindGet { get; set; }
/// <summary>
/// 中心收卷写(┷）
/// </summary>
public bool IsCenterWindSet { get; set; }
/// <summary>
/// 中心收卷读
/// </summary>
public bool IsCenterWindGet { get; set; }
/// <summary>
/// 中心表面收卷写(┷）
/// </summary>
public bool IsCsWindSet { get; set; }
/// <summary>
/// 中心表面收卷读
/// </summary>
public bool IsCsWindGet { get; set; }
/// <summary>
/// 收卷最大直径
/// </summary>
......
Project.FLY.Winder_20190413/FLY.Winder/Common/WinderInsideOutside.cs
View file @ 52e9f6b2
......@@ -292,6 +292,11 @@ namespace FLY.Winder.Common
/// </summary>
public float CenterInitDia { get; set; }
/// <summary>
/// 中心初始直径写入后通知
/// </summary>
public bool IsCenterInitDiaNotify { get; set; }
/// <summary>
/// 中心锥度设定(%) 0~2000 {0:F0}
/// </summary>
......@@ -457,6 +462,41 @@ namespace FLY.Winder.Common
/// </summary>
public float SpliceCompEndPos { get; set; }
/// <summary>
/// 张力补偿系数
/// </summary>
public float TensionComp { get; set; }
/// <summary>
/// 表面收卷写(┷）
/// </summary>
public bool IsSurfaceWindSet { get; set; }
/// <summary>
/// 表面收卷读
/// </summary>
public bool IsSurfaceWindGet { get; set; }
/// <summary>
/// 中心收卷写(┷）
/// </summary>
public bool IsCenterWindSet { get; set; }
/// <summary>
/// 中心收卷读
/// </summary>
public bool IsCenterWindGet { get; set; }
/// <summary>
/// 中心表面收卷写(┷）
/// </summary>
public bool IsCsWindSet { get; set; }
/// <summary>
/// 中心表面收卷读
/// </summary>
public bool IsCsWindGet { get; set; }
#endregion
public event PropertyChangedEventHandler PropertyChanged;
}
......
Resource/收卷/中央收卷_设备连接变量表_20191206/20191217/DownLoadConfig.ini 0 → 100644
View file @ 52e9f6b2
[Config]
Version=012150835
Type=0
Project=200
Resource/收卷/中央收卷_设备连接变量表_20191206/20191217/HMI.afs 0 → 100644
View file @ 52e9f6b2
File added
Resource/收卷/中央收卷_设备连接变量表_20191206/20191217/ProjectConfig.ini 0 → 100644
View file @ 52e9f6b2
[DowLoadConfig]
EnCheckBackLig=0
Resource/收卷/中央收卷_设备连接变量表_20191206/Generated/WS.xml
View file @ 52e9f6b2
......@@ -70,12 +70,6 @@
<PLCVariable DeviceIndex="0" Mode="0" Addr="142" Type="bool" Scale="1" OwnerName="Accessory" PropertyName="IsError_Traction1CommErr" />
<PLCVariable DeviceIndex="0" Mode="0" Addr="143" Type="bool" Scale="1" OwnerName="Accessory" PropertyName="IsError_Traction2CommErr" />
<PLCVariable DeviceIndex="0" Mode="0" Addr="146" Type="bool" Scale="1" OwnerName="Accessory" PropertyName="IsError_RotaryCommErr" />
<PLCVariable DeviceIndex="0" Mode="0" Addr="91" Type="bool" Scale="1" OwnerName="Accessory" PropertyName="IsSurfaceWindSet" />
<PLCVariable DeviceIndex="0" Mode="0" Addr="3001" Type="bool" Scale="1" OwnerName="Accessory" PropertyName="IsSurfaceWindGet" />
<PLCVariable DeviceIndex="0" Mode="0" Addr="90" Type="bool" Scale="1" OwnerName="Accessory" PropertyName="IsCenterWindSet" />
<PLCVariable DeviceIndex="0" Mode="0" Addr="3000" Type="bool" Scale="1" OwnerName="Accessory" PropertyName="IsCenterWindGet" />
<PLCVariable DeviceIndex="0" Mode="0" Addr="92" Type="bool" Scale="1" OwnerName="Accessory" PropertyName="IsCsWindSet" />
<PLCVariable DeviceIndex="0" Mode="0" Addr="3002" Type="bool" Scale="1" OwnerName="Accessory" PropertyName="IsCsWindGet" />
<PLCVariable DeviceIndex="0" Mode="4" Addr="810" Type="float" Scale="1" OwnerName="Accessory" PropertyName="WindMaxDia" />
<PLCVariable DeviceIndex="0" Mode="4" Addr="924" Type="uint32" Scale="1" OwnerName="Items[0]" PropertyName="MeasureLen" />
<PLCVariable DeviceIndex="0" Mode="4" Addr="916" Type="uint32" Scale="1" OwnerName="Items[1]" PropertyName="MeasureLen" />
......@@ -191,6 +185,8 @@
<PLCVariable DeviceIndex="0" Mode="4" Addr="550" Type="uint16" Scale="1" OwnerName="Items[1]" PropertyName="CenterTensionSet" />
<PLCVariable DeviceIndex="0" Mode="4" Addr="510" Type="uint16" Scale="1" OwnerName="Items[0]" PropertyName="CenterInitDia" />
<PLCVariable DeviceIndex="0" Mode="4" Addr="560" Type="uint16" Scale="1" OwnerName="Items[1]" PropertyName="CenterInitDia" />
<PLCVariable DeviceIndex="0" Mode="0" Addr="80" Type="bool" Scale="1" OwnerName="Items[0]" PropertyName="IsCenterInitDiaNotify" />
<PLCVariable DeviceIndex="0" Mode="0" Addr="81" Type="bool" Scale="1" OwnerName="Items[1]" PropertyName="IsCenterInitDiaNotify" />
<PLCVariable DeviceIndex="0" Mode="4" Addr="520" Type="uint16" Scale="1" OwnerName="Items[0]" PropertyName="CenterTaperSet" />
<PLCVariable DeviceIndex="0" Mode="4" Addr="570" Type="uint16" Scale="1" OwnerName="Items[1]" PropertyName="CenterTaperSet" />
<PLCVariable DeviceIndex="0" Mode="4" Addr="340" Type="float" Scale="1" OwnerName="Items[0]" PropertyName="CenterTensionKg" />
......@@ -233,8 +229,8 @@
<PLCVariable DeviceIndex="0" Mode="4" Addr="2656" Type="uint16" Scale="1" OwnerName="Items[1]" PropertyName="TongInOutTime" />
<PLCVariable DeviceIndex="0" Mode="4" Addr="2658" Type="uint16" Scale="1" OwnerName="Items[0]" PropertyName="EPRollerTime" />
<PLCVariable DeviceIndex="0" Mode="4" Addr="2659" Type="uint16" Scale="1" OwnerName="Items[1]" PropertyName="EPRollerTime" />
<PLCVariable DeviceIndex="0" Mode="4" Addr="200" Type="uint16" Scale="1" OwnerName="Items[0]" PropertyName="EleRulerValue" />
<PLCVariable DeviceIndex="0" Mode="4" Addr="210" Type="uint16" Scale="1" OwnerName="Items[1]" PropertyName="EleRulerValue" />
<PLCVariable DeviceIndex="0" Mode="4" Addr="200" Type="int16" Scale="1" OwnerName="Items[0]" PropertyName="EleRulerValue" />
<PLCVariable DeviceIndex="0" Mode="4" Addr="210" Type="int16" Scale="1" OwnerName="Items[1]" PropertyName="EleRulerValue" />
<PLCVariable DeviceIndex="0" Mode="4" Addr="4108" Type="uint32" Scale="1" OwnerName="Items[0]" PropertyName="InterstitialValue" />
<PLCVariable DeviceIndex="0" Mode="4" Addr="4208" Type="uint32" Scale="1" OwnerName="Items[1]" PropertyName="InterstitialValue" />
<PLCVariable DeviceIndex="0" Mode="4" Addr="820" Type="float" Scale="1" OwnerName="Items[0]" PropertyName="MaxDiaSet" />
......@@ -257,5 +253,19 @@
<PLCVariable DeviceIndex="0" Mode="4" Addr="4354" Type="uint16" Scale="1" OwnerName="Items[1]" PropertyName="SpliceCompBeginPos" />
<PLCVariable DeviceIndex="0" Mode="4" Addr="4452" Type="uint16" Scale="1" OwnerName="Items[0]" PropertyName="SpliceCompEndPos" />
<PLCVariable DeviceIndex="0" Mode="4" Addr="4352" Type="uint16" Scale="1" OwnerName="Items[1]" PropertyName="SpliceCompEndPos" />
<PLCVariable DeviceIndex="0" Mode="4" Addr="4228" Type="uint16" Scale="1" OwnerName="Items[0]" PropertyName="TensionComp" />
<PLCVariable DeviceIndex="0" Mode="4" Addr="4328" Type="uint16" Scale="1" OwnerName="Items[1]" PropertyName="TensionComp" />
<PLCVariable DeviceIndex="0" Mode="0" Addr="91" Type="bool" Scale="1" OwnerName="Items[0]" PropertyName="IsSurfaceWindSet" />
<PLCVariable DeviceIndex="0" Mode="0" Addr="96" Type="bool" Scale="1" OwnerName="Items[1]" PropertyName="IsSurfaceWindSet" />
<PLCVariable DeviceIndex="0" Mode="0" Addr="3001" Type="bool" Scale="1" OwnerName="Items[0]" PropertyName="IsSurfaceWindGet" />
<PLCVariable DeviceIndex="0" Mode="0" Addr="3011" Type="bool" Scale="1" OwnerName="Items[1]" PropertyName="IsSurfaceWindGet" />
<PLCVariable DeviceIndex="0" Mode="0" Addr="90" Type="bool" Scale="1" OwnerName="Items[0]" PropertyName="IsCenterWindSet" />
<PLCVariable DeviceIndex="0" Mode="0" Addr="95" Type="bool" Scale="1" OwnerName="Items[1]" PropertyName="IsCenterWindSet" />
<PLCVariable DeviceIndex="0" Mode="0" Addr="3000" Type="bool" Scale="1" OwnerName="Items[0]" PropertyName="IsCenterWindGet" />
<PLCVariable DeviceIndex="0" Mode="0" Addr="3010" Type="bool" Scale="1" OwnerName="Items[1]" PropertyName="IsCenterWindGet" />
<PLCVariable DeviceIndex="0" Mode="0" Addr="92" Type="bool" Scale="1" OwnerName="Items[0]" PropertyName="IsCsWindSet" />
<PLCVariable DeviceIndex="0" Mode="0" Addr="97" Type="bool" Scale="1" OwnerName="Items[1]" PropertyName="IsCsWindSet" />
<PLCVariable DeviceIndex="0" Mode="0" Addr="3002" Type="bool" Scale="1" OwnerName="Items[0]" PropertyName="IsCsWindGet" />
<PLCVariable DeviceIndex="0" Mode="0" Addr="3012" Type="bool" Scale="1" OwnerName="Items[1]" PropertyName="IsCsWindGet" />
</Variables>
</PLCGroup>
\ No newline at end of file
Resource/收卷/中央收卷_设备连接变量表_20191206/Generated/WinderAccessory.cs
View file @ 52e9f6b2
......@@ -341,36 +341,6 @@ namespace FLY.Winder.Common
/// </summary>
public bool IsError_RotaryCommErr { get; set; }
/// <summary>
/// 表面收卷写(┷）
/// </summary>
public bool IsSurfaceWindSet { get; set; }
/// <summary>
/// 表面收卷读
/// </summary>
public bool IsSurfaceWindGet { get; set; }
/// <summary>
/// 中心收卷写(┷）
/// </summary>
public bool IsCenterWindSet { get; set; }
/// <summary>
/// 中心收卷读
/// </summary>
public bool IsCenterWindGet { get; set; }
/// <summary>
/// 中心表面收卷写(┷）
/// </summary>
public bool IsCsWindSet { get; set; }
/// <summary>
/// 中心表面收卷读
/// </summary>
public bool IsCsWindGet { get; set; }
/// <summary>
/// 收卷最大直径
/// </summary>
......
Resource/收卷/中央收卷_设备连接变量表_20191206/Generated/WinderInsideOutside.cs
View file @ 52e9f6b2
......@@ -292,6 +292,11 @@ namespace FLY.Winder.Common
/// </summary>
public float CenterInitDia { get; set; }
/// <summary>
/// 中心初始直径写入后通知
/// </summary>
public bool IsCenterInitDiaNotify { get; set; }
/// <summary>
/// 中心锥度设定(%) 0~2000 {0:F0}
/// </summary>
......@@ -457,6 +462,41 @@ namespace FLY.Winder.Common
/// </summary>
public float SpliceCompEndPos { get; set; }
/// <summary>
/// 张力补偿系数
/// </summary>
public float TensionComp { get; set; }
/// <summary>
/// 表面收卷写(┷）
/// </summary>
public bool IsSurfaceWindSet { get; set; }
/// <summary>
/// 表面收卷读
/// </summary>
public bool IsSurfaceWindGet { get; set; }
/// <summary>
/// 中心收卷写(┷）
/// </summary>
public bool IsCenterWindSet { get; set; }
/// <summary>
/// 中心收卷读
/// </summary>
public bool IsCenterWindGet { get; set; }
/// <summary>
/// 中心表面收卷写(┷）
/// </summary>
public bool IsCsWindSet { get; set; }
/// <summary>
/// 中心表面收卷读
/// </summary>
public bool IsCsWindGet { get; set; }
#endregion
public event PropertyChangedEventHandler PropertyChanged;
}
......
Resource/收卷/中央收卷_设备连接变量表_20191206/收卷HMI-地址表.xlsm
View file @ 52e9f6b2
No preview for this file type
Resource/收卷/收卷_辅助代码生成/Project.FLY.Autogen_WS/Autogen_WS/Autogen_WS/Autogen_WS.csproj
View file @ 52e9f6b2
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\PropertyChanged.Fody.2.5.13\build\PropertyChanged.Fody.props" Condition="Exists('..\packages\PropertyChanged.Fody.2.5.13\build\PropertyChanged.Fody.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
......@@ -45,17 +44,9 @@
<StartupObject />
</PropertyGroup>
<ItemGroup>
<Reference Include="EPPlus, Version=4.5.2.1, Culture=neutral, PublicKeyToken=ea159fdaa78159a1, processorArchitecture=MSIL">
<HintPath>..\packages\EPPlus.4.5.2.1\lib\net40\EPPlus.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="MISC">
<HintPath>..\..\dll\MISC.dll</HintPath>
</Reference>
<Reference Include="PropertyChanged, Version=2.5.13.0, Culture=neutral, PublicKeyToken=ee3ee20bcf148ddd, processorArchitecture=MSIL">
<HintPath>..\packages\PropertyChanged.Fody.2.5.13\lib\net452\PropertyChanged.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.configuration" />
<Reference Include="System.Data" />
......@@ -115,7 +106,6 @@
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
<None Include="app.config" />
<None Include="packages.config" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
......@@ -128,15 +118,18 @@
<ItemGroup>
<Resource Include="FodyWeavers.xml" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Costura.Fody">
<Version>4.1.0</Version>
</PackageReference>
<PackageReference Include="EPPlus">
<Version>4.5.3.2</Version>
</PackageReference>
<PackageReference Include="PropertyChanged.Fody">
<Version>3.2.1</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\PropertyChanged.Fody.2.5.13\build\PropertyChanged.Fody.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\PropertyChanged.Fody.2.5.13\build\PropertyChanged.Fody.props'))" />
<Error Condition="!Exists('..\packages\Fody.3.2.16\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.3.2.16\build\Fody.targets'))" />
</Target>
<Import Project="..\packages\Fody.3.2.16\build\Fody.targets" Condition="Exists('..\packages\Fody.3.2.16\build\Fody.targets')" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
......
Resource/收卷/收卷_辅助代码生成/Project.FLY.Autogen_WS/Autogen_WS/Autogen_WS/FodyWeavers.xml
View file @ 52e9f6b2
<?xml version="1.0" encoding="utf-8"?>
<Weavers>
<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
<PropertyChanged />
<Costura/>
</Weavers>
\ No newline at end of file
Resource/收卷/收卷_辅助代码生成/Project.FLY.Autogen_WS/Autogen_WS/Autogen_WS/FodyWeavers.xsd 0 → 100644
View file @ 52e9f6b2
<?xml version="1.0" encoding="utf-8"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
<!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
<xs:element name="Weavers">
<xs:complexType>
<xs:all>
<xs:element name="PropertyChanged" minOccurs="0" maxOccurs="1">
<xs:complexType>
<xs:attribute name="InjectOnPropertyNameChanged" type="xs:boolean">
<xs:annotation>
<xs:documentation>Used to control if the On_PropertyName_Changed feature is enabled.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="EventInvokerNames" type="xs:string">
<xs:annotation>
<xs:documentation>Used to change the name of the method that fires the notify event. This is a string that accepts multiple values in a comma separated form.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="CheckForEquality" type="xs:boolean">
<xs:annotation>
<xs:documentation>Used to control if equality checks should be inserted. If false, equality checking will be disabled for the project.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="CheckForEqualityUsingBaseEquals" type="xs:boolean">
<xs:annotation>
<xs:documentation>Used to control if equality checks should use the Equals method resolved from the base class.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="UseStaticEqualsFromBase" type="xs:boolean">
<xs:annotation>
<xs:documentation>Used to control if equality checks should use the static Equals method resolved from the base class.</xs:documentation>
</xs:annotation>
</xs:attribute>
</xs:complexType>
</xs:element>
<xs:element name="Costura" minOccurs="0" maxOccurs="1">
<xs:complexType>
<xs:all>
<xs:element minOccurs="0" maxOccurs="1" name="ExcludeAssemblies" type="xs:string">
<xs:annotation>
<xs:documentation>A list of assembly names to exclude from the default action of "embed all Copy Local references", delimited with line breaks</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element minOccurs="0" maxOccurs="1" name="IncludeAssemblies" type="xs:string">
<xs:annotation>
<xs:documentation>A list of assembly names to include from the default action of "embed all Copy Local references", delimited with line breaks.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element minOccurs="0" maxOccurs="1" name="Unmanaged32Assemblies" type="xs:string">
<xs:annotation>
<xs:documentation>A list of unmanaged 32 bit assembly names to include, delimited with line breaks.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element minOccurs="0" maxOccurs="1" name="Unmanaged64Assemblies" type="xs:string">
<xs:annotation>
<xs:documentation>A list of unmanaged 64 bit assembly names to include, delimited with line breaks.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element minOccurs="0" maxOccurs="1" name="PreloadOrder" type="xs:string">
<xs:annotation>
<xs:documentation>The order of preloaded assemblies, delimited with line breaks.</xs:documentation>
</xs:annotation>
</xs:element>
</xs:all>
<xs:attribute name="CreateTemporaryAssemblies" type="xs:boolean">
<xs:annotation>
<xs:documentation>This will copy embedded files to disk before loading them into memory. This is helpful for some scenarios that expected an assembly to be loaded from a physical file.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="IncludeDebugSymbols" type="xs:boolean">
<xs:annotation>
<xs:documentation>Controls if .pdbs for reference assemblies are also embedded.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="DisableCompression" type="xs:boolean">
<xs:annotation>
<xs:documentation>Embedded assemblies are compressed by default, and uncompressed when they are loaded. You can turn compression off with this option.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="DisableCleanup" type="xs:boolean">
<xs:annotation>
<xs:documentation>As part of Costura, embedded assemblies are no longer included as part of the build. This cleanup can be turned off.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="LoadAtModuleInit" type="xs:boolean">
<xs:annotation>
<xs:documentation>Costura by default will load as part of the module initialization. This flag disables that behavior. Make sure you call CosturaUtility.Initialize() somewhere in your code.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="IgnoreSatelliteAssemblies" type="xs:boolean">
<xs:annotation>
<xs:documentation>Costura will by default use assemblies with a name like 'resources.dll' as a satellite resource and prepend the output path. This flag disables that behavior.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="ExcludeAssemblies" type="xs:string">
<xs:annotation>
<xs:documentation>A list of assembly names to exclude from the default action of "embed all Copy Local references", delimited with |</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="IncludeAssemblies" type="xs:string">
<xs:annotation>
<xs:documentation>A list of assembly names to include from the default action of "embed all Copy Local references", delimited with |.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="Unmanaged32Assemblies" type="xs:string">
<xs:annotation>
<xs:documentation>A list of unmanaged 32 bit assembly names to include, delimited with |.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="Unmanaged64Assemblies" type="xs:string">
<xs:annotation>
<xs:documentation>A list of unmanaged 64 bit assembly names to include, delimited with |.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="PreloadOrder" type="xs:string">
<xs:annotation>
<xs:documentation>The order of preloaded assemblies, delimited with |.</xs:documentation>
</xs:annotation>
</xs:attribute>
</xs:complexType>
</xs:element>
</xs:all>
<xs:attribute name="VerifyAssembly" type="xs:boolean">
<xs:annotation>
<xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="VerifyIgnoreCodes" type="xs:string">
<xs:annotation>
<xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="GenerateXsd" type="xs:boolean">
<xs:annotation>
<xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
</xs:annotation>
</xs:attribute>
</xs:complexType>
</xs:element>
</xs:schema>
\ No newline at end of file
Resource/收卷/收卷_辅助代码生成/Project.FLY.Autogen_WS/Autogen_WS/MigrationBackup/4573888c/Autogen_WS/Autogen_WS.csproj 0 → 100644
View file @ 52e9f6b2
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\PropertyChanged.Fody.2.5.13\build\PropertyChanged.Fody.props" Condition="Exists('..\packages\PropertyChanged.Fody.2.5.13\build\PropertyChanged.Fody.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{28E4C2E0-5901-4B9A-9BF9-5D43E0102AC8}</ProjectGuid>
<OutputType>WinExe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Autogen_WS</RootNamespace>
<AssemblyName>Autogen_WS</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkProfile>
</TargetFrameworkProfile>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<WarningLevel>4</WarningLevel>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<PlatformTarget>x86</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<PlatformTarget>x86</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup>
<StartupObject />
</PropertyGroup>
<ItemGroup>
<Reference Include="EPPlus, Version=4.5.2.1, Culture=neutral, PublicKeyToken=ea159fdaa78159a1, processorArchitecture=MSIL">
<HintPath>..\packages\EPPlus.4.5.2.1\lib\net40\EPPlus.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="MISC">
<HintPath>..\..\dll\MISC.dll</HintPath>
</Reference>
<Reference Include="PropertyChanged, Version=2.5.13.0, Culture=neutral, PublicKeyToken=ee3ee20bcf148ddd, processorArchitecture=MSIL">
<HintPath>..\packages\PropertyChanged.Fody.2.5.13\lib\net452\PropertyChanged.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.configuration" />
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
<Reference Include="System.Security" />
<Reference Include="System.Xml" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Xaml">
<RequiredTargetFramework>4.0</RequiredTargetFramework>
</Reference>
<Reference Include="WindowsBase" />
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
</ItemGroup>
<ItemGroup>
<ApplicationDefinition Include="App.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</ApplicationDefinition>
<Compile Include="DevMapperRule.cs" />
<Compile Include="WS_ItemInfo.cs" />
<Page Include="MainWindow.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Compile Include="App.xaml.cs">
<DependentUpon>App.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile>
<Compile Include="DataInfos.cs" />
<Compile Include="DeviceAddr.cs" />
<Compile Include="MainWindow.xaml.cs">
<DependentUpon>MainWindow.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile>
</ItemGroup>
<ItemGroup>
<Compile Include="PLCGroup.cs" />
<Compile Include="Properties\AssemblyInfo.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<Compile Include="Properties\Settings.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Settings.settings</DependentUpon>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
</Compile>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
<None Include="app.config" />
<None Include="packages.config" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
<AppDesigner Include="Properties\" />
</ItemGroup>
<ItemGroup>
<WCFMetadata Include="Service References\" />
</ItemGroup>
<ItemGroup>
<Resource Include="FodyWeavers.xml" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\PropertyChanged.Fody.2.5.13\build\PropertyChanged.Fody.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\PropertyChanged.Fody.2.5.13\build\PropertyChanged.Fody.props'))" />
<Error Condition="!Exists('..\packages\Fody.3.2.16\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.3.2.16\build\Fody.targets'))" />
</Target>
<Import Project="..\packages\Fody.3.2.16\build\Fody.targets" Condition="Exists('..\packages\Fody.3.2.16\build\Fody.targets')" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
\ No newline at end of file
Resource/收卷/收卷_辅助代码生成/Project.FLY.Autogen_WS/Autogen_WS/MigrationBackup/4573888c/Autogen_WS/NuGetUpgradeLog.html 0 → 100644
View file @ 52e9f6b2
<!DOCTYPE html>
<!-- saved from url=(0014)about:internet -->
<html xmlns:msxsl="urn:schemas-microsoft-com:xslt"><head><meta content="en-us" http-equiv="Content-Language" /><meta content="text/html; charset=utf-16" http-equiv="Content-Type" /><title _locID="NuGetUpgradeReportTitle">
NuGetMigrationLog
</title><style>
/* Body style, for the entire document */
body
{
background: #F3F3F4;
color: #1E1E1F;
font-family: "Segoe UI", Tahoma, Geneva, Verdana, sans-serif;
font-size: 12pt;
padding: 0;
margin: 0;
}
/* Header1 style, used for the main title */
h1
{
padding: 10px 0px 10px 10px;
font-size: 21pt;
background-color: #E2E2E2;
border-bottom: 1px #C1C1C2 solid;
color: #201F20;
margin: 0;
font-weight: normal;
}
/* Header2 style, used for "Overview" and other sections */
h2
{
font-size: 18pt;
font-weight: normal;
padding: 15px 0 5px 0;
margin: 0;
}
/* Header3 style, used for sub-sections, such as project name */
h3
{
font-weight: normal;
font-size: 15pt;
margin: 0;
padding: 15px 0 5px 0;
background-color: transparent;
}
.info-text
{
margin: 0px 0 0.75em 0;
}
/* Color all hyperlinks one color */
a
{
color: #1382CE;
}
/* Table styles */
table
{
border-spacing: 0 0;
border-collapse: collapse;
font-size: 11pt;
}
table th
{
background: #E7E7E8;
text-align: left;
text-decoration: none;
font-weight: normal;
padding: 3px 6px 3px 6px;
}
table td
{
vertical-align: top;
padding: 3px 6px 5px 5px;
margin: 0px;
border: 1px solid #E7E7E8;
background: #F7F7F8;
}
/* Local link is a style for hyperlinks that link to file:/// content, there are lots so color them as 'normal' text until the user mouse overs */
.localLink
{
color: #1E1E1F;
background: #EEEEED;
text-decoration: none;
}
.localLink:hover
{
color: #1382CE;
background: #FFFF99;
text-decoration: none;
}
.issueCell
{
width: 100%;
}
.packageIssue
{
margin-left: 25px;
}
/* Padding around the content after the h1 */
#content
{
padding: 0px 20px 20px 20px;
}
.issues table
{
width: 97%;
}
/* All Icons */
.IconSuccessEncoded, .IconInfoEncoded, .IconWarningEncoded, .IconErrorEncoded
{
min-width:18px;
min-height:18px;
background-repeat:no-repeat;
background-position:center;
}
.IconSuccessEncoded
{
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAA7EAAAOxAGVKw4bAAABcElEQVR4Xq2TsUsCURzHv15g8ZJcBWlyiYYgCIWcb9DFRRwMW5TA2c0/QEFwFkxxUQdxVlBwCYWOi6IhWgQhBLHJUCkhLr/BW8S7gvrAg+N+v8/v+x68Z8MGy+XSCyABQAXgBgHGALoASkIIDWSLeLBetdHryMjd5IxQPWT4rn1c/P7+xxp72Cs9m5SZ0Bq2vPnbPFafK2zDvmNHypdC0BPkLlQhxJsCAhQoZwdZU5mwxh720qGo8MzTxTTKZDPCx2HoVzp6lz0Q9tKhyx0kGs8Ny+TkWRKk8lCROwEduhyg9l/6lunOPSfmH3NUH6uQ0KHLAe7JYvJjevm+DAMGJHToKtigE+vwvIidxLamb8IBY9e+C5LiXREkfho3TSd06HJA13/oh6T51MTsfQbHrsMynQ5dDihFjiK8JJAU9AKIWTp76dCVN7HWHrajmUEGvyF9nkbAE6gLIS7kTUyuf2gscLoJrElZo/Mvj+nPz/kLTmfnEwP3tB0AAAAASUVORK5CYII=);
}
.IconInfoEncoded
{
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABHElEQVR4Xs2TsUoDQRRF7wwoziokjZUKadInhdhukR9YP8DMX1hYW+QvdsXa/QHBbcXC7W0CamWTQnclFutceIQJwwaWNLlwm5k5d94M76mmaeCrrmsLYOocY12FcxZFUeozCqKqqgYA8uevv1H6VuPxcwlfk5N92KHBxfFeCSAxxswlYAW/Xr989x/mv9gkhtyMDhcAxgzRsp7flj8B/HF1RsMXq+NZMkopaHe7lbKxQUEIGbKsYNoGn969060hZBkQex/W8oRQwsQaW2o3Ago2SVcJUzAgY3N0lTCZZm+zPS8HB51gMmS1DEYyOz9acKO1D8JWTlafKIMxdhvlfdyT94Vv5h7P8Ky7nQzACmhvKq3zk3PjW9asz9D/1oigecsioooAAAAASUVORK5CYII=);
}
.IconWarningEncoded
{
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAA7EAAAOxAGVKw4bAAAAx0lEQVR4XpWSMQ7CMAxFf4xAyBMLCxMrO8dhaBcuwdCJS3RJBw7SA/QGTCxdWJgiQYWKXJWKIXHIlyw5lqr34tQgEOdcBsCOx5yZK3hCCKdYXneQkh4pEfqzLfu+wVDSyyzFoJjfz9NB+pAF+eizx2Vruts0k15mPgvS6GYvpVtQhB61IB/dk6AF6fS4Ben0uIX5odtFe8Q/eW1KvFeH4e8khT6+gm5B+t3juyDt7n0jpe+CANTd+oTUjN/U3yVaABnSUjFz/gFq44JaVSCXeQAAAABJRU5ErkJggg==);
}
.IconErrorEncoded
{
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABQElEQVR4XqWTvUoEQRCE6wYPZUA80AfwAQz23uCMjA7MDRQEIzPBVEyNTQUFIw00vcQTTMzuAh/AxEQQT8HF/3G/oGGnEUGuoNnd6qoZuqltyKEsyzVJq5I6rnUp6SjGeGhESikzzlc1eL7opfuVbrqbU1Zw9NCgtQMaZpY0eNnaaL2fHusvTK5vKu7sjSS1Y4y3QUA6K3e3Mau5UFDyMP7tYF9o8cAHZv68vipoIJg971PZIZ5HiwdvYGGvFVFHmGmZ2MxwmQYPXubPl9Up0tfoMQGetXd6mRbvhBw+boZ6WF7Mbv1+GsHRk0fQmPAH1GfmZirbCfDJ61tw3Px8/8pZsPAG4jlVhcPgZ7adwNWBB68lkRQWFiTgFlbnLY3DGGM7izIJIyT/jjIvEJw6fdJTc6krDzh6aMwMP9bvDH4ADSsa9uSWVJkAAAAASUVORK5CYII=);
}
</style></head><body><h1>
NuGet Migration Report - Autogen_WS</h1><div id="content"><h2 _locID="OverviewTitle">Overview</h2><div class="info-text">Migration to PackageReference was completed successfully. Please build and run your solution to verify that all packages are available.</div><div class="info-text">
If you run into any problems, have feedback, questions, or concerns, please
<a href="https://github.com/NuGet/Home/issues/">file an issue on the NuGet GitHub repository.</a></div><div class="info-text">
Changed files and this report have been backed up here:
<a href="D:\研发\fly\项目\xxxxxxxx_测厚仪程序\window\项目集.和美吹膜\hemei\Resource\收卷\收卷_辅助代码生成\Project.FLY.Autogen_WS\Autogen_WS\MigrationBackup\4573888c\Autogen_WS">D:\研发\fly\项目\xxxxxxxx_测厚仪程序\window\项目集.和美吹膜\hemei\Resource\收卷\收卷_辅助代码生成\Project.FLY.Autogen_WS\Autogen_WS\MigrationBackup\4573888c\Autogen_WS</a></div><div class="info-text"><a href="https://aka.ms/nuget-pc2pr-migrator-rollback">Help me rollback to packages.config</a></div><h2 _locID="PackagesTitle">Packages processed</h2><h3 _locID="IncludePackagesTitle">Top-level dependencies:</h3><div class="issues"><table><tr><th class="issueCell">Package Id</th><th>Version</th></tr><tr><td class="issueCell"><span>EPPlus</span></td><td><span>
v4.5.2.1</span></td></tr><tr><td class="issueCell"><span>Fody</span></td><td><span>
v3.2.16</span></td></tr><tr><td class="issueCell"><span>PropertyChanged.Fody</span></td><td><span>
v2.5.13</span></td></tr></table></div><p /><h3 _locID="IncludePackagesTitle">Transitive dependencies:</h3><div class="issues"><table><tr><th class="issueCell">Package Id</th><th>Version</th></tr><tr><td class="issueCell">
No transitive dependencies found.
</td><td /></tr></table></div><h2 _locID="IssuesTitle">Package compatibility issues</h2><div class="issues"><table><tr><th /><th class="issueCell" _locID="DescriptionTableHeader">Description</th></tr><tr><td class="IconInfoEncoded" /><td class="issueCell">
No issues were found.
</td></tr></table></div></div></body></html>
\ No newline at end of file
WpfApplication1/Page_Main.xaml.cs
View file @ 52e9f6b2
......@@ -46,9 +46,8 @@ namespace WpfApplication1
//FLY.FeedbackRenZiJia.UI.Client.UIModule.Page_Graph p = new FLY.FeedbackRenZiJia.UI.Client.UIModule.Page_Graph();
//var p = new FLY.IBC.UI.Client.UIModule.Page_Main();
//FLY.Winder.UI.Client.UIModule.UcCenterWinder p = new FLY.Winder.UI.Client.UIModule.UcCenterWinder();
FLY.Winder.UI.Client.UIModule.Page_Main p = new FLY.Winder.UI.Client.UIModule.Page_Main();
FLY.Winder.UI.Client.UIModule.UcCenterWinder p = new FLY.Winder.UI.Client.UIModule.UcCenterWinder();
//FLY.Winder.UI.Client.UIModule.Page_Main p = new FLY.Winder.UI.Client.UIModule.Page_Main();
//FLY.Weight.UI.Client.UIModule.Page_Main p = new FLY.Weight.UI.Client.UIModule.Page_Main();
//FLY.Weight.UI.Client.UIModule.FlowGraph p = new FLY.Weight.UI.Client.UIModule.FlowGraph();
p.Init(0);
......
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