Skip to content

孙克 / AccAOI

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 4645d3ac 由 LN
选项

增加默认打开路径

1 个父辈 ae03e891
内嵌 并排
正在显示 2 个修改的文件 包含 48 行增加 和 22 行删除
AOI/AoiProject.cs
...@@ -102,27 +102,35 @@ namespace AOI ...@@ -102,27 +102,35 @@ namespace AOI
/// 加载项目 /// 加载项目
/// </summary> /// </summary>
/// <param name="filePath"></param> /// <param name="filePath"></param>
public void Load(string filePath) public string Load(string filePath)
{ {
Dictionary<string, string> projectMap = JsonUtil.DeserializeJsonToObjectFromFile<Dictionary<string, string>>(filePath); try
string base64Img = projectMap["base64Img"];
this.standardImage = Base64Util.ToImage(base64Img);
string methodMapJson = projectMap["methodMap"];
var jsonMap = JsonUtil.DeserializeJsonToObject<Dictionary<string, string>>(methodMapJson);
foreach(var item in jsonMap)
{ {
JObject obj = JObject.Parse(item.Value); Dictionary<string, string> projectMap = JsonUtil.DeserializeJsonToObjectFromFile<Dictionary<string, string>>(filePath);
string fullTypeName = obj.Value<string>("FullTypeName"); string base64Img = projectMap["base64Img"];
Type t = Type.GetType(fullTypeName); this.standardImage = Base64Util.ToImage(base64Img);
JsonSerializer serializer = new JsonSerializer(); string methodMapJson = projectMap["methodMap"];
StringReader sr = new StringReader(item.Value); var jsonMap = JsonUtil.DeserializeJsonToObject<Dictionary<string, string>>(methodMapJson);
object o = serializer.Deserialize(new JsonTextReader(sr), t); foreach (var item in jsonMap)
AoiMethod aoiMethod = (AoiMethod)o; {
string PathDataStr = obj.Value<string>("PathDataStr"); JObject obj = JObject.Parse(item.Value);
PathData pathData = JsonUtil.DeserializeJsonToObject<PathData>(PathDataStr); string fullTypeName = obj.Value<string>("FullTypeName");
aoiMethod.RoiPath = new GraphicsPath(pathData.Points, pathData.Types); Type t = Type.GetType(fullTypeName);
methodMap.Add(item.Key, aoiMethod); JsonSerializer serializer = new JsonSerializer();
StringReader sr = new StringReader(item.Value);
object o = serializer.Deserialize(new JsonTextReader(sr), t);
AoiMethod aoiMethod = (AoiMethod)o;
string PathDataStr = obj.Value<string>("PathDataStr");
PathData pathData = JsonUtil.DeserializeJsonToObject<PathData>(PathDataStr);
aoiMethod.RoiPath = new GraphicsPath(pathData.Points, pathData.Types);
methodMap.Add(item.Key, aoiMethod);
return "";
}
}catch(Exception ex)
{
return ex.ToString();
} }
return "";
} }
......
AccAOI/FrmAoiSetting.cs
...@@ -18,20 +18,26 @@ namespace AccAOI ...@@ -18,20 +18,26 @@ namespace AccAOI
public static Image Img = null; public static Image Img = null;
private AoiProject Project = null; private AoiProject Project = null;
private bool CanSel = true; private bool CanSel = true;
private string DefaultPath = "";
public FrmAoiSetting() public FrmAoiSetting()
{ {
InitializeComponent(); InitializeComponent();
this.WindowState = FormWindowState.Maximized; this.WindowState = FormWindowState.Maximized;
} }
public FrmAoiSetting(string programPath, Image image = null) public FrmAoiSetting(string programPath, Image image = null, string defaultPath = "")
{ {
InitializeComponent(); InitializeComponent();
this.WindowState = FormWindowState.Maximized; this.WindowState = FormWindowState.Maximized;
if (!programPath.Equals("") && (image != null)) if (!programPath.Equals("") && (image != null))
{ {
Project = new AoiProject(image); Project = new AoiProject(image);
Project.Load(programPath); string result = Project.Load(programPath);
if (!result.Equals(""))
{
MessageBox.Show("加载项目" + programPath + "失败：\r\n" + result);
}
} }
DefaultPath = defaultPath;
ShowPorject(); ShowPorject();
} }
...@@ -57,6 +63,7 @@ namespace AccAOI ...@@ -57,6 +63,7 @@ namespace AccAOI
openDialog.Title = "打开本地图片"; openDialog.Title = "打开本地图片";
openDialog.Filter = "All Supported Images (*.bmp;*.dib;*.rle;*.gif;*.jpg;*.png)|*.bmp;*.dib;*.rle;*.gif;*.jpg;*.png|Bitmaps (*.bmp;*.dib;*.rle)|*.bmp;*.dib;*.rle|Graphics Interchange Format (*.gif)|*.gif|Joint Photographic Experts (*.jpg)|*.jpg|Portable Network Graphics (*.png)|*.png|All Files (*.*)|*.*"; openDialog.Filter = "All Supported Images (*.bmp;*.dib;*.rle;*.gif;*.jpg;*.png)|*.bmp;*.dib;*.rle;*.gif;*.jpg;*.png|Bitmaps (*.bmp;*.dib;*.rle)|*.bmp;*.dib;*.rle|Graphics Interchange Format (*.gif)|*.gif|Joint Photographic Experts (*.jpg)|*.jpg|Portable Network Graphics (*.png)|*.png|All Files (*.*)|*.*";
openDialog.DefaultExt = "png"; openDialog.DefaultExt = "png";
//openDialog.DefaultExt = "png"; //openDialog.DefaultExt = "png";
System.Windows.Forms.DialogResult result = openDialog.ShowDialog(); System.Windows.Forms.DialogResult result = openDialog.ShowDialog();
if (result == System.Windows.Forms.DialogResult.Cancel) if (result == System.Windows.Forms.DialogResult.Cancel)
...@@ -85,6 +92,10 @@ namespace AccAOI ...@@ -85,6 +92,10 @@ namespace AccAOI
System.Windows.Forms.OpenFileDialog openDialog = new System.Windows.Forms.OpenFileDialog(); System.Windows.Forms.OpenFileDialog openDialog = new System.Windows.Forms.OpenFileDialog();
openDialog.Title = "打开项目"; openDialog.Title = "打开项目";
openDialog.Filter = "(*.data)|*.data|(*.*)|*.*"; openDialog.Filter = "(*.data)|*.data|(*.*)|*.*";
if (!String.IsNullOrEmpty(DefaultPath))
{
openDialog.InitialDirectory = DefaultPath;
}
//openDialog.DefaultExt = "png"; //openDialog.DefaultExt = "png";
System.Windows.Forms.DialogResult result = openDialog.ShowDialog(); System.Windows.Forms.DialogResult result = openDialog.ShowDialog();
if (result == System.Windows.Forms.DialogResult.Cancel) if (result == System.Windows.Forms.DialogResult.Cancel)
...@@ -93,8 +104,11 @@ namespace AccAOI ...@@ -93,8 +104,11 @@ namespace AccAOI
} }
string fileName = openDialog.FileName; string fileName = openDialog.FileName;
Project = new AoiProject(Img); Project = new AoiProject(Img);
Project.Load(fileName); string msg = Project.Load(fileName);
if (!msg.Equals(""))
{
MessageBox.Show("加载项目" + fileName + "失败：\r\n" + msg);
}
ShowPorject(); ShowPorject();
} }
...@@ -109,6 +123,10 @@ namespace AccAOI ...@@ -109,6 +123,10 @@ namespace AccAOI
System.Windows.Forms.SaveFileDialog saveFileDialog = new System.Windows.Forms.SaveFileDialog(); System.Windows.Forms.SaveFileDialog saveFileDialog = new System.Windows.Forms.SaveFileDialog();
saveFileDialog.Title = "保存项目"; saveFileDialog.Title = "保存项目";
saveFileDialog.Filter = "(*.data)|*.data|(*.*)|*.*"; saveFileDialog.Filter = "(*.data)|*.data|(*.*)|*.*";
if (!String.IsNullOrEmpty(DefaultPath))
{
saveFileDialog.InitialDirectory = DefaultPath;
}
//openDialog.DefaultExt = "png"; //openDialog.DefaultExt = "png";
System.Windows.Forms.DialogResult result = saveFileDialog.ShowDialog(); System.Windows.Forms.DialogResult result = saveFileDialog.ShowDialog();
if (result == System.Windows.Forms.DialogResult.Cancel) if (result == System.Windows.Forms.DialogResult.Cancel)
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!