Commit 49294858 刘韬

1

1 个父辈 2759703e
...@@ -148,7 +148,7 @@ namespace ScanCodeServer ...@@ -148,7 +148,7 @@ namespace ScanCodeServer
Bitmap bitmap = new Bitmap(file); Bitmap bitmap = new Bitmap(file);
WebWork webWork = new WebWork(); WebWork webWork = new WebWork();
HDCodeHelper.Bitmap2HObjectBpp24(bitmap, out HObject ho_Image); var b = HDCodeHelper.Bitmap2HObjectBpp24(bitmap, out HObject ho_Image);
//bitmap.Dispose(); //bitmap.Dispose();
RemoteDecodeParam remoteDecodeParam = new RemoteDecodeParam(); RemoteDecodeParam remoteDecodeParam = new RemoteDecodeParam();
remoteDecodeParam.codeTypeList = new string[] { "barcode", "Data Matrix ECC 200", "QR Code", "PDF417", "eyem" }; remoteDecodeParam.codeTypeList = new string[] { "barcode", "Data Matrix ECC 200", "QR Code", "PDF417", "eyem" };
......
...@@ -12,6 +12,7 @@ using System.Text; ...@@ -12,6 +12,7 @@ using System.Text;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows.Forms; using System.Windows.Forms;
using static System.Net.Mime.MediaTypeNames;
namespace ScanCodeServer namespace ScanCodeServer
{ {
...@@ -274,8 +275,9 @@ namespace ScanCodeServer ...@@ -274,8 +275,9 @@ namespace ScanCodeServer
ho_Image = null; ho_Image = null;
try try
{ {
//ho_Image= new HObject();
HOperatorSet.GenEmptyObj(out ho_Image); HOperatorSet.GenEmptyObj(out ho_Image);
ho_Image.Dispose(); //ho_Image.Dispose();
Rectangle rect = new Rectangle(0, 0, bmp.Width, bmp.Height); Rectangle rect = new Rectangle(0, 0, bmp.Width, bmp.Height);
BitmapData srcBmpData = bmp.LockBits(rect, ImageLockMode.ReadOnly, bmp.PixelFormat); BitmapData srcBmpData = bmp.LockBits(rect, ImageLockMode.ReadOnly, bmp.PixelFormat);
...@@ -334,11 +336,11 @@ namespace ScanCodeServer ...@@ -334,11 +336,11 @@ namespace ScanCodeServer
private static extern void CopyMemory(IntPtr dest, IntPtr source, int size); private static extern void CopyMemory(IntPtr dest, IntPtr source, int size);
internal static string GetCodeParamFilePath(string codeType) internal static string GetCodeParamFilePath(string codeType)
{ {
string appPath = Path.Combine(Application.StartupPath, "..\\"); string appPath = Path.Combine(System.Windows.Forms.Application.StartupPath, "..\\");
if (!Directory.Exists(Path.Combine(appPath,CodeParamPath))) if (!Directory.Exists(Path.Combine(appPath,CodeParamPath)))
{ {
appPath = Application.StartupPath; appPath = System.Windows.Forms.Application.StartupPath;
} }
string filePath = Path.Combine(Path.Combine(appPath, CodeParamPath), codeType + ".dcm"); string filePath = Path.Combine(Path.Combine(appPath, CodeParamPath), codeType + ".dcm");
......
...@@ -43,9 +43,6 @@ ...@@ -43,9 +43,6 @@
<Reference Include="ConfigHelper"> <Reference Include="ConfigHelper">
<HintPath>..\..\ConfigHelper\ConfigHelper\bin\Debug\ConfigHelper.dll</HintPath> <HintPath>..\..\ConfigHelper\ConfigHelper\bin\Debug\ConfigHelper.dll</HintPath>
</Reference> </Reference>
<Reference Include="halcondotnet">
<HintPath>..\..\GeneralClassLibrary\CodeLibraryProject\CodeLibrary\bin\Debug\halcondotnet.dll</HintPath>
</Reference>
<Reference Include="log4net"> <Reference Include="log4net">
<HintPath>..\..\增广夹爪\Rmaxis\bin\Debug\log4net.dll</HintPath> <HintPath>..\..\增广夹爪\Rmaxis\bin\Debug\log4net.dll</HintPath>
</Reference> </Reference>
...@@ -112,6 +109,8 @@ ...@@ -112,6 +109,8 @@
<ItemGroup> <ItemGroup>
<Content Include="halcon12\halcon.dll" /> <Content Include="halcon12\halcon.dll" />
<Content Include="halcon12\halcondotnet.dll" /> <Content Include="halcon12\halcondotnet.dll" />
<Content Include="halcon20\halcon.dll" />
<Content Include="halcon20\halcondotnet.dll" />
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup> <PropertyGroup>
......
此文件太大,无法显示。
此文件类型无法预览
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!