Skip to content

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

修复 thick_public 的bug

parent a2f5a492
Hide whitespace changes
Inline Side-by-side
Showing with 816 additions and 62 deletions
Project.FLY.Thick.Blowing/FLY.Thick.Blowing/Server/TDGage.cs
View file @ 8bde3da5
......@@ -211,11 +211,8 @@ namespace FLY.Thick.Blowing.Server
//---------------------------------------------------------------------------------------------------------------
//FlyAD7_Create
mFlyAD = new FlyAD7();
Misc.BindingOperations.SetBinding(mSysParam, "FLYAD7_HasCRC",mFlyAD, "HasCRC", BindingOperations.BindingMode.TwoWay);
mFlyAD.Connect(mSysParam.FLYAD7EP);
Misc.BindingOperations.SetBinding(mFlyAD, "LocalEP", mSysParam, "FLYAD7EP");
mFlyAD.Load();
mFlyAD.Connect();
Misc.BindingOperations.SetBinding(mFlyAD, "IStatus", mDynArea, "IStatus");
Misc.BindingOperations.SetBinding(mFlyAD, "OStatus", mDynArea, "OStatus");
......
Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI.Server/Properties/AssemblyInfo.cs
View file @ 8bde3da5
......@@ -12,7 +12,7 @@ using System.Windows;
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("佛山市枫莱尔自动化技术有限公司")]
[assembly: AssemblyProduct("FLY.Thick.BlowingScan.UI.Server")]
[assembly: AssemblyCopyright("Copyright © 2018 FlyAutomation")]
[assembly: AssemblyCopyright("Copyright © 2020 FlyAutomation")]
[assembly: AssemblyTrademark("FlyAutomation")]
[assembly: AssemblyCulture("")]
......@@ -51,7 +51,7 @@ using System.Windows;
// 可以指定所有这些值，也可以使用“内部版本号”和“修订号”的默认值，
// 方法是按如下所示使用“*”:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("5.1.0.0")]
[assembly: AssemblyFileVersion("5.1.0.0")]
[assembly: AssemblyVersion("6.0.0.0")]
[assembly: AssemblyFileVersion("6.0.0.0")]
[assembly: Guid("A2277244-BCD4-485B-85F4-AAE96DA235B5")]
Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI/FLY.Thick.BlowingScan.UI.csproj
View file @ 8bde3da5
......@@ -59,6 +59,9 @@
<ItemGroup>
<Compile Include="PgBlowing\PgBlowingVm.cs" />
<Compile Include="PgBlowing\PgBlowingVmUt.cs" />
<Compile Include="PgInitparam.xaml.cs">
<DependentUpon>PgInitparam.xaml</DependentUpon>
</Compile>
<Compile Include="PgMenu.xaml.cs">
<DependentUpon>PgMenu.xaml</DependentUpon>
</Compile>
......@@ -99,6 +102,10 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="PgInitparam.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="PgMenu.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
......
Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI/PgInitparam.xaml 0 → 100644
View file @ 8bde3da5
<Page x:Class="FLY.Thick.BlowingScan.UI.Client.PgInitparam"
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.Thick.BlowingScan.UI.Client"
xmlns:common="clr-namespace:FLY.Thick.Base.Common;assembly=FLY.Thick.Base"
xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
mc:Ignorable="d"
d:DesignHeight="900" d:DesignWidth="1280"
Background="WhiteSmoke"
Title="Page_Initparam"
d:DataContext="{d:DesignInstance local:PgInitParamVm}">
<Page.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/Dictionary_MyStyle.xaml"/>
<ResourceDictionary Source="pack://application:,,,/FLY.Thick.Base.UI;component/Converter/Dictionary_MyConv.xaml"/>
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</Page.Resources>
<Grid >
<Grid.RowDefinitions>
<RowDefinition Height="auto" />
<RowDefinition />
</Grid.RowDefinitions>
<StackPanel Orientation="Horizontal" Background="{StaticResource Brush_theme_bar}">
<Button Style="{StaticResource ButtonStyle_back2}" Command="BrowseBack"/>
<TextBlock Style="{StaticResource TextBlockStyle_Title}" Text="系统参数"/>
</StackPanel>
<ScrollViewer PanningMode="Both" Grid.Row="1" >
<StackPanel >
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="auto"/>
<ColumnDefinition />
</Grid.ColumnDefinitions>
<Border Style="{StaticResource BorderStyle_paramSection}">
<TextBlock Text="基本" />
</Border>
<StackPanel Grid.Column="1" >
<StackPanel Orientation="Horizontal">
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="数据库容量" />
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding DBKeepMonth}" />
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="月" />
</StackPanel>
</StackPanel>
</StackPanel>
<StackPanel Orientation="Horizontal">
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="归零间隔" />
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding AutoOrgInterval}" />
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="min" />
</StackPanel>
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="机架长度" />
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding PosLength}" />
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm_interval}" Text="|"/>
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" >
<Run>
<MultiBinding Converter="{StaticResource p2mmconv}" Mode="OneWay" StringFormat="{}{0:F0}">
<Binding Path="PosLength" />
<Binding Path="Encoder1_mmpp"/>
</MultiBinding>
</Run>
<Run Text="mm"/>
</TextBlock>
</StackPanel>
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="编码器1比例" />
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding Encoder1_mmpp}" HorizontalAlignment="Left"/>
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="mm/脉冲"/>
</StackPanel>
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="AD延时" />
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding ADLag}" HorizontalAlignment="Left"/>
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="*1.28ms"/>
</StackPanel>
</StackPanel>
</StackPanel>
<StackPanel Orientation="Horizontal">
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="线速度源" />
<ComboBox Width="191" MinHeight="40" HorizontalAlignment="Left">
<ComboBoxItem x:Name="comboBoxotem_EN2" IsSelected="{Binding FilmVSrc, Converter={StaticResource e2bconv}, ConverterParameter={x:Static common:FilmVSRC.EN2}}">
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent}" FontSize="32" Text="编码器2"/>
</ComboBoxItem>
<ComboBoxItem x:Name="comboBoxotem_ROUND" IsSelected="{Binding FilmVSrc, Converter={StaticResource e2bconv}, ConverterParameter={x:Static common:FilmVSRC.ROUND}}">
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent}" FontSize="32" Text="辊信号"/>
</ComboBoxItem>
</ComboBox>
</StackPanel>
<StackPanel Orientation="Horizontal" Visibility="{Binding IsSelected,Converter={StaticResource visbilityconv},ConverterParameter=Collapsed, ElementName=comboBoxotem_EN2}">
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="编码器2比例" />
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding Encoder2_mmpp}" HorizontalAlignment="Left"/>
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" >
<Run Text="mm/脉冲"/>
</TextBlock>
</StackPanel>
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="编码器2放大" />
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding Encoder2_comp}" HorizontalAlignment="Left"/>
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" >
<Run Text="倍"/>
</TextBlock>
</StackPanel>
</StackPanel>
</StackPanel>
<StackPanel Orientation="Horizontal" Visibility="{Binding IsSelected,Converter={StaticResource visbilityconv},ConverterParameter=Collapsed, ElementName=comboBoxotem_ROUND}">
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="辊周长" />
<StackPanel Orientation="Horizontal">
<TextBox HorizontalAlignment="Left" MaxWidth="150" Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding MmOfR,StringFormat={}{0:F1}}" />
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="mm" />
</StackPanel>
</StackPanel>
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="最小线速度" />
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding FilmVThreshold}" HorizontalAlignment="Left"/>
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" >
<Run Text="m/min"/>
</TextBlock>
</StackPanel>
</StackPanel>
</StackPanel>
</StackPanel>
</Grid>
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="auto"/>
<ColumnDefinition />
</Grid.ColumnDefinitions>
<Border Style="{StaticResource BorderStyle_paramSection}">
<TextBlock Text="速度"/>
</Border>
<WrapPanel Grid.Column="1" Orientation="Horizontal">
<StackPanel Orientation="Horizontal">
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="扫描速度" />
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding VScan}" HorizontalAlignment="Left"/>
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm_interval}" Text="|" />
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" >
<Run>
<MultiBinding Converter="{StaticResource outsp2mpminconv}" Mode="OneWay" StringFormat="{}{0:F1}">
<Binding Path="VScan" />
<Binding Path="Encoder1_mmpp" />
<Binding Path="Speed1Scale" />
</MultiBinding>
</Run>
<Run Text="m/min" />
</TextBlock>
</StackPanel>
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="精确定位速度" />
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding VAccuracy}" />
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm_interval}" Text="|" />
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" >
<Run>
<MultiBinding Converter="{StaticResource outsp2mpminconv}" Mode="OneWay" StringFormat="{}{0:F1}">
<Binding Path="VAccuracy" />
<Binding Path="Encoder1_mmpp" />
<Binding Path="Speed1Scale" />
</MultiBinding>
</Run>
<Run Text="m/min" />
</TextBlock>
</StackPanel>
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="调试速度" />
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding VJOG}" />
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm_interval}" Text="|" />
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" >
<Run>
<MultiBinding Converter="{StaticResource outsp2mpminconv}" Mode="OneWay" StringFormat="{}{0:F1}">
<Binding Path="VJOG" />
<Binding Path="Encoder1_mmpp" />
<Binding Path="Speed1Scale" />
</MultiBinding>
</Run>
<Run Text="m/min" />
</TextBlock>
</StackPanel>
</StackPanel>
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="开始速度" />
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding SVelocity}" />
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm_interval}" Text="|" />
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" >
<Run >
<MultiBinding Converter="{StaticResource outsp2mpminconv}" Mode="OneWay" StringFormat="{}{0:F1}">
<Binding Path="SVelocity" />
<Binding Path="Encoder1_mmpp" />
<Binding Path="Speed1Scale" />
</MultiBinding>
</Run>
<Run Text="m/min" />
</TextBlock>
</StackPanel>
</StackPanel>
<StackPanel Orientation="Horizontal">
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="归零速度1" />
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding HVelocity1}" />
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm_interval}" Text="|" />
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" >
<Run >
<MultiBinding Converter="{StaticResource outsp2mpminconv}" Mode="OneWay" StringFormat="{}{0:F1}">
<Binding Path="HVelocity1" />
<Binding Path="Encoder1_mmpp" />
<Binding Path="Speed1Scale" />
</MultiBinding>
</Run>
<Run Text="m/min" />
</TextBlock>
</StackPanel>
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="归零速度2" />
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding HVelocity2}" />
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm_interval}" Text="|" />
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" >
<Run >
<MultiBinding Converter="{StaticResource outsp2mpminconv}" Mode="OneWay" StringFormat="{}{0:F1}">
<Binding Path="HVelocity2" />
<Binding Path="Encoder1_mmpp" />
<Binding Path="Speed1Scale" />
</MultiBinding>
</Run>
<Run Text="m/min" />
</TextBlock>
</StackPanel>
</StackPanel>
</StackPanel>
<StackPanel Orientation="Horizontal">
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="加速时间" />
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding ATime}" />
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" >
<Run Text="ms" />
</TextBlock>
</StackPanel>
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="减速时间" />
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding DTime}" />
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" >
<Run Text="ms" />
</TextBlock>
</StackPanel>
</StackPanel>
</StackPanel>
</WrapPanel>
</Grid>
</StackPanel>
</ScrollViewer>
<Button Style="{StaticResource ButtonStyle_apply}" VerticalAlignment="Bottom" Margin="0,0,20,-45"
Command="{Binding ApplyCmd}"/>
</Grid>
</Page>
Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI/PgInitparam.xaml.cs 0 → 100644
View file @ 8bde3da5
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
using FLY.Thick.Base.UI.Converter;
using System.Net;
using FLY.Thick.Base.Common;
using FLY.Thick.Base.Client;
using FLY.Thick.Base.IService;
using Unity;
using System.ComponentModel;
using GalaSoft.MvvmLight.Command;
using FLY.Thick.Base.UI;
namespace FLY.Thick.BlowingScan.UI.Client
{
/// <summary>
/// Page_Initparam.xaml 的交互逻辑
/// </summary>
public partial class PgInitparam : Page
{
PgInitParamVm viewModel;
public PgInitparam()
{
InitializeComponent();
}
[InjectionMethod]
public void Init(IInitParamService initParamService)
{
viewModel = new PgInitParamVm();
viewModel.Init(initParamService);
this.DataContext = viewModel;
}
}
public class PgInitParamVm : INotifyPropertyChanged
{
public event PropertyChangedEventHandler PropertyChanged;
#region 参数
/// <summary>
/// 扫描架长
/// </summary>
public int PosLength { get; set; }
public bool IsTimeGridAdvEnabled { get; set; }
public int ADLag { get; set; }
/// <summary>
/// 自动归原点间距,次数
/// </summary>
public int AutoOrgInterval { get; set; }
/// <summary>
/// 编码器1 mm/pulse
/// </summary>
public double Encoder1_mmpp { get; set; }
/// <summary>
/// 设置的速度，与 实际速度比例 Speed1 = VScan*Speed1Scale
/// </summary>
public double Speed1Scale { get; set; }
/// <summary>
/// 线速度来源
/// </summary>
public FilmVSRC FilmVSrc { get; set; }
/// <summary>
/// 最小线速度 m/min
/// </summary>
public int FilmVThreshold { get; set; }
/// <summary>
/// 线速度:编码器2 mm/pulse
/// </summary>
public double Encoder2_mmpp { get; set; }
/// <summary>
/// 编码器2 放大
/// </summary>
public float Encoder2_comp { get; set; }
/// <summary>
/// 线速度:1圈多少mm
/// </summary>
public double MmOfR { get; set; }
/// <summary>
/// 数据有效源
/// </summary>
public DATAVALIDSRC DataValidSrc { get; set; }
/// <summary>
/// 当数据有效状态改变，自动按F1，F3
/// </summary>
public bool AutoF1F3 { get; set; }
/// <summary>
/// 当数据有效状态 无效->有效 ，等待多久重新扫描 ，单位s
/// </summary>
public int ReStartDelay { get; set; }
/// <summary>
/// 有按样标定硬件
/// </summary>
public bool HasProfileSample { get; set; }
/// <summary>
/// 有小托辊
/// </summary>
public bool HasHold { get; set; }
#region 速度
/// <summary>
/// 扫描时速度 Velocity Of Scan
/// </summary>
public UInt32 VScan { get; set; }
/// <summary>
/// 调试时速度，向前走，向后走 Velocity Of JOG
/// </summary>
public UInt32 VJOG { get; set; }
/// <summary>
/// 精确速度 Velocity Of Accuracy 如: 机架修正, 样品取样, 机架信息获取
/// </summary>
public UInt32 VAccuracy { set; get; }
/// <summary>
/// 开始速度 Start Velocity
/// </summary>
public UInt32 SVelocity { set; get; }
/// <summary>
/// 加速时间
/// </summary>
public UInt32 ATime { set; get; }
/// <summary>
/// 减速时间
/// </summary>
public UInt32 DTime { set; get; }
/// <summary>
/// 归0速度1
/// </summary>
public UInt32 HVelocity1 { set; get; }
/// <summary>
/// 归0速度2
/// </summary>
public UInt32 HVelocity2 { set; get; }
#endregion
/// <summary>
/// 数据库保存的月数
/// </summary>
public int DBKeepMonth { get; set; }
/// <summary>
/// 数据库路径
/// </summary>
public string DbPath { get; set; }
#endregion
#region Command
public RelayCommand ApplyCmd { get; }
public RelayCommand SelectDbPathCmd { get; }
#endregion
IInitParamService initParamService;
public PgInitParamVm()
{
ApplyCmd = new RelayCommand(Apply);
SelectDbPathCmd = new RelayCommand(SelectDbPath);
}
public void Init(IInitParamService initParamService)
{
this.initParamService = initParamService;
Misc.BindingOperations.SetBinding(initParamService, "PosLength", this, "PosLength");
Misc.BindingOperations.SetBinding(initParamService, "IsTimeGridAdvEnabled", this, "IsTimeGridAdvEnabled");
Misc.BindingOperations.SetBinding(initParamService, "ADLag", this, "DLag");
Misc.BindingOperations.SetBinding(initParamService, "AutoOrgInterval", this, "AutoOrgInterval");
Misc.BindingOperations.SetBinding(initParamService, "Encoder1_mmpp", this, "Encoder1_mmpp");
Misc.BindingOperations.SetBinding(initParamService, "Speed1Scale", this, "Speed1Scale");
Misc.BindingOperations.SetBinding(initParamService, "FilmVSrc", this, "FilmVSrc");
Misc.BindingOperations.SetBinding(initParamService, "FilmVThreshold", this, "FilmVThreshold");
Misc.BindingOperations.SetBinding(initParamService, "Encoder2_mmpp", this, "Encoder2_mmpp");
Misc.BindingOperations.SetBinding(initParamService, "Encoder2_comp", this, "Encoder2_comp");
Misc.BindingOperations.SetBinding(initParamService, "MmOfR", this, "MmOfR");
Misc.BindingOperations.SetBinding(initParamService, "DataValidSrc", this, "DataValidSrc");
Misc.BindingOperations.SetBinding(initParamService, "AutoF1F3", this, "AutoF1F3");
Misc.BindingOperations.SetBinding(initParamService, "ReStartDelay", this, "ReStartDelay");
Misc.BindingOperations.SetBinding(initParamService, "HasProfileSample", this, "HasProfileSample");
Misc.BindingOperations.SetBinding(initParamService, "HasHold", this, "HasHold");
Misc.BindingOperations.SetBinding(initParamService, "VScan", this, "VScan");
Misc.BindingOperations.SetBinding(initParamService, "VJOG", this, "VJOG");
Misc.BindingOperations.SetBinding(initParamService, "VAccuracy", this, "VAccuracy");
Misc.BindingOperations.SetBinding(initParamService, "SVelocity", this, "SVelocity");
Misc.BindingOperations.SetBinding(initParamService, "ATime", this, "ATime");
Misc.BindingOperations.SetBinding(initParamService, "DTime", this, "DTime");
Misc.BindingOperations.SetBinding(initParamService, "HVelocity1", this, "HVelocity1");
Misc.BindingOperations.SetBinding(initParamService, "HVelocity2", this, "HVelocity2");
Misc.BindingOperations.SetBinding(initParamService, "DBKeepMonth", this, "DBKeepMonth");
Misc.BindingOperations.SetBinding(initParamService, "DbPath", this, "DbPath");
}
private void Apply()
{
if (!WdPassword.Authorize("InitParam"))
return;
initParamService.PosLength=this.PosLength;
initParamService.IsTimeGridAdvEnabled=this.IsTimeGridAdvEnabled;
initParamService.ADLag=this.ADLag;
initParamService.AutoOrgInterval=this.AutoOrgInterval;
initParamService.Encoder1_mmpp=this.Encoder1_mmpp;
initParamService.Speed1Scale=this.Speed1Scale;
initParamService.FilmVSrc=this.FilmVSrc;
initParamService.FilmVThreshold=this.FilmVThreshold;
initParamService.Encoder2_mmpp=this.Encoder2_mmpp;
initParamService.Encoder2_comp=this.Encoder2_comp;
initParamService.MmOfR=this.MmOfR;
initParamService.DataValidSrc=this.DataValidSrc;
initParamService.AutoF1F3=this.AutoF1F3;
initParamService.ReStartDelay=this.ReStartDelay;
initParamService.HasProfileSample=this.HasProfileSample;
initParamService.HasHold=this.HasHold;
initParamService.VScan=this.VScan;
initParamService.VJOG=this.VJOG;
initParamService.VAccuracy=this.VAccuracy;
initParamService.SVelocity=this.SVelocity;
initParamService.ATime=this.ATime;
initParamService.DTime=this.DTime;
initParamService.HVelocity1=this.HVelocity1;
initParamService.HVelocity2=this.HVelocity2;
initParamService.DBKeepMonth=this.DBKeepMonth;
initParamService.DbPath = this.DbPath;
initParamService.Apply();
FLY.ControlLibrary.Window_Tip.Show("应用成功",
null,
TimeSpan.FromSeconds(2));
}
private void SelectDbPath()
{
System.Windows.Forms.FileDialog open = new System.Windows.Forms.OpenFileDialog();
open.Filter = "sqlite3文件|*.sqlite3|所有文件|*.*";
open.Title = "打开音乐文件";
if (System.IO.Path.IsPathRooted(DbPath))
open.InitialDirectory = System.IO.Path.GetDirectoryName(DbPath);
else
open.InitialDirectory = System.Environment.CurrentDirectory;
if (open.ShowDialog() == System.Windows.Forms.DialogResult.OK)
{
string currentDirectory = System.Environment.CurrentDirectory.ToLower();
string filename = open.FileName.ToLower();
if (filename.StartsWith(currentDirectory))
{
//CurrentDirectory没有最后的\ 需要+1
DbPath = open.FileName.Substring(System.Environment.CurrentDirectory.Length + 1);
}
else
{
DbPath = open.FileName;
}
}
}
}
}
Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI/PgMenu.xaml.cs
View file @ 8bde3da5
......@@ -5,7 +5,7 @@ using System.Windows.Controls;
using System.Windows.Navigation;
using Unity;
using PgFlyAd = FLY.Thick.Base.UI.PgFlyAd;
using PgInitparam = FLY.Thick.Base.UI.PgInitparam;
namespace FLY.Thick.BlowingScan.UI.Client
{
......
Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan/Server/GM_BlowingScan.cs
View file @ 8bde3da5
......@@ -917,9 +917,6 @@ namespace FLY.Thick.BlowingScan.Server
mPDetect.Init(mFlyAD);
mScanPosDetect.Init(mFlyAD);
ScanCnt = -1;
}
......
Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan/Server/TDGage.cs
View file @ 8bde3da5
......@@ -306,9 +306,8 @@ namespace FLY.Thick.BlowingScan.Server
//---------------------------------------------------------------------------------------------------------------
//FlyAD7_Create
mFlyAD = new FlyAD7();
//TODO
mFlyAD.Connect(mSysParam.FLYAD7EP);
Misc.BindingOperations.SetBinding(mFlyAD, "LocalEP", mSysParam, "FLYAD7EP");
mFlyAD.Load();
mFlyAD.Connect();
Misc.BindingOperations.SetBinding(mInitParam, "PosLength", mFlyAD, "PosLen");
......
thick_public @ 715ebee6
Subproject commit 5e49ed992e2210e9ec5c5a1397777f248d7182eb
Subproject commit 715ebee61130332971fcac03421f62bc114bb015
脚本/2.get_exe.sh
View file @ 8bde3da5
#!/bin/bash
#获取git 最后一个 tag 的描述！！！！
LatestTag=$(git describe --tags `git rev-list --tags --max-count=1`)
#LatestTag=$(git describe --tags `git rev-list --tags --max-count=1`)
install_dir="和美安装包_"$LatestTag
#install_dir="和美安装包_"$LatestTag
install_dir="和美安装包_xxxx"
if [ -e $install_dir ]; then
rm -rf $install_dir
fi
......
脚本/restore/FLY.Thick.Blowing.UI.Fix.Client/layout/graphcustom.json
View file @ 8bde3da5
......@@ -6,8 +6,7 @@
"MenuItems": [
19818984,
63206470,
44866487,
58324414
44866487
],
"DynAreaItems": [
50585687,
......@@ -15,27 +14,9 @@
63402646,
21215025,
64060950,
6082351,
41268531
],
"Items": [
{
"Graphs": [
{
"ID": 9296665,
"Rect": "0, 0, 1, 1"
}
],
"ColumnCount": 1,
"RowCount": 1,
"RowDefinitions": [
false
],
"ColumnDefinitions": [
false
],
"Header": "称重"
},
{
"Graphs": [
{
......@@ -87,10 +68,6 @@
{
"ID": 48220637,
"Rect": "0, 0, 1, 1"
},
{
"ID": 8698273,
"Rect": "0, 1, 1, 1"
}
],
"ColumnCount": 1,
......@@ -156,11 +133,6 @@
"Module": "FLY.FeedbackRenZiJia.UI.Client.UiModule.UiModule2_MenuSetting",
"ServiceContainerName": "gage0.service"
},
{
"ID": 58324414,
"Module": "FLY.Weight2.UI.Client.UiModule.UiModule2_MenuSetting",
"ServiceContainerName": "gage0.service"
},
{
"ID": 50585687,
"Module": "FLY.Thick.Blowing.UI.Fix.Client.UiModule.UiModule2_DynAreaThick",
......@@ -186,21 +158,11 @@
"Module": "FLY.FeedbackRenZiJia.UI.Client.UiModule.UiModule2_DynAreaAirRing",
"ServiceContainerName": "gage0.service"
},
{
"ID": 6082351,
"Module": "FLY.Weight2.UI.Client.UiModule.UiModule2_DynAreaWeight",
"ServiceContainerName": "gage0.service"
},
{
"ID": 41268531,
"Module": "FLY.HeatingHelper.UI.UiModule.UiModule2_HeatThickDetector",
"ServiceContainerName": "gage0.service"
},
{
"ID": 9296665,
"Module": "FLY.Weight2.UI.Client.UiModule.UiModule2_MainGraph",
"ServiceContainerName": "gage0.service"
},
{
"ID": 36919767,
"Module": "FLY.Thick.Blowing.UI.Fix.Client.UiModule.UiModule2_ScanGraph2",
......@@ -226,11 +188,6 @@
"Module": "FLY.Thick.Blowing.UI.Fix.Client.UiModule.UiModule2_TrendGraph",
"ServiceContainerName": "gage0.service"
},
{
"ID": 8698273,
"Module": "FLY.Weight2.UI.Client.UiModule.UiModule2_FlowGraph",
"ServiceContainerName": "gage0.service"
},
{
"ID": 13476385,
"Module": "FLY.Thick.Blowing.UI.Fix.Client.UiModule.UiModule2_ScanGraphCircular",
......
脚本/restore/FLY.Thick.Blowing.UI.Fix.Client/layout/graphcustoms/风环.json 0 → 100644
View file @ 8bde3da5
{
"GageTabItems": [
{
"Title": "吹膜",
"ServiceContainerName": "gage0.service",
"MenuItems": [
19818984,
63206470,
44866487
],
"DynAreaItems": [
50585687,
10658788,
63402646,
21215025,
64060950,
41268531
],
"Items": [
{
"Graphs": [
{
"ID": 36919767,
"Rect": "0, 0, 1, 1"
},
{
"ID": 15676068,
"Rect": "0, 1, 1, 1"
},
{
"ID": 48662582,
"Rect": "0, 2, 1, 2"
}
],
"ColumnCount": 1,
"RowCount": 4,
"RowDefinitions": [
false,
false,
false,
false
],
"ColumnDefinitions": [
false
],
"Header": "风环"
},
{
"Graphs": [
{
"ID": 14719473,
"Rect": "0, 0, 1, 1"
}
],
"ColumnCount": 1,
"RowCount": 2,
"RowDefinitions": [
false,
false
],
"ColumnDefinitions": [
false
],
"Header": "扫描"
},
{
"Graphs": [
{
"ID": 48220637,
"Rect": "0, 0, 1, 1"
}
],
"ColumnCount": 1,
"RowCount": 2,
"RowDefinitions": [
false,
false
],
"ColumnDefinitions": [
false
],
"Header": "趋势"
},
{
"Graphs": [
{
"ID": 13476385,
"Rect": "0, 0, 1, 1"
}
],
"ColumnCount": 1,
"RowCount": 1,
"RowDefinitions": [
false
],
"ColumnDefinitions": [
false
],
"Header": "环型"
},
{
"Graphs": [
{
"ID": 28792051,
"Rect": "0, 0, 1, 1"
}
],
"ColumnCount": 1,
"RowCount": 2,
"RowDefinitions": [
false,
false
],
"ColumnDefinitions": [
false
],
"Header": "定点"
}
],
"Components": [
{
"ID": 19818984,
"Module": "FLY.Thick.Blowing.UI.Fix.Client.UiModule.UiModule2_MenuSetting",
"ServiceContainerName": "gage0.service"
},
{
"ID": 63206470,
"Module": "FLY.Thick.Blowing.UI.Fix.Client.UiModule.UiModule2_MenuProfile",
"ServiceContainerName": "gage0.service"
},
{
"ID": 44866487,
"Module": "FLY.FeedbackRenZiJia.UI.Client.UiModule.UiModule2_MenuSetting",
"ServiceContainerName": "gage0.service"
},
{
"ID": 50585687,
"Module": "FLY.Thick.Blowing.UI.Fix.Client.UiModule.UiModule2_DynAreaThick",
"ServiceContainerName": "gage0.service"
},
{
"ID": 10658788,
"Module": "FLY.Thick.Blowing.UI.Fix.Client.UiModule.UiModule2_DynAreaProfile",
"ServiceContainerName": "gage0.service"
},
{
"ID": 63402646,
"Module": "FLY.Thick.Blowing.UI.Fix.Client.UiModule.UiModule2_DynAreaBlowing",
"ServiceContainerName": "gage0.service"
},
{
"ID": 21215025,
"Module": "FLY.Thick.Base.UI.UiModule.UiModule2_DynAreaIO",
"ServiceContainerName": "gage0.service"
},
{
"ID": 64060950,
"Module": "FLY.FeedbackRenZiJia.UI.Client.UiModule.UiModule2_DynAreaAirRing",
"ServiceContainerName": "gage0.service"
},
{
"ID": 41268531,
"Module": "FLY.HeatingHelper.UI.UiModule.UiModule2_HeatThickDetector",
"ServiceContainerName": "gage0.service"
},
{
"ID": 36919767,
"Module": "FLY.Thick.Blowing.UI.Fix.Client.UiModule.UiModule2_ScanGraph2",
"ServiceContainerName": "gage0.service"
},
{
"ID": 15676068,
"Module": "FLY.Thick.Blowing.UI.Fix.Client.UiModule.UiModule2_ScanGraph2",
"ServiceContainerName": "gage0.service"
},
{
"ID": 48662582,
"Module": "FLY.FeedbackRenZiJia.UI.Client.UiModule.UiModule2_GraphAirRing",
"ServiceContainerName": "gage0.service"
},
{
"ID": 14719473,
"Module": "FLY.Thick.Blowing.UI.Fix.Client.UiModule.UiModule2_ScanGraph",
"ServiceContainerName": "gage0.service"
},
{
"ID": 48220637,
"Module": "FLY.Thick.Blowing.UI.Fix.Client.UiModule.UiModule2_TrendGraph",
"ServiceContainerName": "gage0.service"
},
{
"ID": 13476385,
"Module": "FLY.Thick.Blowing.UI.Fix.Client.UiModule.UiModule2_ScanGraphCircular",
"ServiceContainerName": "gage0.service"
},
{
"ID": 28792051,
"Module": "FLY.Thick.Base.UI.UiModule.UiModule2_FixGraph",
"ServiceContainerName": "gage0.service"
}
]
}
],
"DynAreaWidth": 250,
"IsDynAreaVisible": true,
"IsLogoHidden": true,
"Rect": "0, 0, 1382, 744",
"WindowState": 2
}
\ No newline at end of file
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