Skip to content

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

添加 测袋模式！！！！

parent f7e046ab
Show whitespace changes
Inline Side-by-side
Showing with 539 additions and 376 deletions
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/FLY.Thick.Blowing.UI.Fix.Client.csproj
View file @ 72dc1b2b
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\..\packages\PropertyChanged2.Fody.2.5.13\build\PropertyChanged2.Fody.props" Condition="Exists('..\..\packages\PropertyChanged2.Fody.2.5.13\build\PropertyChanged2.Fody.props')" />
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">x86</Platform> <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
...@@ -31,6 +32,8 @@ ...@@ -31,6 +32,8 @@
<ApplicationVersion>1.0.0.%2a</ApplicationVersion> <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust> <UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled> <BootstrapperEnabled>true</BootstrapperEnabled>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<PlatformTarget>x86</PlatformTarget> <PlatformTarget>x86</PlatformTarget>
...@@ -62,6 +65,9 @@ ...@@ -62,6 +65,9 @@
<Reference Include="Microsoft.Expression.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" /> <Reference Include="Microsoft.Expression.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
<Reference Include="Microsoft.Expression.Interactions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" /> <Reference Include="Microsoft.Expression.Interactions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
<Reference Include="PresentationFramework.Aero" /> <Reference Include="PresentationFramework.Aero" />
<Reference Include="PropertyChanged2, Version=2.5.13.0, Culture=neutral, PublicKeyToken=ee3ee20bcf148ddd, processorArchitecture=MSIL">
<HintPath>..\..\packages\PropertyChanged2.Fody.2.5.13\lib\net40\PropertyChanged2.dll</HintPath>
</Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Data" /> <Reference Include="System.Data" />
<Reference Include="System.Drawing" /> <Reference Include="System.Drawing" />
...@@ -184,6 +190,7 @@ ...@@ -184,6 +190,7 @@
<SubType>Designer</SubType> <SubType>Designer</SubType>
</EmbeddedResource> </EmbeddedResource>
<None Include="app.config" /> <None Include="app.config" />
<None Include="packages.config" />
<None Include="Properties\Settings.settings"> <None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator> <Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput> <LastGenOutput>Settings.Designer.cs</LastGenOutput>
...@@ -272,8 +279,18 @@ ...@@ -272,8 +279,18 @@
<EmbedInteropTypes>True</EmbedInteropTypes> <EmbedInteropTypes>True</EmbedInteropTypes>
</COMReference> </COMReference>
</ItemGroup> </ItemGroup>
<ItemGroup /> <ItemGroup>
<Resource Include="FodyWeavers.xml" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\..\packages\Fody.3.2.13\build\Fody.targets" Condition="Exists('..\..\packages\Fody.3.2.13\build\Fody.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\..\packages\Fody.3.2.13\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Fody.3.2.13\build\Fody.targets'))" />
<Error Condition="!Exists('..\..\packages\PropertyChanged2.Fody.2.5.13\build\PropertyChanged2.Fody.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\PropertyChanged2.Fody.2.5.13\build\PropertyChanged2.Fody.props'))" />
</Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- 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. Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild"> <Target Name="BeforeBuild">
......
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/FodyWeavers.xml 0 → 100644
View file @ 72dc1b2b
<?xml version="1.0" encoding="utf-8" ?>
<Weavers>
<PropertyChanged2 />
</Weavers>
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/Page_Main.xaml.cs
View file @ 72dc1b2b
...@@ -154,10 +154,10 @@ namespace FLY.Thick.Blowing.UI.Fix.Client ...@@ -154,10 +154,10 @@ namespace FLY.Thick.Blowing.UI.Fix.Client
} }
BlowingFixProfileService mProfile; BlowingFixProfileServiceClient mProfile;
void Init_Border_Profile() void Init_Border_Profile()
{ {
mProfile = new BlowingFixProfileService(); mProfile = new BlowingFixProfileServiceClient();
FObjBase.FObjSys.Current.Connect_to_Another_OBJSys( FObjBase.FObjSys.Current.Connect_to_Another_OBJSys(
gage.mSysParam.ServerIPEP, mProfile.ID); gage.mSysParam.ServerIPEP, mProfile.ID);
......
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/Page_ProfileBlowing.xaml
View file @ 72dc1b2b
...@@ -3,8 +3,9 @@ ...@@ -3,8 +3,9 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:common="clr-namespace:FLY.Thick.Blowing.Common;assembly=FLY.Thick.Blowing"
mc:Ignorable="d" mc:Ignorable="d"
d:DesignHeight="768" d:DesignWidth="1024" Background="White" d:DesignHeight="1024" d:DesignWidth="1280" Background="White"
Title="Page_Profile" Loaded="Page_Loaded" Unloaded="Page_Unloaded"> Title="Page_Profile" Loaded="Page_Loaded" Unloaded="Page_Unloaded">
<Page.Resources> <Page.Resources>
<ResourceDictionary> <ResourceDictionary>
...@@ -12,10 +13,14 @@ ...@@ -12,10 +13,14 @@
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/Dictionary_MyStyle.xaml"/> <ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/Dictionary_MyStyle.xaml"/>
<ResourceDictionary Source="pack://application:,,,/ThickTcpUiInWindow;component/Converter/Dictionary_MyConv.xaml"/> <ResourceDictionary Source="pack://application:,,,/ThickTcpUiInWindow;component/Converter/Dictionary_MyConv.xaml"/>
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
<common:BlowingFixProfileParam x:Key="param" MMode="Bag"/>
<Geometry x:Key="Geometry_legend">
M1049.886996 1023.827803H91.49417c-50.453812 0-91.49417-39.949776-91.49417-89.026009V89.370404C0 40.29417 41.040359 0.344395 91.49417 0.344395h958.392826c50.453812 0 91.49417 39.949776 91.49417 89.026009v845.43139c0 49.076233-41.040359 89.026009-91.49417 89.026009z m39.203587-934.457399a38.744395 38.744395 0 0 0-39.203587-38.113005H91.49417a38.744395 38.744395 0 0 0-39.203587 38.113005v845.43139c0 1.090583 0.573991 1.95157 0.63139 3.042152l21.869058-31.052915 283.379373-342.959641 360.466367 265.241256 200.896861-176.846637 156.81435 206.349776 12.742601 17.564125V89.370404zM885.840359 438.988341c-46.034081-12.16861-73.241256-58.432287-60.728251-103.260987 12.513004-44.886099 60.039462-71.347085 106.073542-59.178475 46.09148 12.226009 73.298655 58.432287 60.728251 103.318386-12.513004 44.8287-59.982063 71.347085-106.073542 59.121076z
</Geometry>
</ResourceDictionary> </ResourceDictionary>
</Page.Resources> </Page.Resources>
<Grid > <Grid d:DataContext="{StaticResource param}">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="auto" /> <RowDefinition Height="auto" />
<RowDefinition Height="496*" /> <RowDefinition Height="496*" />
...@@ -76,12 +81,33 @@ ...@@ -76,12 +81,33 @@
<Border Background="{StaticResource Color_theme_activity}" Width="150" Margin="0,5,5,5" > <Border Background="{StaticResource Color_theme_activity}" Width="150" Margin="0,5,5,5" >
<TextBlock Style="{StaticResource TextBlockStyle_ItemHeader}" Text="无死区&#x0a;精确计算" FontSize="20"/> <TextBlock Style="{StaticResource TextBlockStyle_ItemHeader}" Text="无死区&#x0a;精确计算" FontSize="20"/>
</Border> </Border>
<StackPanel Orientation="Horizontal" > <StackPanel Orientation="Vertical">
<StackPanel Orientation="Horizontal">
<StackPanel Orientation="Vertical" Margin="5"> <StackPanel Orientation="Vertical" Margin="5">
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="使能" /> <TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="测量模式" />
<ToggleButton x:Name="togglebutton_solveenable" Style="{StaticResource ToggleButtonStyle1}" HorizontalAlignment="Left" IsChecked="{Binding SolveEnable}" /> <ComboBox MinWidth="120" MinHeight="40" HorizontalAlignment="Left">
<ComboBoxItem IsSelected="{Binding MMode, Converter={StaticResource e2bconv}, ConverterParameter={x:Static common:MeasureMode.Edge}}">
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent}" FontSize="32" Text="不解方程"/>
</ComboBoxItem>
<ComboBoxItem IsSelected="{Binding MMode, Converter={StaticResource e2bconv}, ConverterParameter={x:Static common:MeasureMode.Normal}}">
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent}" FontSize="32" Text="测两层"/>
</ComboBoxItem>
<ComboBoxItem IsSelected="{Binding MMode, Converter={StaticResource e2bconv}, ConverterParameter={x:Static common:MeasureMode.Bag}}">
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent}" FontSize="32" Text="测袋"/>
</ComboBoxItem>
</ComboBox>
</StackPanel>
<Button Style="{StaticResource ButtonStyle_empty}" Margin="5" Click="button_legend_Click" >
<Grid Style="{StaticResource GridStyle_ButtonShadow}">
<Rectangle Fill="White" Height="48"/>
<Path Data="{StaticResource Geometry_legend}" Fill="{StaticResource Color_theme_activity}" Stretch="Uniform" Width="60" Height="60"/>
<TextBlock Text="图例" Padding="3,2" Foreground="White" FontWeight="Bold" VerticalAlignment="Bottom" HorizontalAlignment="Center" Background="{StaticResource Color_theme_activity}" FontSize="12"/>
</Grid>
</Button>
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal" Visibility="{Binding IsChecked, ElementName=togglebutton_solveenable, Converter={StaticResource visbilityconv}}">
<StackPanel Orientation="Horizontal" Visibility="{Binding MMode, Converter={StaticResource e2visconv_collapsed}, ConverterParameter={x:Static common:MeasureMode.Normal}}">
<StackPanel Orientation="Vertical" Margin="5"> <StackPanel Orientation="Vertical" Margin="5">
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="膜宽" /> <TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="膜宽" />
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
...@@ -97,8 +123,42 @@ ...@@ -97,8 +123,42 @@
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
<StackPanel Orientation="Vertical" Visibility="{Binding MMode, Converter={StaticResource e2visconv_collapsed}, ConverterParameter={x:Static common:MeasureMode.Bag}}">
<StackPanel Orientation="Horizontal">
<StackPanel Orientation="Vertical" Margin="5">
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="膜宽" />
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource ResourceKey=TextBoxStyle_FieldContent}" Text="{Binding FilmWidth}" />
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent_mm}" Text="mm" />
</StackPanel>
</StackPanel>
<StackPanel Orientation="Vertical" Margin="5">
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="探头离膜边" />
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource ResourceKey=TextBoxStyle_FieldContent}" Text="{Binding FilmPosH}" />
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent_mm}" Text="mm" />
</StackPanel>
</StackPanel>
</StackPanel>
<StackPanel Orientation="Horizontal">
<StackPanel Orientation="Vertical" Margin="5">
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="探头下折边" />
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource ResourceKey=TextBoxStyle_FieldContent}" Text="{Binding BagFold0}" />
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent_mm}" Text="mm" />
</StackPanel>
</StackPanel> </StackPanel>
<StackPanel Orientation="Vertical" Margin="5">
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="另一边折边" />
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource ResourceKey=TextBoxStyle_FieldContent}" Text="{Binding BagFold1}" />
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent_mm}" Text="mm" />
</StackPanel>
</StackPanel>
</StackPanel>
</StackPanel>
</StackPanel>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
<ListBox Name="listview_profile" Margin="5" MinWidth="400" Grid.Column="1" Background="{StaticResource Background_Title}"> <ListBox Name="listview_profile" Margin="5" MinWidth="400" Grid.Column="1" Background="{StaticResource Background_Title}">
......
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/Page_ProfileBlowing.xaml.cs
View file @ 72dc1b2b
...@@ -30,67 +30,22 @@ namespace FLY.Thick.Blowing.UI.Fix.Client ...@@ -30,67 +30,22 @@ namespace FLY.Thick.Blowing.UI.Fix.Client
/// </summary> /// </summary>
public partial class Page_ProfileBlowing : Page, INotifyPropertyChanged public partial class Page_ProfileBlowing : Page, INotifyPropertyChanged
{ {
private double alarmpercent = 3; public double AlarmPercent { get; set; } = 3;
public double AlarmPercent
{
get
{
return alarmpercent;
}
set
{
if (alarmpercent != value)
{
alarmpercent = value;
NotifyPropertyChanged("AlarmPercent");
}
}
}
private double alarm = 3;
public double Alarm
{
get
{
return alarm;
}
set
{
if (alarm != value)
{
alarm = value;
NotifyPropertyChanged("Alarm");
}
}
}
private double target = 30;
public double Target
{
get
{
return target;
}
set
{
if (target != value)
{
target = value;
NotifyPropertyChanged("Target");
}
}
}
public double Alarm { get; set; } = 3;
public double Target { get; set; } = 30;
public ObservableCollection<string> mList = new ObservableCollection<string>(); public ObservableCollection<string> mList = new ObservableCollection<string>();
public BlowingFixProfileService mProfile = null; public BlowingFixProfileServiceClient mProfile = null;
bool NeedKeepContext = false;
public Page_ProfileBlowing() public Page_ProfileBlowing()
{ {
InitializeComponent(); InitializeComponent();
} }
public void Init(IPEndPoint serverep) public void Init(IPEndPoint serverep)
{ {
mProfile = new BlowingFixProfileService(); mProfile = new BlowingFixProfileServiceClient();
FObjBase.FObjSys.Current.Connect_to_Another_OBJSys( FObjBase.FObjSys.Current.Connect_to_Another_OBJSys(
serverep, mProfile.ID); serverep, mProfile.ID);
...@@ -157,11 +112,6 @@ namespace FLY.Thick.Blowing.UI.Fix.Client ...@@ -157,11 +112,6 @@ namespace FLY.Thick.Blowing.UI.Fix.Client
private void Page_Loaded(object sender, RoutedEventArgs e) private void Page_Loaded(object sender, RoutedEventArgs e)
{ {
if (NeedKeepContext)
{
NeedKeepContext = false;
return;
}
} }
private void button_read_Click(object sender, RoutedEventArgs e) private void button_read_Click(object sender, RoutedEventArgs e)
...@@ -189,7 +139,11 @@ namespace FLY.Thick.Blowing.UI.Fix.Client ...@@ -189,7 +139,11 @@ namespace FLY.Thick.Blowing.UI.Fix.Client
mProfile.Param.PropertyChanged += handler_profile; mProfile.Param.PropertyChanged += handler_profile;
//有效性检查 //有效性检查
if (mProfile.Param.SolveEnable) switch (mProfile.Param.MMode)
{
case MeasureMode.Edge:
break;
case MeasureMode.Normal:
{ {
if (mProfile.Param.FilmWidth < 500) if (mProfile.Param.FilmWidth < 500)
{ {
...@@ -201,11 +155,47 @@ namespace FLY.Thick.Blowing.UI.Fix.Client ...@@ -201,11 +155,47 @@ namespace FLY.Thick.Blowing.UI.Fix.Client
FLY.ControlLibrary.Window_WarningTip.Show("参数出错", "探头位置>(膜宽/3) 异常"); FLY.ControlLibrary.Window_WarningTip.Show("参数出错", "探头位置>(膜宽/3) 异常");
return; return;
} }
else if (mProfile.Param.FilmPosH < 0 ) else if (mProfile.Param.FilmPosH < 0)
{ {
FLY.ControlLibrary.Window_WarningTip.Show("参数出错", "探头位置<0 异常"); FLY.ControlLibrary.Window_WarningTip.Show("参数出错", "探头位置<0 异常");
return; return;
} }
}break;
default:
//case MeasureMode.Bag:
{
if (mProfile.Param.FilmWidth < 500)
{
FLY.ControlLibrary.Window_WarningTip.Show("参数出错", "膜宽<500mm 异常");
return;
}
else if (mProfile.Param.FilmPosH > mProfile.Param.FilmWidth / 3)
{
FLY.ControlLibrary.Window_WarningTip.Show("参数出错", "探头位置>(膜宽/3) 异常");
return;
}
else if (mProfile.Param.FilmPosH < 0)
{
FLY.ControlLibrary.Window_WarningTip.Show("参数出错", "探头位置<0 异常");
return;
}
else if (mProfile.Param.BagFold0 < mProfile.Param.FilmPosH)
{
FLY.ControlLibrary.Window_WarningTip.Show("参数出错", "探头下的折边 < 探头位置");
return;
}
else if (mProfile.Param.BagFold1 < mProfile.Param.FilmPosH)
{
FLY.ControlLibrary.Window_WarningTip.Show("参数出错", "另一边的折边 < 探头位置");
return;
}
else if (mProfile.Param.FilmWidth < (mProfile.Param.BagFold0 + mProfile.Param.BagFold1))
{
FLY.ControlLibrary.Window_WarningTip.Show("参数出错", "折边 >(膜宽/2) 异常");
return;
}
}
break;
} }
if (mProfile.Param.Target <= 0) if (mProfile.Param.Target <= 0)
...@@ -259,22 +249,21 @@ namespace FLY.Thick.Blowing.UI.Fix.Client ...@@ -259,22 +249,21 @@ namespace FLY.Thick.Blowing.UI.Fix.Client
private void Page_Unloaded(object sender, RoutedEventArgs e) private void Page_Unloaded(object sender, RoutedEventArgs e)
{ {
if (NeedKeepContext)
return;
mProfile.Dispose(); mProfile.Dispose();
} }
#region INotifyPropertyChanged 成员 #region INotifyPropertyChanged 成员
public event PropertyChangedEventHandler PropertyChanged; public event PropertyChangedEventHandler PropertyChanged;
protected void NotifyPropertyChanged(string propertyname)
{
if (PropertyChanged != null)
{
PropertyChanged.Invoke(this, new PropertyChangedEventArgs(propertyname));
}
}
#endregion #endregion
private void button_legend_Click(object sender, RoutedEventArgs e)
{
Window_ProfileLegend w = new Window_ProfileLegend();
w.DataContext = mProfile.Param;
w.Owner = FLY.ControlLibrary.COMMON.GetWindow(this);
w.ShowDialog();
}
} }
} }
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/Window_ProfileLegend.xaml 0 → 100644
View file @ 72dc1b2b
<flyctrllib:WindowBigClose x:Class="FLY.Thick.Blowing.UI.Fix.Client.Window_ProfileLegend"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:FLY.IBC.UI.Client"
xmlns:flyctrllib="clr-namespace:FLY.ControlLibrary;assembly=FLY.ControlLibrary"
xmlns:common="clr-namespace:FLY.Thick.Blowing.Common;assembly=FLY.Thick.Blowing"
mc:Ignorable="d"
Title="Window_ProfileLegend" SizeToContent="WidthAndHeight" >
<Window.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/Dictionary_MyStyle.xaml"/>
<ResourceDictionary Source="pack://application:,,,/ThickTcpUiInWindow;component/Converter/Dictionary_MyConv.xaml"/>
</ResourceDictionary.MergedDictionaries>
<common:BlowingFixProfileParam x:Key="param" MMode="Bag"/>
</ResourceDictionary>
</Window.Resources>
<Grid Width="500" d:DataContext="{StaticResource param}">
<Image Margin="10" Stretch="Uniform" >
<Image.Style>
<Style TargetType="Image">
<Setter Property="Source" Value="image/normal.jpg"/>
<Style.Triggers>
<DataTrigger Binding="{Binding MMode}" Value="Bag">
<Setter Property="Source" Value="image/bag.jpg"/>
</DataTrigger>
</Style.Triggers>
</Style>
</Image.Style>
</Image>
</Grid>
</flyctrllib:WindowBigClose>
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/Window_ProfileLegend.xaml.cs 0 → 100644
View file @ 72dc1b2b
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.Shapes;
namespace FLY.Thick.Blowing.UI.Fix.Client
{
/// <summary>
/// Window_ProfileLegend.xaml 的交互逻辑
/// </summary>
public partial class Window_ProfileLegend : FLY.ControlLibrary.WindowBigClose
{
public Window_ProfileLegend()
{
InitializeComponent();
}
}
}
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/packages.config 0 → 100644
View file @ 72dc1b2b
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Fody" version="3.2.13" targetFramework="net40" developmentDependency="true" />
<package id="PropertyChanged2.Fody" version="2.5.13" targetFramework="net40" />
</packages>
\ No newline at end of file
Project.FLY.Thick.Blowing/FLY.Thick.Blowing/Client/BlowingFixProfileService.cs → Project.FLY.Thick.Blowing/FLY.Thick.Blowing/Client/BlowingFixProfileServiceClient.cs
View file @ 72dc1b2b
...@@ -11,16 +11,16 @@ using System.Text; ...@@ -11,16 +11,16 @@ using System.Text;
namespace FLY.Thick.Blowing.Client namespace FLY.Thick.Blowing.Client
{ {
public class BlowingFixProfileService : FObj, IBlowingFixProfileService public class BlowingFixProfileServiceClient : FObj, IBlowingFixProfileService
{ {
IFConn mConn; IFConn mConn;
UInt32 mServerID; UInt32 mServerID;
public BlowingFixProfileService() public BlowingFixProfileServiceClient()
{ {
mServerID = FLY.Thick.Blowing.OBJ_INTERFACE.OBJ_INTERFACE_ID.BFPROFILE_ID; mServerID = FLY.Thick.Blowing.OBJ_INTERFACE.OBJ_INTERFACE_ID.BFPROFILE_ID;
} }
public BlowingFixProfileService(UInt32 id) public BlowingFixProfileServiceClient(UInt32 id)
{ {
mServerID = id; mServerID = id;
} }
...@@ -68,10 +68,10 @@ namespace FLY.Thick.Blowing.Client ...@@ -68,10 +68,10 @@ namespace FLY.Thick.Blowing.Client
/// <param name="productname"></param> /// <param name="productname"></param>
public void Del(string productname) public void Del(string productname)
{ {
Pack_String p = new Pack_String(); string json = JsonConvert.SerializeObject(productname);
p.data = productname;
CurrObjSys.CallFunctionEx(mConn, mServerID, ID, CurrObjSys.CallFunctionEx(mConn, mServerID, ID,
BLOWINGFIX_PROFILE_OBJ_INTERFACE.CALL_DEL, p.ToBytes()); BLOWINGFIX_PROFILE_OBJ_INTERFACE.CALL_DEL, Misc.Converter.StringToBytes(json));
} }
/// <summary> /// <summary>
...@@ -82,9 +82,11 @@ namespace FLY.Thick.Blowing.Client ...@@ -82,9 +82,11 @@ namespace FLY.Thick.Blowing.Client
/// <param name="AsyncState"></param> /// <param name="AsyncState"></param>
public void Read(string productname, AsyncCBHandler AsyncDelegate, object AsyncState) public void Read(string productname, AsyncCBHandler AsyncDelegate, object AsyncState)
{ {
string json = JsonConvert.SerializeObject(productname);
CurrObjSys.CallFunctionEx(mConn, mServerID, ID, CurrObjSys.CallFunctionEx(mConn, mServerID, ID,
BLOWINGFIX_PROFILE_OBJ_INTERFACE.CALL_READ, BLOWINGFIX_PROFILE_OBJ_INTERFACE.CALL_READ,
new Pack_String() { data = productname }.ToBytes(), Misc.Converter.StringToBytes(json),
AsyncDelegate, AsyncState); AsyncDelegate, AsyncState);
} }
#endregion #endregion
...@@ -140,10 +142,9 @@ namespace FLY.Thick.Blowing.Client ...@@ -140,10 +142,9 @@ namespace FLY.Thick.Blowing.Client
{ {
case BLOWINGFIX_PROFILE_OBJ_INTERFACE.CALL_GETLIST: case BLOWINGFIX_PROFILE_OBJ_INTERFACE.CALL_GETLIST:
{ {
Pack_StringList p = new Pack_StringList(); string json = Misc.Converter.BytesToString(retdata);
if (!p.TryParse(retdata)) List<string> p = JsonConvert.DeserializeObject<List<string>>(json);
return; ((AsyncCBHandler)AsyncDelegate)(AsyncState, p);
((AsyncCBHandler)AsyncDelegate)(AsyncState, p.list);
} }
break; break;
case BLOWINGFIX_PROFILE_OBJ_INTERFACE.CALL_READ: case BLOWINGFIX_PROFILE_OBJ_INTERFACE.CALL_READ:
......
Project.FLY.Thick.Blowing/FLY.Thick.Blowing/Common/BlowingFixProfileParam.cs
View file @ 72dc1b2b
...@@ -36,9 +36,9 @@ namespace FLY.Thick.Blowing.Common ...@@ -36,9 +36,9 @@ namespace FLY.Thick.Blowing.Common
#endregion #endregion
#region 吹膜定点解方程用 #region 吹膜定点解方程用
/// <summary> /// <summary>
/// 使能定点解方程 /// 测量模式
/// </summary> /// </summary>
public bool SolveEnable { get; set; } = false; public MeasureMode MMode { get; set; } = MeasureMode.Edge;
/// <summary> /// <summary>
/// 膜宽 单位 mm， 收卷时，切膜前，测量的宽度 /// 膜宽 单位 mm， 收卷时，切膜前，测量的宽度
...@@ -50,11 +50,6 @@ namespace FLY.Thick.Blowing.Common ...@@ -50,11 +50,6 @@ namespace FLY.Thick.Blowing.Common
/// </summary> /// </summary>
public int FilmPosH { get; set; } = 70; public int FilmPosH { get; set; } = 70;
/// <summary>
/// 袋测量模式
/// </summary>
public bool IsBag { get; set; } = false;
/// <summary> /// <summary>
/// 探头测量位置，袋折叠的宽度 单位 mm /// 探头测量位置，袋折叠的宽度 单位 mm
/// </summary> /// </summary>
...@@ -69,4 +64,23 @@ namespace FLY.Thick.Blowing.Common ...@@ -69,4 +64,23 @@ namespace FLY.Thick.Blowing.Common
public event PropertyChangedEventHandler PropertyChanged; public event PropertyChangedEventHandler PropertyChanged;
} }
/// <summary>
/// 测量模式
/// </summary>
public enum MeasureMode
{
/// <summary>
/// 不解方程，探头距离膜边 0mm
/// </summary>
Edge,
/// <summary>
/// 一般模型，探头测双层
/// </summary>
Normal,
/// <summary>
/// 垃圾袋，两边凹进去，探头测4层
/// </summary>
Bag
}
} }
Project.FLY.Thick.Blowing/FLY.Thick.Blowing/FLY.Thick.Blowing.csproj
View file @ 72dc1b2b
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="Client\BlowingDetectServiceClient.cs" /> <Compile Include="Client\BlowingDetectServiceClient.cs" />
<Compile Include="Client\BlowingFixProfileService.cs" /> <Compile Include="Client\BlowingFixProfileServiceClient.cs" />
<Compile Include="Client\BlowingFixServiceClient.cs" /> <Compile Include="Client\BlowingFixServiceClient.cs" />
<Compile Include="Client\BlowingServiceClient.cs" /> <Compile Include="Client\BlowingServiceClient.cs" />
<Compile Include="Common\BlowingFixProfileParam.cs" /> <Compile Include="Common\BlowingFixProfileParam.cs" />
......
Project.FLY.Thick.Blowing/FLY.Thick.Blowing/Server.OBJProxy/BlowingFixProfile_OBJProxy.cs
View file @ 72dc1b2b
...@@ -82,9 +82,7 @@ namespace FLY.Thick.Blowing.Server.OBJProxy ...@@ -82,9 +82,7 @@ namespace FLY.Thick.Blowing.Server.OBJProxy
new AsyncCBHandler(delegate (object AsyncState, object retdata) new AsyncCBHandler(delegate (object AsyncState, object retdata)
{ {
ConnContext context = (ConnContext)AsyncState; ConnContext context = (ConnContext)AsyncState;
List<string> ss = (List<string>)retdata; string json = JsonConvert.SerializeObject(retdata);
Pack_StringList p = new Pack_StringList();
p.list = (List<string>)retdata;
CurrObjSys.PushCallFunctionEx( CurrObjSys.PushCallFunctionEx(
context.from, context.from,
...@@ -92,30 +90,28 @@ namespace FLY.Thick.Blowing.Server.OBJProxy ...@@ -92,30 +90,28 @@ namespace FLY.Thick.Blowing.Server.OBJProxy
ID, ID,
context.magic, context.magic,
BLOWINGFIX_PROFILE_OBJ_INTERFACE.CALL_GETLIST, BLOWINGFIX_PROFILE_OBJ_INTERFACE.CALL_GETLIST,
p.ToBytes()); Misc.Converter.StringToBytes(json));
}), new ConnContext(from, srcid, magic)); }), new ConnContext(from, srcid, magic));
} }
break; break;
case BLOWINGFIX_PROFILE_OBJ_INTERFACE.CALL_DEL: case BLOWINGFIX_PROFILE_OBJ_INTERFACE.CALL_DEL:
{ {
Pack_String p = new Pack_String(); string json = Misc.Converter.BytesToString(infodata);
if (!p.TryParse(infodata)) string p = JsonConvert.DeserializeObject<string>(json);
return; mProfile.Del(p);
mProfile.Del(p.data);
} }
break; break;
case BLOWINGFIX_PROFILE_OBJ_INTERFACE.CALL_READ: case BLOWINGFIX_PROFILE_OBJ_INTERFACE.CALL_READ:
{ {
Pack_String p = new Pack_String(); string json = Misc.Converter.BytesToString(infodata);
if (!p.TryParse(infodata)) string p = JsonConvert.DeserializeObject<string>(json);
return;
mProfile.Read( mProfile.Read(
p.data, p,
new AsyncCBHandler(delegate (object AsyncState, object retdata) new AsyncCBHandler(delegate (object AsyncState, object retdata)
{ {
ConnContext context = (ConnContext)AsyncState; ConnContext context = (ConnContext)AsyncState;
string json = JsonConvert.SerializeObject(retdata); json = JsonConvert.SerializeObject(retdata);
CurrObjSys.PushCallFunctionEx( CurrObjSys.PushCallFunctionEx(
context.from, context.from,
......
Project.FLY.Thick.Blowing/FLY.Thick.Blowing/Server/BlowingFixProfile.cs
View file @ 72dc1b2b
...@@ -11,14 +11,7 @@ namespace FLY.Thick.Blowing.Server ...@@ -11,14 +11,7 @@ namespace FLY.Thick.Blowing.Server
{ {
public class BlowingFixProfile: IBlowingFixProfileService public class BlowingFixProfile: IBlowingFixProfileService
{ {
BlowingFixProfileParam param = new BlowingFixProfileParam(); public BlowingFixProfileParam Param { get; } = new BlowingFixProfileParam();
public BlowingFixProfileParam Param
{
get
{
return param;
}
}
public BlowingFixProfile() public BlowingFixProfile()
{ {
......
Project.FLY.Thick.Blowing/FLY.Thick.Blowing/Server/GM_BlowingFix.cs
View file @ 72dc1b2b
...@@ -16,6 +16,8 @@ using FLY.Thick.Base.Server; ...@@ -16,6 +16,8 @@ using FLY.Thick.Base.Server;
using FLY.Thick.Blowing.IService; using FLY.Thick.Blowing.IService;
using MathNet.Numerics.LinearAlgebra.Double; using MathNet.Numerics.LinearAlgebra.Double;
using FObjBase; using FObjBase;
using Newtonsoft.Json;
using FLY.Thick.Blowing.Common;
namespace FLY.Thick.Blowing.Server namespace FLY.Thick.Blowing.Server
{ {
...@@ -57,45 +59,16 @@ namespace FLY.Thick.Blowing.Server ...@@ -57,45 +59,16 @@ namespace FLY.Thick.Blowing.Server
#region 分区设定 #region 分区设定
private int channelcnt = 44;
/// <summary> /// <summary>
/// 加热通道数 /// 加热通道数
/// </summary> /// </summary>
public int ChannelCnt public int ChannelCnt { get; set; } = 44;
{
get {
return channelcnt;
}
set {
if (channelcnt != value)
{
channelcnt = value;
NotifyPropertyChanged("ChannelCnt");
NotifyPropertyChanged("NBolts");
}
}
}
private int bpc=2;
/// <summary> /// <summary>
/// 分区数/加热通道数 /// 分区数/加热通道数
/// </summary> /// </summary>
public int BPC public int BPC { get; set; } = 2;
{
get
{
return bpc;
}
set {
if (bpc != value)
{
bpc = value;
NotifyPropertyChanged("BPC");
NotifyPropertyChanged("NBolts");
}
}
}
/// <summary> /// <summary>
/// 风环螺丝数 /// 风环螺丝数
...@@ -106,45 +79,20 @@ namespace FLY.Thick.Blowing.Server ...@@ -106,45 +79,20 @@ namespace FLY.Thick.Blowing.Server
} }
private int orgboltno;
/// <summary> /// <summary>
/// 复位时，探头测量的位置对应分区号 /// 复位时，探头测量的位置对应分区号
/// </summary> /// </summary>
public int OrgBoltNo public int OrgBoltNo { get; set; } = 1;
{
get { return orgboltno; }
set {
if (orgboltno != value)
{
orgboltno = value;
NotifyPropertyChanged("OrgBoltNo");
}
}
}
/// <summary> /// <summary>
/// 第1个螺丝号 /// 第1个螺丝号
/// </summary> /// </summary>
public int BoltNo1st=1; public int BoltNo1st=1;
private bool isUsedMap = false;
/// <summary> /// <summary>
/// 使用分区表 /// 使用分区表
/// </summary> /// </summary>
public bool IsUsedMap { public bool IsUsedMap { get; set; }
get {
return isUsedMap;
}
set {
if (isUsedMap != value)
{
isUsedMap = value;
NotifyPropertyChanged("IsUsedMap");
}
}
}
private List<BoltMapCell> map = new List<BoltMapCell>(); private List<BoltMapCell> map = new List<BoltMapCell>();
/// <summary> /// <summary>
...@@ -181,72 +129,35 @@ namespace FLY.Thick.Blowing.Server ...@@ -181,72 +129,35 @@ namespace FLY.Thick.Blowing.Server
#endregion #endregion
#region 膜长 计算 #region 膜长 计算
/// <summary>
private double flrange; /// 膜长查找范围
public double FLRange /// </summary>
{ public double FLRange { get; set; }
get { return flrange; } /// <summary>
set { /// 计算膜长
if (flrange != value) /// </summary>
{
flrange = value;
NotifyPropertyChanged("FLRange");
}
}
}
public void CalFilmLength() public void CalFilmLength()
{ {
mCalFilmLen.Start(); mCalFilmLen.Start();
} }
#region 计算结果 #region 计算结果
private double maxR;
public double MaxR /// <summary>
{ /// 最大相关性
get { return maxR; } /// </summary>
protected set public double MaxR { get; protected set; }
{
if (maxR != value)
{
maxR = value;
NotifyPropertyChanged("MaxR");
}
}
}
private double maxRFilmLength;//最大相识度对应的膜长度
/// <summary> /// <summary>
/// 最大相识度对应的膜长度 /// 最大相识度对应的膜长度
/// </summary> /// </summary>
public double MaxRFilmLength public double MaxRFilmLength { get; protected set; }
{
get { return maxRFilmLength; }
protected set
{
if (maxRFilmLength != value)
{
maxRFilmLength = value;
NotifyPropertyChanged("MaxRFilmLength");
}
}
}
private string calstate="null";
/// <summary> /// <summary>
/// 计算膜长状态 /// 计算膜长状态
/// </summary> /// </summary>
public string CalState public string CalState { get; protected set; } = "null";
{
get { return calstate; }
protected set
{
if (calstate != value)
{
calstate = value;
NotifyPropertyChanged("CalState");
}
}
}
#endregion #endregion
#endregion #endregion
...@@ -267,22 +178,10 @@ namespace FLY.Thick.Blowing.Server ...@@ -267,22 +178,10 @@ namespace FLY.Thick.Blowing.Server
} }
} }
RenZiJiaFixEPCType epctype = RenZiJiaFixEPCType.Null; /// <summary>
public RenZiJiaFixEPCType EPCType /// 温修对位硬件类型
{ /// </summary>
get public RenZiJiaFixEPCType EPCType { get; set; }
{
return epctype;
}
set
{
if (epctype != value)
{
epctype = value;
NotifyPropertyChanged("EPCType");
}
}
}
/// <summary> /// <summary>
/// 采样时间， 默认2s /// 采样时间， 默认2s
/// </summary> /// </summary>
...@@ -354,6 +253,9 @@ namespace FLY.Thick.Blowing.Server ...@@ -354,6 +253,9 @@ namespace FLY.Thick.Blowing.Server
#endregion #endregion
/// <summary>
/// 应用
/// </summary>
public void Apply() public void Apply()
{ {
...@@ -745,10 +647,12 @@ namespace FLY.Thick.Blowing.Server ...@@ -745,10 +647,12 @@ namespace FLY.Thick.Blowing.Server
#endregion #endregion
#region 吹膜定点解方程用 #region 吹膜定点解方程用
/// <summary> /// <summary>
/// 使能定点解方程 /// 测量模式， 决定是否解方程
/// </summary> /// </summary>
public bool SolveEnable { get; set; } = false; public MeasureMode MMode { get; set; } = MeasureMode.Edge;
/// <summary> /// <summary>
/// 膜宽 单位 mm /// 膜宽 单位 mm
/// </summary> /// </summary>
...@@ -760,11 +664,6 @@ namespace FLY.Thick.Blowing.Server ...@@ -760,11 +664,6 @@ namespace FLY.Thick.Blowing.Server
/// </summary> /// </summary>
public int FilmPosH { get; set; } = 70; public int FilmPosH { get; set; } = 70;
/// <summary>
/// 袋测量模式
/// </summary>
public bool IsBag { get; set; } = false;
/// <summary> /// <summary>
/// 探头测量位置，袋折叠的宽度 单位 mm /// 探头测量位置，袋折叠的宽度 单位 mm
/// </summary> /// </summary>
...@@ -803,14 +702,12 @@ namespace FLY.Thick.Blowing.Server ...@@ -803,14 +702,12 @@ namespace FLY.Thick.Blowing.Server
/// 用于修正AB值，温修AD后，重新计算thick。 /// 用于修正AB值，温修AD后，重新计算thick。
/// </summary> /// </summary>
public int ad=Misc.MyBase.NULL_VALUE; public int ad=Misc.MyBase.NULL_VALUE;
/// <summary> /// <summary>
/// 上面的膜对应的角度 0~360° /// 探头测量 膜对位的角度 0~360°
/// </summary>
public double angle0;
/// <summary>
/// 下面的膜对应的角度 0~360°
/// </summary> /// </summary>
public double angle1; public List<double> angles = new List<double>();
/// <summary> /// <summary>
/// 人字架正向旋转 /// 人字架正向旋转
/// </summary> /// </summary>
...@@ -829,8 +726,17 @@ namespace FLY.Thick.Blowing.Server ...@@ -829,8 +726,17 @@ namespace FLY.Thick.Blowing.Server
public bool inCV; public bool inCV;
public override string ToString() public override string ToString()
{ {
return dt.Minute.ToString() + ":" + (dt.Second + dt.Millisecond / 1000.0).ToString("N4") + " " + string t = dt.Minute.ToString() + ":" + (dt.Second + dt.Millisecond / 1000.0).ToString("N4");
"angle=(" + angle0.ToString("N1") + "," + angle1.ToString("N1") + ")"; string json = "";
foreach(double d in angles)
{
if (!string.IsNullOrEmpty(json))
{
json += ",";
}
json += d.ToString("F1");
}
return t + " angles=[" + json + "]";
} }
public ADCell Clone() public ADCell Clone()
{ {
...@@ -868,12 +774,14 @@ namespace FLY.Thick.Blowing.Server ...@@ -868,12 +774,14 @@ namespace FLY.Thick.Blowing.Server
for (i = 0; i < n; i++) ai[i] = 0; for (i = 0; i < n; i++) ai[i] = 0;
y = 0; y = 0;
} }
public bool AddData(int idx1, int idx2, int thick) public bool AddData(IEnumerable<int> idxs, int thick)
{ {
if ((idx1 < 0) || (idx1 >= n)) return false; foreach(int idx in idxs)
if ((idx2 < 0) || (idx2 >= n)) return false; if ((idx < 0) || (idx >= n)) return false;
ai[idx1]++;
ai[idx2]++; foreach(int idx in idxs)
ai[idx]++;
y += thick; y += thick;
return true; return true;
} }
...@@ -927,32 +835,7 @@ namespace FLY.Thick.Blowing.Server ...@@ -927,32 +835,7 @@ namespace FLY.Thick.Blowing.Server
ClearFrameValue(i); ClearFrameValue(i);
} }
} }
int index_last = -1;
public void SetFrameValue(int index,int value,DateTime dt)
{
int nbolts = frame.Count();
if (index >= nbolts)
return;//异常
else if (index < 0)
return;//异常
else if (!Misc.MyBase.ISVALIDATA(value))
return;//异常
if (index_last != index)
{
index_last = index;
HasChanged = true;
frame_cnt = 0;
frame_sum = 0;
}
frame_sum += value;
frame_cnt++;
frame[index] = frame_sum / frame_cnt;
}
void ClearFrameValue(int index) void ClearFrameValue(int index)
{ {
frame[index] = Misc.MyBase.NULL_VALUE; frame[index] = Misc.MyBase.NULL_VALUE;
...@@ -1090,43 +973,66 @@ namespace FLY.Thick.Blowing.Server ...@@ -1090,43 +973,66 @@ namespace FLY.Thick.Blowing.Server
SolveFormula(); SolveFormula();
} }
} }
int index_last = -1;
public void SetFrameValue(int index, int value, DateTime dt)
{
int nbolts = frame.Count();
if (index >= nbolts)
return;//异常
else if (index < 0)
return;//异常
else if (!Misc.MyBase.ISVALIDATA(value))
return;//异常
if (index_last != index)
{
index_last = index;
HasChanged = true;
frame_cnt = 0;
frame_sum = 0;
}
frame_sum += value;
frame_cnt++;
frame[index] = frame_sum / frame_cnt;
}
/// <summary> /// <summary>
/// 解方程方式更新 frame /// 解方程方式更新 frame
/// </summary> /// </summary>
/// <param name="index0"></param> /// <param name="indexs"></param>
/// <param name="index1"></param>
/// <param name="value"></param> /// <param name="value"></param>
/// <param name="dt"></param> /// <param name="dt"></param>
public void SetFrameValue(int index0, int index1, int value, DateTime dt) public void SetFrameValue(IEnumerable<int> indexs, int value, DateTime dt)
{ {
int nbolts = frame.Count(); int nbolts = frame.Count();
foreach (int index in indexs)
if (index0 >= nbolts) {
return;//异常 if (index >= nbolts)
else if (index0 < 0)
return;//异常
else if (index1 >= nbolts)
return;//异常
else if (index1 < 0)
return;//异常 return;//异常
else if (!Misc.MyBase.ISVALIDATA(value)) else if (index < 0)
return;//异常 return;//异常
}
if (!Misc.MyBase.ISVALIDATA(value))
return;//异常
Formula fm = new Formula(nbolts); Formula fm = new Formula(nbolts);
fm.AddData(index0, index1, value); fm.AddData(indexs, value);
mFormulas.Add(fm); mFormulas.Add(fm);
appeared[index0] = true;
appeared[index1] = true;
foreach (int index in indexs)
appeared[index] = true;
canSolve = true; canSolve = true;
//5秒解一次方程 //5秒解一次方程
if ((index_last != index0) && ((dt - last_solvedt) >= TimeSpan.FromSeconds(5))) if ((index_last != indexs.First()) && ((dt - last_solvedt) >= TimeSpan.FromSeconds(5)))
{ {
index_last = index0; index_last = indexs.First();
last_solvedt = dt; last_solvedt = dt;
isTimeToSolve = true; isTimeToSolve = true;
} }
...@@ -1631,7 +1537,6 @@ namespace FLY.Thick.Blowing.Server ...@@ -1631,7 +1537,6 @@ namespace FLY.Thick.Blowing.Server
void OnPoll_UpdateADList() void OnPoll_UpdateADList()
{ {
...@@ -1644,35 +1549,132 @@ namespace FLY.Thick.Blowing.Server ...@@ -1644,35 +1549,132 @@ namespace FLY.Thick.Blowing.Server
for (int i = adlist_index; i < mADList.Count; i++) for (int i = adlist_index; i < mADList.Count; i++)
{ {
BlowingDetect.FilmInfo filminfo;
mADListToDoNo = mADList.Index2No(i); mADListToDoNo = mADList.Index2No(i);
double filmWidth = (SolveEnable) ? FilmWidth / 1000.0 : 2.3;
double filmPosH = (SolveEnable) ? FilmPosH / 1000.0 : 0;
int ret = mPDetect.GetFilmInfo(out filminfo, mADList[i].dt, filmWidth, filmPosH); //被测膜模式选择
if (ret == 1)//发生在未来 switch (MMode)
{
case MeasureMode.Edge:
{ {
if (!OnPoll_UpdateADList_Edge(i))
return; return;
} }
if (filminfo == null)//异常，FilmPosH 错误 break;
case MeasureMode.Normal:
{ {
if (!OnPoll_UpdateADList_Normal(i))
return; return;
} }
if (mADListToDoNo != mADList.Index2No(i))//触发了事件 break;
default:
//case MeasureMode.Bag:
{ {
if (!OnPoll_UpdateADList_Bag(i))
return; return;
} }
ADCell adcell = mADList[i]; break;
adcell.angle0 = filminfo.angle1; }
adcell.angle1 = filminfo.angle2; }
mADListToDoNo = mADList.Index2No(mADList.Count);
}
#region 不同测量模式的ADList数据更新
bool OnPoll_UpdateADList_Edge(int idx)
{
BlowingDetect.FilmInfo filminfo;
int ret = mPDetect.GetFilmInfo(out filminfo, mADList[idx].dt, 2.3, 0);
if (ret == 1)//发生在未来
{
return false;
}
if (filminfo == null)//异常，FilmPosH 错误
{
return false;
}
if (mADListToDoNo != mADList.Index2No(idx))//触发了事件
{
return false;
}
ADCell adcell = mADList[idx];
adcell.angles.Add(filminfo.angle1);
adcell.angles.Add(filminfo.angle2);
adcell.direction = filminfo.direction; adcell.direction = filminfo.direction;
adcell.velocity = filminfo.filmVelocity; adcell.velocity = filminfo.filmVelocity;
adcell.rotationCnt = filminfo.rotationCnt; adcell.rotationCnt = filminfo.rotationCnt;
adcell.inCV = filminfo.inCV; adcell.inCV = filminfo.inCV;
return true;
} }
mADListToDoNo = mADList.Index2No(mADList.Count); bool OnPoll_UpdateADList_Normal(int idx)
{
BlowingDetect.FilmInfo filminfo;
int ret = mPDetect.GetFilmInfo(out filminfo, mADList[idx].dt, FilmWidth, FilmPosH);
if (ret == 1)//发生在未来
{
return false;
}
if (filminfo == null)//异常，FilmPosH 错误
{
return false;
}
if (mADListToDoNo != mADList.Index2No(idx))//触发了事件
{
return false;
}
ADCell adcell = mADList[idx];
adcell.angles.Add(filminfo.angle1);
adcell.angles.Add(filminfo.angle2);
adcell.direction = filminfo.direction;
adcell.velocity = filminfo.filmVelocity;
adcell.rotationCnt = filminfo.rotationCnt;
adcell.inCV = filminfo.inCV;
return true;
}
bool OnPoll_UpdateADList_Bag(int idx)
{
double filmWidth = FilmWidth + BagFold0 + BagFold1;
//最内2层
BlowingDetect.FilmInfo filminfo0;
double filmPosH0 = BagFold0 - FilmPosH;
int ret = mPDetect.GetFilmInfo(out filminfo0, mADList[idx].dt, filmWidth, filmPosH0);
if (ret == 1)//发生在未来
{
return false;
} }
if (filminfo0 == null)//异常，FilmPosH 错误
{
return false;
}
if (mADListToDoNo != mADList.Index2No(idx))//触发了事件
{
return false;
}
//最外2层
BlowingDetect.FilmInfo filminfo1;
double filmPosH1 = BagFold0 + FilmPosH;
mPDetect.GetFilmInfo(out filminfo1, mADList[idx].dt, filmWidth, filmPosH1);
ADCell adcell = mADList[idx];
adcell.angles.Add(filminfo1.angle1);
adcell.angles.Add(filminfo0.angle1);
adcell.angles.Add(filminfo0.angle2);
adcell.angles.Add(filminfo1.angle2);
//下面的参数 filminfo0 与 filminfo1 一样
adcell.direction = filminfo0.direction;
adcell.velocity = filminfo0.filmVelocity;
adcell.rotationCnt = filminfo0.rotationCnt;
adcell.inCV = filminfo0.inCV;
return true;
}
#endregion
/// <summary> /// <summary>
/// 状态不一样，人字架已经转了新一圈，需要增加新一幅数据 /// 状态不一样，人字架已经转了新一圈，需要增加新一幅数据
/// </summary> /// </summary>
...@@ -1795,11 +1797,16 @@ namespace FLY.Thick.Blowing.Server ...@@ -1795,11 +1797,16 @@ namespace FLY.Thick.Blowing.Server
//frameinfo.CheckForValid(); //frameinfo.CheckForValid();
//一幅数据已经完成 //一幅数据已经完成
if (SolveEnable) switch (MMode)
{
case MeasureMode.Normal:
case MeasureMode.Bag:
{ {
//最后检查一下是否需要解方程 //最后检查一下是否需要解方程
frameinfo.SolveFormula(); frameinfo.SolveFormula();
} }
break;
}
int[] thicks = frameinfo.frame; int[] thicks = frameinfo.frame;
if (IsUsedMap)//重新分区 if (IsUsedMap)//重新分区
...@@ -1831,17 +1838,29 @@ namespace FLY.Thick.Blowing.Server ...@@ -1831,17 +1838,29 @@ namespace FLY.Thick.Blowing.Server
} }
int thick = AD2Thick(adcell.ad); int thick = AD2Thick(adcell.ad);
if (SolveEnable)//解方程，更新frameinfo.frame switch (MMode)
{ {
int boltindex_0 = Angle2BoltIndex(adcell.angle0); case MeasureMode.Edge:
int boltindex_1 = Angle2BoltIndex(adcell.angle1); {
frameinfo.SetFrameValue(boltindex_0, boltindex_1, thick*2, adcell.dt); //均值，更新frameinfo.frame
frameinfo.SetFrameValue(Angle2BoltIndex(adcell.angles.First()), thick , adcell.dt);
}
break;
case MeasureMode.Normal:
{
//解方程，更新frameinfo.frame
var list = from a in adcell.angles select Angle2BoltIndex(a);
frameinfo.SetFrameValue(list, thick * 2, adcell.dt);
} }
else//均值，更新frameinfo.frame break;
default:
//case MeasureMode.Bag:
{ {
int boltindex = Angle2BoltIndex(adcell.angle0); //解方程，更新frameinfo.frame
frameinfo.SetFrameValue(boltindex, thick, adcell.dt); var list = from a in adcell.angles select Angle2BoltIndex(a);
frameinfo.SetFrameValue(list, thick * 4, adcell.dt);
}
break;
} }
frameinfo.EndTime = adcell.dt; frameinfo.EndTime = adcell.dt;
...@@ -1857,10 +1876,15 @@ namespace FLY.Thick.Blowing.Server ...@@ -1857,10 +1876,15 @@ namespace FLY.Thick.Blowing.Server
for (int i = 0; i < mFrameInfoList.Count; i++) for (int i = 0; i < mFrameInfoList.Count; i++)
{ {
FRAME_INFO frameinfo = mFrameInfoList[i]; FRAME_INFO frameinfo = mFrameInfoList[i];
if (SolveEnable) switch (MMode)
{ {
//检查是否需要解方程 case MeasureMode.Normal:
frameinfo.CheckToSolveFormula(); case MeasureMode.Bag:
{
//最后检查一下是否需要解方程
frameinfo.SolveFormula();
}
break;
} }
if (frameinfo.HasChanged)//数据检测过，需要更新bulkdata里面的数据 if (frameinfo.HasChanged)//数据检测过，需要更新bulkdata里面的数据
...@@ -2301,9 +2325,10 @@ namespace FLY.Thick.Blowing.Server ...@@ -2301,9 +2325,10 @@ namespace FLY.Thick.Blowing.Server
//异常 //异常
return 0; return 0;
} }
//计算相关性，只使用 膜边=0mm 模式
c.direction = filminfo.direction; c.direction = filminfo.direction;
c.angle0 = filminfo.angle1; c.angles.Add(filminfo.angle1);
c.angle1 = filminfo.angle2; c.angles.Add(filminfo.angle2);
c.rotationCnt = filminfo.rotationCnt; c.rotationCnt = filminfo.rotationCnt;
c.velocity = filminfo.filmVelocity; c.velocity = filminfo.filmVelocity;
c.inCV = filminfo.inCV; c.inCV = filminfo.inCV;
...@@ -2337,13 +2362,13 @@ namespace FLY.Thick.Blowing.Server ...@@ -2337,13 +2362,13 @@ namespace FLY.Thick.Blowing.Server
cnt++; cnt++;
} }
angle_3 = (int)(c.angle0 / 3); angle_3 = (int)(c.angles.First() / 3);
rotationcnt = c.rotationCnt; rotationcnt = c.rotationCnt;
} }
else{ else{
bool change=false; bool change=false;
if ((rotationcnt != c.rotationCnt) || if ((rotationcnt != c.rotationCnt) ||
(angle_3 != (int)(c.angle0 / 3))) (angle_3 != (int)(c.angles.First() / 3)))
{ {
change = true; change = true;
} }
...@@ -2382,7 +2407,7 @@ namespace FLY.Thick.Blowing.Server ...@@ -2382,7 +2407,7 @@ namespace FLY.Thick.Blowing.Server
cnt++; cnt++;
} }
rotationcnt = c.rotationCnt; rotationcnt = c.rotationCnt;
angle_3 = (int)(c.angle0 / 3); angle_3 = (int)(c.angles.First() / 3);
} }
} }
} }
......
Project.FLY.Thick.Blowing/FLY.Thick.Blowing/Server/TDGage.cs
View file @ 72dc1b2b
...@@ -207,10 +207,9 @@ namespace FLY.Thick.Blowing.Server ...@@ -207,10 +207,9 @@ namespace FLY.Thick.Blowing.Server
//--------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------
//GM_RenZiJiaFix_Create //GM_RenZiJiaFix_Create
mGMRenZiJiaFix = new GM_BlowingFix(mFlyAD); mGMRenZiJiaFix = new GM_BlowingFix(mFlyAD);
Misc.BindingOperations.SetBinding(mProfile.Param, "SolveEnable", mGMRenZiJiaFix, "SolveEnable"); Misc.BindingOperations.SetBinding(mProfile.Param, "MMode", mGMRenZiJiaFix, "MMode");
Misc.BindingOperations.SetBinding(mProfile.Param, "FilmWidth", mGMRenZiJiaFix, "FilmWidth"); Misc.BindingOperations.SetBinding(mProfile.Param, "FilmWidth", mGMRenZiJiaFix, "FilmWidth");
Misc.BindingOperations.SetBinding(mProfile.Param, "FilmPosH", mGMRenZiJiaFix, "FilmPosH"); Misc.BindingOperations.SetBinding(mProfile.Param, "FilmPosH", mGMRenZiJiaFix, "FilmPosH");
Misc.BindingOperations.SetBinding(mProfile.Param, "IsBag", mGMRenZiJiaFix, "IsBag");
Misc.BindingOperations.SetBinding(mProfile.Param, "BagFold0", mGMRenZiJiaFix, "BagFold0"); Misc.BindingOperations.SetBinding(mProfile.Param, "BagFold0", mGMRenZiJiaFix, "BagFold0");
Misc.BindingOperations.SetBinding(mProfile.Param, "BagFold1", mGMRenZiJiaFix, "BagFold1"); Misc.BindingOperations.SetBinding(mProfile.Param, "BagFold1", mGMRenZiJiaFix, "BagFold1");
......
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