patrick.xu
2020-12-24 5d05df27234fcb2bb9d5179a640c59590009f15a
保存图片开关和格式配置
23个文件已修改
225 ■■■■ 已修改文件
EventTool/EventTool.csproj 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
EventTool/Properties/Resources.Designer.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
EventTool/Properties/Settings.Designer.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
FileToolkit/FileToolkit.csproj 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
FileToolkit/Properties/Resources.Designer.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
FileToolkit/Properties/Settings.Designer.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HalconTools/ContourModule/ContourResult.cs 补丁 | 查看 | 原始文档 | blame | 历史
HalconTools/HalconTools.csproj 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HalconTools/Properties/Resources.Designer.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HalconTools/Properties/Settings.Designer.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
LLMF/LLMF.csproj 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
LLMF/Program.cs 20 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
LLMF/Properties/Resources.Designer.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
LLMF/Properties/Settings.Designer.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
LLMF/Toolkit/ConfigStruct.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
LLMF/app.config 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
LLMF/frmMain.Designer.cs 114 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
LLMF/frmMain.cs 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
LLMF/frmMain.resx 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Lib/FlyCapture/FlyCapture2Managed.dll 补丁 | 查看 | 原始文档 | blame | 历史
Lib/FlyCapture/FlyCapture2Managed_v100.dll 补丁 | 查看 | 原始文档 | blame | 历史
PointGreyAndHalcon/PointGreyAndHalcon/PointGreyAndHalcon.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
README.md 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
EventTool/EventTool.csproj
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,7 +10,7 @@
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>EventTool</RootNamespace>
    <AssemblyName>EventTool</AssemblyName>
    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
    <FileAlignment>512</FileAlignment>
    <StartupObject>
    </StartupObject>
@@ -19,6 +19,7 @@
    <UpgradeBackupLocation>
    </UpgradeBackupLocation>
    <OldToolsVersion>3.5</OldToolsVersion>
    <TargetFrameworkProfile />
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <DebugSymbols>true</DebugSymbols>
@@ -28,6 +29,7 @@
    <DefineConstants>DEBUG;TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    <DebugType>pdbonly</DebugType>
@@ -36,6 +38,7 @@
    <DefineConstants>TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="System" />
