Skip to content

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

1.修复 称重V5 UcThicknessV5 指向弹出的 编辑窗口 出错。 

2.修复 称重V5 寄存器更新 没有 每层密度。
3.修改 版本号改为 6.31
parent 7e8de107
Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 89 deletions
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/Properties/AssemblyInfo.cs
View file @ ecba5e7e
......@@ -51,6 +51,6 @@ using System.Windows;
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
//通过使用 "*"，如下所示:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("6.30.2.0")]
[assembly: AssemblyFileVersion("6.30.2.0")]
[assembly: AssemblyVersion("6.31.0.0")]
[assembly: AssemblyFileVersion("6.31.0.0")]
[assembly: Guid("D12087A7-EEC4-4D9F-9269-8F20324F4B04")]
Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI.Client/Properties/AssemblyInfo.cs
View file @ ecba5e7e
......@@ -12,7 +12,7 @@ using System.Windows;
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("枫莱尔自动化技术有限公司")]
[assembly: AssemblyProduct("枫莱尔--吹膜扫描测厚仪客户端")]
[assembly: AssemblyCopyright("Copyright © 2020 FlyAutomation. All rights reserved.")]
[assembly: AssemblyCopyright("Copyright © 2021 FlyAutomation. All rights reserved.")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
......@@ -51,6 +51,6 @@ using System.Windows;
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
//通过使用 "*"，如下所示:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("6.30.2")]
[assembly: AssemblyFileVersion("6.30.2")]
[assembly: AssemblyVersion("6.31.0")]
[assembly: AssemblyFileVersion("6.31.0")]
[assembly: Guid("38E0D8EC-4D1C-49FF-AB08-6289294C5BD4")]
Project.FLY.Weight/FLY.Weight.UI.Client/PgScrew.xaml
View file @ ecba5e7e
......@@ -88,7 +88,7 @@
</StackPanel>
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="流量设定" />
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="流量设定" Foreground="{Binding Color}"/>
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource Styles.Text.FieldContent.Input}" Text="{Binding FlowSetting,StringFormat={}{0:F1}}"/>
<TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" Text="kg/h" />
......@@ -107,62 +107,62 @@
</Border>
<WrapPanel Orientation="Horizontal" Grid.Column="1">
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="滤波系数" />
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="滤波系数" Foreground="{Binding Color}"/>
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource Styles.Text.FieldContent.Input}" Text="{Binding FilterParam,StringFormat={}{0:F1}}"/>
</StackPanel>
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="切换级别" />
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="切换级别" Foreground="{Binding Color}"/>
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource Styles.Text.FieldContent.Input}" Text="{Binding SwitchLv,StringFormat={}{0:F1}}"/>
</StackPanel>
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="升降增益" />
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="升降增益" Foreground="{Binding Color}"/>
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource Styles.Text.FieldContent.Input}" Text="{Binding UpDownGain,StringFormat={}{0:F2}}"/>
</StackPanel>
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="比例增益" />
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="比例增益" Foreground="{Binding Color}"/>
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource Styles.Text.FieldContent.Input}" Text="{Binding PGain,StringFormat={}{0:F2}}"/>
</StackPanel>
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="积分时间" />
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="积分时间" Foreground="{Binding Color}"/>
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource Styles.Text.FieldContent.Input}" Text="{Binding ITime,StringFormat={}{0:F0}}"/>
<TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" Text="s" />
</StackPanel>
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="调节系数" />
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="调节系数" Foreground="{Binding Color}"/>
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource Styles.Text.FieldContent.Input}" Text="{Binding AdjustFactor,StringFormat={}{0:F2}}"/>
</StackPanel>
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="调节上限" />
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="调节上限" Foreground="{Binding Color}"/>
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource Styles.Text.FieldContent.Input}" Text="{Binding AdjustUpper,StringFormat={}{0:F0}}"/>
</StackPanel>
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="调节下限" />
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="调节下限" Foreground="{Binding Color}"/>
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource Styles.Text.FieldContent.Input}" Text="{Binding AdjustLower,StringFormat={}{0:F0}}"/>
</StackPanel>
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="稳定级别" />
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="稳定级别" Foreground="{Binding Color}"/>
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource Styles.Text.FieldContent.Input}" Text="{Binding StableLvSwitch,StringFormat={}{0:F1}}"/>
</StackPanel>
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="PID限幅" />
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="PID限幅" Foreground="{Binding Color}"/>
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource Styles.Text.FieldContent.Input}" Text="{Binding PIDLimit,StringFormat={}{0:F0}}"/>
</StackPanel>
......
Project.FLY.Weight/FLY.Weight.UI.Client/UiModule/V5/MainGraphV5.xaml
View file @ ecba5e7e
......@@ -31,6 +31,7 @@
<ColumnDefinition Width="auto"/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<local:UcThicknessV5 x:Name="ucThickness" Margin="{StaticResource ControlMargin}"/>
<ItemsControl x:Name="itemsControl" Grid.Column="1" ItemsSource="{Binding Items}">
<ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
......
Project.FLY.Weight/FLY.Weight.UI.Client/UiModule/V5/MainGraphV5.xaml.cs
View file @ ecba5e7e
......@@ -45,6 +45,8 @@ namespace FLY.Weight.UI.Client.UiModule
this.container_grid.DataContext = container;
ucTotalFlow.Init(weightSystemService);
ucThickness.Init(weightSystemService);
this.weightSystemService = weightSystemService;
root_grid.DataContext = this.weightSystemService;
......@@ -53,7 +55,7 @@ namespace FLY.Weight.UI.Client.UiModule
SetPLCUpdatePlan plan = new SetPLCUpdatePlan(
this.weightSystemService.PLCos,
this.weightSystemService.Items[i],
UcWeighterItem.item_update_propertynames);
UcWeighterItemV5.item_update_propertynames);
setPlan_items.Add(plan);
}
if (weightSystemService is WeightSystemServiceClient) {
......
Project.FLY.Weight/FLY.Weight.UI.Client/UiModule/V5/MainGraphV5_2.xaml.cs
View file @ ecba5e7e
......@@ -45,6 +45,8 @@ namespace FLY.Weight.UI.Client.UiModule
this.container_grid.DataContext = container;
ucTotalFlow.Init(weightSystemService);
ucThickness.Init(weightSystemService);
this.weightSystemService = weightSystemService;
root_grid.DataContext = this.weightSystemService;
......@@ -53,7 +55,7 @@ namespace FLY.Weight.UI.Client.UiModule
SetPLCUpdatePlan plan = new SetPLCUpdatePlan(
this.weightSystemService.PLCos,
this.weightSystemService.Items[i],
UcWeighterItem.item_update_propertynames);
UcWeighterItemV5.item_update_propertynames);
setPlan_items.Add(plan);
}
if (weightSystemService is WeightSystemServiceClient) {
......@@ -94,50 +96,4 @@ namespace FLY.Weight.UI.Client.UiModule
public class UiModule2_MainGraphV5_2 : IUiModule2
{
/// <summary>
/// 控件标题
/// 它的值取决于culture
/// </summary>
public string Title => "称重.主界面v5(5)";
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)
{
MainGraphV5_2 graph = new MainGraphV5_2();
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/V5/UcThicknessV5.xaml.cs
View file @ ecba5e7e
......@@ -53,7 +53,7 @@ namespace FLY.Weight.UI.Client.UiModule
private void button_thickness_Click(object sender, RoutedEventArgs e)
{
WdThickness w = new WdThickness();
WdThicknessV5 w = new WdThicknessV5();
if (weightSystemService.Items.Count() < 1)
return;
......
Project.FLY.Weight/FLY.Weight.UI.Client/UiModule/V5/UcWeighterItemV5_2.xaml.cs
View file @ ecba5e7e
......@@ -94,29 +94,10 @@ namespace FLY.Weight.UI.Client.UiModule
plan = new SetPLCUpdatePlan(
this.WeightSystemService.PLCos,
this.WeightSystemService.Items[idx],
item_update_propertynames);
UcWeighterItemV5.item_update_propertynames);
}
public static string[] item_update_propertynames = new string[] {
// "CumulativeProduction",
nameof(Common.WeighterC.FlowSetting),
nameof(Common.WeighterC.CurrentFlow),
nameof(Common.WeighterC.ScrewPDisp),
nameof(Common.WeighterC.ScrewPSet),
nameof(Common.WeighterC.ScrewPDisp),
nameof(Common.WeighterC.MixBucketWeight),
nameof(Common.WeighterC.BinWeight),
nameof(Common.WeighterC.MixIsOn),
nameof(Common.WeighterC.BucketValveIsOpen),
nameof(Common.WeighterC.ScrewMotorFreq),
nameof(Common.WeighterC.ScrewMotorIsOn),
nameof(Common.WeighterC.ScrewIsAutoMode),
nameof(Common.WeighterC.ScrewManualFreq),
nameof(Common.WeighterC.Density),
nameof(Common.WeighterC.Thickness),
};
private async void button_frequency_Click(object sender, RoutedEventArgs e)
{
......
Project.FLY.Weight/FLY.Weight.UI.Server/Properties/AssemblyInfo.cs
View file @ ecba5e7e
......@@ -12,7 +12,7 @@ using System.Windows;
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("佛山市枫莱尔自动化技术有限公司")]
[assembly: AssemblyProduct("称重服务器")]
[assembly: AssemblyCopyright("Copyright © 2020 FlyAutomation")]
[assembly: AssemblyCopyright("Copyright © 2021 FlyAutomation")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
......@@ -51,6 +51,6 @@ using System.Windows;
// 可以指定所有这些值，也可以使用“内部版本号”和“修订号”的默认值，
// 方法是按如下所示使用“*”:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("6.21.0.0")]
[assembly: AssemblyFileVersion("6.21.0.0")]
[assembly: AssemblyVersion("6.31.0.0")]
[assembly: AssemblyFileVersion("6.31.0.0")]
[assembly: Guid("AC4FFE57-FF42-4B4D-9E23-FF583D78187D")]
thick_public @ 94decdd5
Subproject commit b6ef35e4b799085253ef685d3df8188d29663df3
Subproject commit 94decdd5a6cdc48b9659e14f3d691429f2a59fec
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