Commit 044dc943 LN

基准图单独保存为图片。

1 个父辈 c0c57be9
正在显示 1 个修改的文件 包含 25 行增加4 行删除
......@@ -4,6 +4,7 @@ using System;
using System.Collections.Generic;
using System.Drawing;
using System.Drawing.Drawing2D;
using System.Drawing.Imaging;
using System.IO;
using System.Linq;
using System.Runtime.Serialization.Formatters.Binary;
......@@ -86,8 +87,9 @@ namespace AOI
public void Save(string filePath)
{
Dictionary<string, string> projectMap = new Dictionary<string, string>();
string base64ImgStr = Base64Util.ToBase64(this.standardImage);
projectMap.Add("base64Img", base64ImgStr);
// string base64ImgStr = Base64Util.ToBase64(this.standardImage);
// projectMap.Add("base64Img", base64ImgStr);
this.standardImage.Save(GetStandardImgPath(filePath), ImageFormat.Bmp);
var mapForJson = new Dictionary<string, string>();
foreach(var item in this.methodMap)
{
......@@ -103,6 +105,14 @@ namespace AOI
projectMap.Add("methodMap", methodMapJson);
JsonUtil.SerializeObjectToFile(projectMap,filePath,false);
}
private static string GetStandardImgPath(string filePath)
{
string imageFilePath = "";
string extension = Path.GetExtension(filePath);
imageFilePath = filePath.Replace( extension, ".bmp");
return imageFilePath;
}
/// <summary>
/// 加载项目
/// </summary>
......@@ -116,9 +126,20 @@ namespace AOI
AoiProject aoiProject = new AoiProject();
try
{
string imageFile = GetStandardImgPath(filePath);
if (!File.Exists(imageFile))
{
msg = "未找到基准图片";
return null;
}
Image image = Image.FromFile(imageFile);
aoiProject.standardImage = new Bitmap(image);
image.Dispose();
Dictionary<string, string> projectMap = JsonUtil.DeserializeJsonToObjectFromFile<Dictionary<string, string>>(filePath);
string base64Img = projectMap["base64Img"];
aoiProject.standardImage = Base64Util.ToImage(base64Img);
// string base64Img = projectMap["base64Img"];
// aoiProject.standardImage = Base64Util.ToImage(base64Img);
string methodMapJson = projectMap["methodMap"];
var jsonMap = JsonUtil.DeserializeJsonToObject<Dictionary<string, string>>(methodMapJson);
foreach (var item in jsonMap)
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!