EventTool/Properties/Resources.Designer.cs
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
//     This code was generated by a tool.
//     Runtime Version:4.0.30319.17929
//     Runtime Version:4.0.30319.42000
//
//     Changes to this file may cause incorrect behavior and will be lost if
//     the code is regenerated.
@@ -19,7 +19,7 @@
    // class via a tool like ResGen or Visual Studio.
    // To add or remove a member, edit your .ResX file then rerun ResGen
    // with the /str option, or rebuild your VS project.
    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
    internal class Resources {
EventTool/Properties/Settings.Designer.cs
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
//     This code was generated by a tool.
//     Runtime Version:4.0.30319.17929
//     Runtime Version:4.0.30319.42000
//
//     Changes to this file may cause incorrect behavior and will be lost if
//     the code is regenerated.
@@ -12,7 +12,7 @@
    
    
    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.5.0.0")]
    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
        
        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
FileToolkit/FileToolkit.csproj
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,7 +10,7 @@
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>FileToolkit</RootNamespace>
    <AssemblyName>FileToolkit</AssemblyName>
    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
    <FileAlignment>512</FileAlignment>
    <StartupObject>
    </StartupObject>
@@ -19,6 +19,7 @@
    <UpgradeBackupLocation>
    </UpgradeBackupLocation>
    <OldToolsVersion>3.5</OldToolsVersion>
    <TargetFrameworkProfile />
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <DebugSymbols>true</DebugSymbols>
@@ -28,6 +29,7 @@
    <DefineConstants>DEBUG;TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    <DebugType>pdbonly</DebugType>
@@ -36,6 +38,7 @@
    <DefineConstants>TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="System" />
FileToolkit/Properties/Resources.Designer.cs
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
//     This code was generated by a tool.
//     Runtime Version:4.0.30319.17929
//     Runtime Version:4.0.30319.42000
//
//     Changes to this file may cause incorrect behavior and will be lost if
//     the code is regenerated.
@@ -19,7 +19,7 @@
    // class via a tool like ResGen or Visual Studio.
    // To add or remove a member, edit your .ResX file then rerun ResGen
    // with the /str option, or rebuild your VS project.
    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
    internal class Resources {
FileToolkit/Properties/Settings.Designer.cs
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
//     This code was generated by a tool.
//     Runtime Version:4.0.30319.17929
//     Runtime Version:4.0.30319.42000
//
//     Changes to this file may cause incorrect behavior and will be lost if
//     the code is regenerated.
@@ -12,7 +12,7 @@
    
    
    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.5.0.0")]
    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
        
        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
HalconTools/ContourModule/ContourResult.cs
HalconTools/HalconTools.csproj
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,7 +10,7 @@
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>HalconTools</RootNamespace>
    <AssemblyName>HalconTools</AssemblyName>
    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
    <FileAlignment>512</FileAlignment>
    <StartupObject>
    </StartupObject>
@@ -19,6 +19,7 @@
    <UpgradeBackupLocation>
    </UpgradeBackupLocation>
    <OldToolsVersion>3.5</OldToolsVersion>
    <TargetFrameworkProfile />
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <DebugSymbols>true</DebugSymbols>
@@ -28,6 +29,7 @@
    <DefineConstants>DEBUG;TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    <DebugType>pdbonly</DebugType>
@@ -36,6 +38,7 @@
    <DefineConstants>TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="halcondotnet">
HalconTools/Properties/Resources.Designer.cs
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
//     This code was generated by a tool.
//     Runtime Version:4.0.30319.17929
//     Runtime Version:4.0.30319.42000
//
//     Changes to this file may cause incorrect behavior and will be lost if
//     the code is regenerated.
@@ -19,7 +19,7 @@
    // class via a tool like ResGen or Visual Studio.
    // To add or remove a member, edit your .ResX file then rerun ResGen
    // with the /str option, or rebuild your VS project.
    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
    internal class Resources {
HalconTools/Properties/Settings.Designer.cs
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
//     This code was generated by a tool.
//     Runtime Version:4.0.30319.17929
//     Runtime Version:4.0.30319.42000
//
//     Changes to this file may cause incorrect behavior and will be lost if
//     the code is regenerated.
@@ -12,7 +12,7 @@
    
    
    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.5.0.0")]
    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
        
        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
LLMF/LLMF.csproj
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,7 +10,7 @@
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>LLMF</RootNamespace>
    <AssemblyName>LLMF</AssemblyName>
    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
    <FileAlignment>512</FileAlignment>
    <ApplicationIcon>ico.ico</ApplicationIcon>
    <FileUpgradeFlags>
@@ -28,8 +28,8 @@
    <DefineConstants>DEBUG;TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
    <PlatformTarget>x86</PlatformTarget>
    <Prefer32Bit>false</Prefer32Bit>
    <PlatformTarget>AnyCPU</PlatformTarget>
    <Prefer32Bit>true</Prefer32Bit>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    <DebugType>pdbonly</DebugType>
@@ -43,6 +43,10 @@
  <ItemGroup>
    <Reference Include="dog_net_windows">
      <HintPath>..\Lib\SuperDog\dog_net_windows.dll</HintPath>
    </Reference>
    <Reference Include="FlyCapture2Managed_v100, Version=2.8.3.1, Culture=neutral, PublicKeyToken=76c6583b4a4585f4, processorArchitecture=x86">
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\Lib\FlyCapture\FlyCapture2Managed_v100.dll</HintPath>
    </Reference>
    <Reference Include="halcondotnet">
      <HintPath>..\Lib\halcon\halcondotnet.dll</HintPath>
@@ -161,11 +165,11 @@
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\EventTool\EventTool.csproj">
      <Project>{2EBB374F-7C87-4A83-8AF4-503CDF0D1B0E}</Project>
      <Project>{2ebb374f-7c87-4a83-8af4-503cdf0d1b0e}</Project>
      <Name>EventTool</Name>
    </ProjectReference>
    <ProjectReference Include="..\FileToolkit\FileToolkit.csproj">
      <Project>{EC3A7C8F-C3FB-461C-9AF1-2456E1CBEC46}</Project>
      <Project>{ec3a7c8f-c3fb-461c-9af1-2456e1cbec46}</Project>
      <Name>FileToolkit</Name>
    </ProjectReference>
    <ProjectReference Include="..\HalconTools\HalconTools.csproj">
LLMF/Program.cs
@@ -23,16 +23,16 @@
                var status = dog.Login(vendorcodes, defaultScope);
                if (status != DogStatus.StatusOk)
                {
                    if (status == DogStatus.TimeError)
                    {
                        MessageBox.Show("禁止篡改时间!");
                        return;
                    }
                    else
                    {
                        MessageBox.Show("请插入有效的加密狗!");
                        return;
                    }
                    //if (status == DogStatus.TimeError)
                    //{
                    //    MessageBox.Show("禁止篡改时间!");
                    //    return;
                    //}
                    //else
                    //{
                    //    MessageBox.Show("请插入有效的加密狗!");
                    //    return;
                    //}
                }
            }
LLMF/Properties/Resources.Designer.cs
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
//     This code was generated by a tool.
//     Runtime Version:4.0.30319.17929
//     Runtime Version:4.0.30319.42000
//
//     Changes to this file may cause incorrect behavior and will be lost if
//     the code is regenerated.
@@ -19,7 +19,7 @@
    // class via a tool like ResGen or Visual Studio.
    // To add or remove a member, edit your .ResX file then rerun ResGen
    // with the /str option, or rebuild your VS project.
    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
    internal class Resources {
LLMF/Properties/Settings.Designer.cs
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
//     This code was generated by a tool.
//     Runtime Version:4.0.30319.17929
//     Runtime Version:4.0.30319.42000
//
//     Changes to this file may cause incorrect behavior and will be lost if
//     the code is regenerated.
@@ -12,7 +12,7 @@
    
    
    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.5.0.0")]
    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
        
        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
LLMF/Toolkit/ConfigStruct.cs
@@ -81,6 +81,7 @@
        public bool leftUsed;
        public bool rightUsed;
        public bool saveImage;
        public string saveImageFormat;
        public long inch13;
        public long inch15;
        public long inch16;
LLMF/app.config
@@ -1,3 +1,3 @@
<?xml version="1.0"?>
<configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>
LLMF/frmMain.Designer.cs
@@ -82,6 +82,8 @@
            this.label2 = new System.Windows.Forms.Label();
            this.btnCapture = new System.Windows.Forms.Button();
            this.groupBox4 = new System.Windows.Forms.GroupBox();
            this.cboSize = new System.Windows.Forms.ComboBox();
            this.label11 = new System.Windows.Forms.Label();
            this.txtSN = new System.Windows.Forms.TextBox();
            this.label1 = new System.Windows.Forms.Label();
            this.groupBox3 = new System.Windows.Forms.GroupBox();
@@ -127,6 +129,8 @@
            this.label7 = new System.Windows.Forms.Label();
            this.btnCapture_left = new System.Windows.Forms.Button();
            this.groupBox6 = new System.Windows.Forms.GroupBox();
            this.cboSize_Left = new System.Windows.Forms.ComboBox();
            this.label12 = new System.Windows.Forms.Label();
            this.txtSN_left = new System.Windows.Forms.TextBox();
            this.label8 = new System.Windows.Forms.Label();
            this.groupBox7 = new System.Windows.Forms.GroupBox();
@@ -184,10 +188,6 @@
            this.lblZ_JinDian = new System.Windows.Forms.Label();
            this.lblX_JinDian = new System.Windows.Forms.Label();
            this.tVideo_left = new System.Windows.Forms.Timer(this.components);
            this.cboSize = new System.Windows.Forms.ComboBox();
            this.label11 = new System.Windows.Forms.Label();
            this.cboSize_Left = new System.Windows.Forms.ComboBox();
            this.label12 = new System.Windows.Forms.Label();
            this.statusStrip1.SuspendLayout();
            this.panel1.SuspendLayout();
            this.toolStrip1.SuspendLayout();
@@ -226,7 +226,7 @@
            this.tsslPosition,
            this.toolStripStatusLabel1,
            this.tsslAlarm});
            this.statusStrip1.Location = new System.Drawing.Point(0, 747);
            this.statusStrip1.Location = new System.Drawing.Point(0, 727);
            this.statusStrip1.Name = "statusStrip1";
            this.statusStrip1.Size = new System.Drawing.Size(1081, 22);
            this.statusStrip1.TabIndex = 0;
@@ -439,7 +439,7 @@
            this.panel2.Dock = System.Windows.Forms.DockStyle.Fill;
            this.panel2.Location = new System.Drawing.Point(3, 3);
            this.panel2.Name = "panel2";
            this.panel2.Size = new System.Drawing.Size(792, 643);
            this.panel2.Size = new System.Drawing.Size(792, 623);
            this.panel2.TabIndex = 2;
            // 
            // lblAngleDisplay
@@ -459,9 +459,9 @@
            this.viewPort.ImagePart = new System.Drawing.Rectangle(0, 0, 640, 480);
            this.viewPort.Location = new System.Drawing.Point(0, 0);
            this.viewPort.Name = "viewPort";
            this.viewPort.Size = new System.Drawing.Size(792, 643);
            this.viewPort.Size = new System.Drawing.Size(792, 623);
            this.viewPort.TabIndex = 0;
            this.viewPort.WindowSize = new System.Drawing.Size(792, 643);
            this.viewPort.WindowSize = new System.Drawing.Size(792, 623);
            // 
            // panel3
            // 
@@ -476,14 +476,14 @@
            this.panel3.Dock = System.Windows.Forms.DockStyle.Right;
            this.panel3.Location = new System.Drawing.Point(795, 3);
            this.panel3.Name = "panel3";
            this.panel3.Size = new System.Drawing.Size(275, 643);
            this.panel3.Size = new System.Drawing.Size(275, 623);
            this.panel3.TabIndex = 3;
            // 
            // btnDisplay
            // 
            this.btnDisplay.Dock = System.Windows.Forms.DockStyle.Bottom;
            this.btnDisplay.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.btnDisplay.Location = new System.Drawing.Point(0, 590);
            this.btnDisplay.Location = new System.Drawing.Point(0, 570);
            this.btnDisplay.Name = "btnDisplay";
            this.btnDisplay.Size = new System.Drawing.Size(275, 53);
            this.btnDisplay.TabIndex = 0;
@@ -742,6 +742,26 @@
            this.groupBox4.TabIndex = 4;
            this.groupBox4.TabStop = false;
            // 
            // cboSize
            //
            this.cboSize.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
            this.cboSize.FormattingEnabled = true;
            this.cboSize.Location = new System.Drawing.Point(39, 19);
            this.cboSize.Margin = new System.Windows.Forms.Padding(2);
            this.cboSize.Name = "cboSize";
            this.cboSize.Size = new System.Drawing.Size(215, 20);
            this.cboSize.TabIndex = 5;
            this.cboSize.SelectionChangeCommitted += new System.EventHandler(this.cboSize_SelectionChangeCommitted);
            //
            // label11
            //
            this.label11.AutoSize = true;
            this.label11.Location = new System.Drawing.Point(5, 21);
            this.label11.Name = "label11";
            this.label11.Size = new System.Drawing.Size(29, 12);
            this.label11.TabIndex = 4;
            this.label11.Text = "尺寸";
            //
            // txtSN
            // 
            this.txtSN.Location = new System.Drawing.Point(39, 47);
@@ -898,7 +918,7 @@
            this.tabControl1.Location = new System.Drawing.Point(0, 72);
            this.tabControl1.Name = "tabControl1";
            this.tabControl1.SelectedIndex = 0;
            this.tabControl1.Size = new System.Drawing.Size(1081, 675);
            this.tabControl1.Size = new System.Drawing.Size(1081, 655);
            this.tabControl1.TabIndex = 4;
            // 
            // tabPage2
@@ -907,8 +927,8 @@
            this.tabPage2.Controls.Add(this.panel3);
            this.tabPage2.Location = new System.Drawing.Point(4, 22);
            this.tabPage2.Name = "tabPage2";
            this.tabPage2.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
            this.tabPage2.Size = new System.Drawing.Size(1073, 649);
            this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
            this.tabPage2.Size = new System.Drawing.Size(1073, 629);
            this.tabPage2.TabIndex = 1;
            this.tabPage2.Text = "主工位";
            this.tabPage2.UseVisualStyleBackColor = true;
@@ -919,7 +939,7 @@
            this.tabPage1.Controls.Add(this.panel5);
            this.tabPage1.Location = new System.Drawing.Point(4, 22);
            this.tabPage1.Name = "tabPage1";
            this.tabPage1.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
            this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
            this.tabPage1.Size = new System.Drawing.Size(1073, 649);
            this.tabPage1.TabIndex = 0;
            this.tabPage1.Text = "左工位";
@@ -1223,6 +1243,26 @@
            this.groupBox6.TabIndex = 10;
            this.groupBox6.TabStop = false;
            // 
            // cboSize_Left
            //
            this.cboSize_Left.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
            this.cboSize_Left.FormattingEnabled = true;
            this.cboSize_Left.Location = new System.Drawing.Point(41, 19);
            this.cboSize_Left.Margin = new System.Windows.Forms.Padding(2);
            this.cboSize_Left.Name = "cboSize_Left";
            this.cboSize_Left.Size = new System.Drawing.Size(215, 20);
            this.cboSize_Left.TabIndex = 7;
            this.cboSize_Left.SelectionChangeCommitted += new System.EventHandler(this.cboSize_Left_SelectionChangeCommitted);
            //
            // label12
            //
            this.label12.AutoSize = true;
            this.label12.Location = new System.Drawing.Point(7, 21);
            this.label12.Name = "label12";
            this.label12.Size = new System.Drawing.Size(29, 12);
            this.label12.TabIndex = 6;
            this.label12.Text = "尺寸";
            //
            // txtSN_left
            // 
            this.txtSN_left.Location = new System.Drawing.Point(42, 47);
@@ -1371,8 +1411,8 @@
            this.tabPage3.Controls.Add(this.groupBox1);
            this.tabPage3.Location = new System.Drawing.Point(4, 22);
            this.tabPage3.Name = "tabPage3";
            this.tabPage3.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
            this.tabPage3.Size = new System.Drawing.Size(1000, 568);
            this.tabPage3.Padding = new System.Windows.Forms.Padding(3);
            this.tabPage3.Size = new System.Drawing.Size(1073, 649);
            this.tabPage3.TabIndex = 2;
            this.tabPage3.Text = "I/O";
            this.tabPage3.UseVisualStyleBackColor = true;
@@ -1834,51 +1874,11 @@
            this.tVideo_left.Interval = 250;
            this.tVideo_left.Tick += new System.EventHandler(this.tVideo_left_Tick);
            // 
            // cboSize
            //
            this.cboSize.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
            this.cboSize.FormattingEnabled = true;
            this.cboSize.Location = new System.Drawing.Point(39, 19);
            this.cboSize.Margin = new System.Windows.Forms.Padding(2);
            this.cboSize.Name = "cboSize";
            this.cboSize.Size = new System.Drawing.Size(215, 20);
            this.cboSize.TabIndex = 5;
            this.cboSize.SelectionChangeCommitted += new System.EventHandler(this.cboSize_SelectionChangeCommitted);
            //
            // label11
            //
            this.label11.AutoSize = true;
            this.label11.Location = new System.Drawing.Point(5, 21);
            this.label11.Name = "label11";
            this.label11.Size = new System.Drawing.Size(29, 12);
            this.label11.TabIndex = 4;
            this.label11.Text = "尺寸";
            //
            // cboSize_Left
            //
            this.cboSize_Left.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
            this.cboSize_Left.FormattingEnabled = true;
            this.cboSize_Left.Location = new System.Drawing.Point(41, 19);
            this.cboSize_Left.Margin = new System.Windows.Forms.Padding(2);
            this.cboSize_Left.Name = "cboSize_Left";
            this.cboSize_Left.Size = new System.Drawing.Size(215, 20);
            this.cboSize_Left.TabIndex = 7;
            this.cboSize_Left.SelectionChangeCommitted += new System.EventHandler(this.cboSize_Left_SelectionChangeCommitted);
            //
            // label12
            //
            this.label12.AutoSize = true;
            this.label12.Location = new System.Drawing.Point(7, 21);
            this.label12.Name = "label12";
            this.label12.Size = new System.Drawing.Size(29, 12);
            this.label12.TabIndex = 6;
            this.label12.Text = "尺寸";
            //
            // frmMain
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.ClientSize = new System.Drawing.Size(1081, 769);
            this.ClientSize = new System.Drawing.Size(1081, 749);
            this.Controls.Add(this.tabControl1);
            this.Controls.Add(this.panel1);
            this.Controls.Add(this.statusStrip1);
LLMF/frmMain.cs
@@ -284,11 +284,14 @@
                                if (runStatus != RunStatus.continueCapture)
                                {
                                    #region 保存图片
                                    if (config.saveImage)
                                    {
                                    string FolderPath = "D:\\Image\\" + DateTime.Now.ToString("yyyyMMdd");
                                    string fileName = txtSN.Text.Trim() + "-" + DateTime.Now.ToString("HHmmssffff");
                                    if (!Directory.Exists(FolderPath)) Directory.CreateDirectory(FolderPath);
                                    cam.SaveImage(FolderPath, fileName);
                                        cam.SaveImage(FolderPath, fileName, string.IsNullOrWhiteSpace(config.saveImageFormat) ? "png" : config.saveImageFormat);
                                    }
                                    #endregion
                                }
@@ -348,11 +351,14 @@
                                if (runStatus_left != RunStatus.continueCapture)
                                {
                                    #region 保存图片
                                    if (config.saveImage)
                                    {
                                    string FolderPath = "D:\\Image\\" + DateTime.Now.ToString("yyyyMMdd") + "-left";
                                    string fileName = txtSN.Text.Trim() + "-" + DateTime.Now.ToString("HHmmssffff");
                                    if (!Directory.Exists(FolderPath)) Directory.CreateDirectory(FolderPath);
                                    cam_left.SaveImage(FolderPath, fileName);
                                        cam_left.SaveImage(FolderPath, fileName, string.IsNullOrWhiteSpace(config.saveImageFormat) ? "png" : config.saveImageFormat);
                                    }
                                    #endregion
                                }
LLMF/frmMain.resx
@@ -123,9 +123,6 @@
  <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>522, 17</value>
  </metadata>
  <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>522, 17</value>
  </metadata>
  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
  <data name="toolStripMaxMin.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
Lib/FlyCapture/FlyCapture2Managed.dll
Binary files differ
Lib/FlyCapture/FlyCapture2Managed_v100.dll
Binary files differ
PointGreyAndHalcon/PointGreyAndHalcon/PointGreyAndHalcon.cs
@@ -319,9 +319,9 @@
        /// </summary>
        /// <param name="filePath"></param>
        /// <param name="fileName"></param>
        public void SaveImage(string filePath, string fileName)
        public void SaveImage(string filePath, string fileName, string imgFormat)
        {
            image.WriteImage("tiff", 0, filePath + "\\" + fileName);
            image.WriteImage(imgFormat, 0, filePath + "\\" + fileName);
        }
        
        public void SetExposure(float exposure)
README.md
@@ -2,5 +2,3 @@
漏光检测
因为OPC只适用32位,halcon和灰点驱动都安装32位驱动,程序编译选择x86平台