Skip to content

张东亮 / NS100

转到一个项目
切换导航栏
切换导航栏固定状态
Commit de54abbe 由 刘韬
选项

halcon 升级到20

1 个父辈 2f575419
内嵌 并排
正在显示 5 个修改的文件 包含 4 行增加 和 7 行删除
SmartScan/Form/FrmMain.Designer.cs
...@@ -275,7 +275,7 @@ namespace SmartScan ...@@ -275,7 +275,7 @@ namespace SmartScan
this.Controls.Add(this.BtnSet); this.Controls.Add(this.BtnSet);
this.Controls.Add(this.BtnRetrospect); this.Controls.Add(this.BtnRetrospect);
this.Controls.Add(this.BtnStart); this.Controls.Add(this.BtnStart);
this.Icon = global::SmartScan.Properties.Resources.NEO_64;
this.Name = "FrmMain"; this.Name = "FrmMain";
this.Text = "Form1"; this.Text = "Form1";
this.TitleFont = new System.Drawing.Font("宋体", 16.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.TitleFont = new System.Drawing.Font("宋体", 16.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
......
SmartScan/ScanWork.cs
...@@ -233,14 +233,15 @@ namespace SmartScan ...@@ -233,14 +233,15 @@ namespace SmartScan
System.Threading.Thread.Sleep(100); //光源打开有一个由暗变亮的过程 System.Threading.Thread.Sleep(100); //光源打开有一个由暗变亮的过程
} }
List<Bitmap> image = new List<Bitmap>(Camera.CaptureAndGetCode(out workCodeInfo)); List<Bitmap> image = new List<Bitmap>(Camera.CaptureAndGetCode(out workCodeInfo));
if (image.Count > 0) if (image.Count > 0 && image[0]!=null)
{ {
BLLCommon.mateEdit.CurrntBitmap = WebCallWork.DeepClone(image[0]); BLLCommon.mateEdit.CurrntBitmap = WebCallWork.DeepClone(image[0]);
if (!BLL.Config.Backgrounder) if (!BLL.Config.Backgrounder)
picShow.Image = image[0]; picShow.Image = image[0];
if (BLLCommon.mateEdit.CurrntBitmap!=null) if (BLLCommon.mateEdit.CurrntBitmap!=null)
_ = UnifiedDataHandler.PostSmfImageAsync(BLLCommon.mateEdit.CurrntBitmap, new Dictionary<string, string> { { "cid", BLLCommon.config.CID + "_1" } }, BLLCommon.mateEdit.CurrntBitmap.Width, BLLCommon.mateEdit.CurrntBitmap.Height); _ = UnifiedDataHandler.PostSmfImageAsync(BLLCommon.mateEdit.CurrntBitmap, new Dictionary<string, string> { { "cid", BLLCommon.config.CID + "_1" } }, BLLCommon.mateEdit.CurrntBitmap.Width, BLLCommon.mateEdit.CurrntBitmap.Height);
} }else
return false;
if (BLLCommon.config.TriggerOpenLight) if (BLLCommon.config.TriggerOpenLight)
BLLCommon.lightSource.TurnOff(); BLLCommon.lightSource.TurnOff();
......
SmartScan/SmartScan.csproj
...@@ -83,10 +83,6 @@ ...@@ -83,10 +83,6 @@
<Reference Include="ExcelNumberFormat, Version=1.1.0.0, Culture=neutral, PublicKeyToken=23c6f5d73be07eca, processorArchitecture=MSIL"> <Reference Include="ExcelNumberFormat, Version=1.1.0.0, Culture=neutral, PublicKeyToken=23c6f5d73be07eca, processorArchitecture=MSIL">
<HintPath>..\packages\ExcelNumberFormat.1.1.0\lib\net20\ExcelNumberFormat.dll</HintPath> <HintPath>..\packages\ExcelNumberFormat.1.1.0\lib\net20\ExcelNumberFormat.dll</HintPath>
</Reference> </Reference>
<Reference Include="halcondotnet, Version=12.0.0.0, Culture=neutral, PublicKeyToken=4973bed59ddbf2b8, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\相机操作类\Camera\CameraVisionLibSetting\bin\Debug\halcondotnet.dll</HintPath>
</Reference>
<Reference Include="log4net, Version=2.0.12.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL"> <Reference Include="log4net, Version=2.0.12.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<HintPath>..\packages\log4net.2.0.12\lib\net45\log4net.dll</HintPath> <HintPath>..\packages\log4net.2.0.12\lib\net45\log4net.dll</HintPath>
</Reference> </Reference>
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!