diff --git a/Rs.Controls/Rs.Controls.csproj b/Rs.Controls/Rs.Controls.csproj
index 9467f75..bd79e0b 100644
--- a/Rs.Controls/Rs.Controls.csproj
+++ b/Rs.Controls/Rs.Controls.csproj
@@ -38,6 +38,10 @@
C:\Users\Administrator\Desktop\1\bin\Debug\HWindow_Tool.dll
+
+ False
+ C:\Users\Administrator\Desktop\新建文件夹 (3)\Rs.MotionPlat\Rs.Framework\bin\Debug\Newtonsoft.Json.dll
+
diff --git a/Rs.Controls/RsTray.cs b/Rs.Controls/RsTray.cs
index 6367e6e..6074de9 100644
--- a/Rs.Controls/RsTray.cs
+++ b/Rs.Controls/RsTray.cs
@@ -32,6 +32,7 @@ namespace Rs.Controls
public partial class RsTray : UserControl
{
+ public string RecipeName { get; set; } = "default";
private int CurrentSlot { get; set; } = 1;
private TrayInfo trayInfo;
@@ -255,7 +256,7 @@ namespace Rs.Controls
public void Init()
{
trayInfo = new TrayInfo(SortDir, RowNum, ColumnNum, ItemName);
- trayInfo = trayInfo.Init();
+ trayInfo = trayInfo.Init(RecipeName);
}
public bool Save()
@@ -703,7 +704,7 @@ namespace Rs.Controls
}
}
}
- string dirPath = Path.Combine(GlobalVar.Instance.RecipeDir, ItemName);
+ string dirPath = Path.Combine(rsTray.RecipeName, ItemName);
if (!Directory.Exists(dirPath))
{
Directory.CreateDirectory(dirPath);
@@ -718,9 +719,9 @@ namespace Rs.Controls
}
- public TrayInfo Init()
+ public TrayInfo Init(string recipeName)
{
- string dirPath = Path.Combine(GlobalVar.Instance.RecipeDir, ItemName);
+ string dirPath = Path.Combine(recipeName, ItemName);
if (!Directory.Exists(dirPath))
{
Directory.CreateDirectory(dirPath);
diff --git a/Rs.MotionPlat/Rs.MotionPlat.csproj b/Rs.MotionPlat/Rs.MotionPlat.csproj
index 27c6747..4d271d9 100644
--- a/Rs.MotionPlat/Rs.MotionPlat.csproj
+++ b/Rs.MotionPlat/Rs.MotionPlat.csproj
@@ -89,7 +89,9 @@
+
+
@@ -138,11 +140,11 @@
FormMain.cs
-
+
Form
-
- Home2.cs
+
+ Home.cs
Form
@@ -251,8 +253,8 @@
FormMain.cs
-
- Home2.cs
+
+ Home.cs
MonitorConfig.cs