Commit 07a9416d authored by 潘栩锋's avatar 潘栩锋 🚴

1. unity配置文件,使用 xmind编写

2. 称重添加66666_v3, 46464_v3
parent e348a6e7
using System;
using System.Collections.Generic;
using System.ComponentModel;
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 System.Windows.Threading;
using FLY.OBJComponents.Client;
using FLY.OBJComponents.Common;
using FLY.OBJComponents.Client;
using FLY.OBJComponents.IService;
using FLY.Thick.Base.UI;
using FLY.Winder.IService;
using FLY.Winder.UI.Client;
using FObjBase;
using MultiLayout;
using MultiLayout.UiModule;
using System;
using System.ComponentModel;
using System.Linq;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Threading;
using Unity;
namespace FLY.Winder.UI.Client.UiModule
......@@ -87,7 +75,7 @@ namespace FLY.Winder.UI.Client.UiModule
setPlan_accessory = new SetPLCUpdatePlan(
winderSystem.PLCos,
winderSystem.Accessory,
new string[]
new string[]
{
"Velocity"
});
......@@ -96,7 +84,7 @@ namespace FLY.Winder.UI.Client.UiModule
setPlan_winders[i] = new SetPLCUpdatePlan(
winderSystem.PLCos,
winderSystem.Items[i],
new string[]
new string[]
{
"MeasureLen",
"MeasurePreWarning"
......@@ -130,7 +118,7 @@ namespace FLY.Winder.UI.Client.UiModule
{
if (winderSystem is FObjServiceClient)
{
if (!(winderSystem as FObjServiceClient).IsConnected)
{
props.Error = "收卷服务器连接断开";
......@@ -150,7 +138,7 @@ namespace FLY.Winder.UI.Client.UiModule
return;
}
if (reason_list_index >= warningReasonWindow.Record.Count)
reason_list_index = warningReasonWindow.Record.Count - 1;
else if (reason_list_index < 0)
......@@ -193,7 +181,7 @@ namespace FLY.Winder.UI.Client.UiModule
/// 控件标题
/// 它的值取决于culture
/// </summary>
public string Title=>"收卷状态";
public string Title => "收卷状态";
public ComponentType Type => ComponentType.DynArea;
public bool IsUnique => true;
/// <summary>
......@@ -202,7 +190,7 @@ namespace FLY.Winder.UI.Client.UiModule
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
public FrameworkElement GetComponent(int id,IUnityContainer container)
public FrameworkElement GetComponent(int id, IUnityContainer container)
{
DynAreaWinder graph = new DynAreaWinder();
container.BuildUp(graph);
......
#!/bin/bash
cp WinderInsideOutside.cs ../../../../Project.FLY.Winder_20190413/FLY.Winder/Common
cp WinderAccessory.cs ../../../../Project.FLY.Winder_20190413/FLY.Winder/Common
cp plcgroup.json ../../../../Project.FLY.Winder_20190413/FLY.Winder.UI.Server/bin/Debug/Gage1
\ No newline at end of file
#!/bin/bash
cp ../../../Project.FLY.Winder_20190413/FLY.Winder/Common/WinderAccessory.cs ./
cp ../../../Project.FLY.Winder_20190413/FLY.Winder/Common/WinderInsideOutside.cs ./
\ No newline at end of file
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
using System.Text;
namespace FLY.Weight.Common
{
public class WeighterAccessory:INotifyPropertyChanged
{
#region 辅助代码生成
/// <summary>
/// 总流量设定
/// </summary>
[Description("总流量设定")]
public float TotalFlowSetting{ get; set; }
/// <summary>
/// 总流量显示
/// </summary>
[Description("总流量显示")]
public float TotalFlow{ get; set; }
/// <summary>
/// 总产量
/// </summary>
[Description("总产量")]
public float TotalProduction{ get; set; }
/// <summary>
/// 码轮周长mm
/// </summary>
[Description("码轮周长mm")]
public float WheelPerimeter{ get; set; }
/// <summary>
/// 码轮脉冲
/// </summary>
[Description("码轮脉冲")]
public float WheelPulse{ get; set; }
/// <summary>
/// 平均密度
/// </summary>
[Description("平均密度")]
public float Density{ get; set; }
/// <summary>
/// 边料不回收
/// </summary>
[Description("边料不回收")]
public bool IsRimNoRecycle{ get; set; }
/// <summary>
/// 边料kg/h
/// </summary>
[Description("边料kg/h")]
public float RimCharge{ get; set; }
/// <summary>
/// 厚度um
/// </summary>
[Description("厚度um")]
public float Thickness{ get; set; }
/// <summary>
/// 当前线速度m/min
/// </summary>
[Description("当前线速度m/min")]
public float CurrentVelocity{ get; set; }
/// <summary>
/// 当前线速度设置m/min
/// </summary>
[Description("当前线速度设置m/min")]
public float CurrentVelocitySet{ get; set; }
/// <summary>
/// 吹膜宽度mm
/// </summary>
[Description("吹膜宽度mm")]
public float TotalFilmWidth{ get; set; }
/// <summary>
/// 切边mm
/// </summary>
[Description("切边mm")]
public float RimWidth{ get; set; }
/// <summary>
/// 收卷宽度mm
/// </summary>
[Description("收卷宽度mm")]
public float ActFilmWidth{ get; set; }
/// <summary>
/// 设定厚度um
/// </summary>
[Description("设定厚度um")]
public float SetThickness{ get; set; }
/// <summary>
/// 理论速度m/min
/// </summary>
[Description("理论速度m/min")]
public float TargetVelocity{ get; set; }
/// <summary>
/// 内收卷当前m
/// </summary>
[Description("内收卷当前m")]
public float ACurrentLen{ get; set; }
/// <summary>
/// 内收卷当前kg
/// </summary>
[Description("内收卷当前kg")]
public float ACurrent{ get; set; }
/// <summary>
/// 内收卷上卷kg
/// </summary>
[Description("内收卷上卷kg")]
public float ALast{ get; set; }
/// <summary>
/// 外收卷当前m
/// </summary>
[Description("外收卷当前m")]
public float BCurrentLen{ get; set; }
/// <summary>
/// 外收卷当前kg
/// </summary>
[Description("外收卷当前kg")]
public float BCurrent{ get; set; }
/// <summary>
/// 外收卷上卷kg
/// </summary>
[Description("外收卷上卷kg")]
public float BLast{ get; set; }
/// <summary>
/// 内收卷清零
/// </summary>
[Description("内收卷清零")]
public bool AClear{ get; set; }
/// <summary>
/// 外收卷清零
/// </summary>
[Description("外收卷清零")]
public bool BClear{ get; set; }
#endregion
public event PropertyChangedEventHandler PropertyChanged;
}
}
#!/bin/bash
cp WinderInsideOutside.cs ../../../../Project.FLY.Winder_20190413/FLY.Winder/Common
cp WinderAccessory.cs ../../../../Project.FLY.Winder_20190413/FLY.Winder/Common
cp plcgroup.json ../../../../Project.FLY.Winder_20190413/FLY.Winder.UI.Server/bin/Debug/Gage1
\ No newline at end of file
#!/bin/bash
cp ../../../Project.FLY.Winder_20190413/FLY.Winder/Common/WinderAccessory.cs ./
cp ../../../Project.FLY.Winder_20190413/FLY.Winder/Common/WinderInsideOutside.cs ./
\ No newline at end of file
Subproject commit e1cebe185cd0c19319b90c435e26abe0f8e6c45a
Subproject commit 0667c868555b477b3fd2f7a8869e9b9ea33d7891
#!/bin/bash
rm -Rf ../Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/bin/Debug/unity
./Xmind2UnityConfig.exe 和美追边客户端容器描述.xmind ../Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/bin/Debug
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