use the dictionary from Main form

Sayter99 · Aug 30, 2017 · 75f14c3 · 75f14c3
1 parent 89be17a
commit 75f14c3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/86ME/FSMGen.cs b/86ME/FSMGen.cs
@@ -43,6 +43,7 @@ class FSMGen
         private List<int> keyboard_keys = new List<int>();
         private List<ME_Trigger> commands;
         private NewMotion Motion;
+        private Dictionary<string, string> FSMGen_lang_dic;
         private bool[] method_flag = new bool[16];
         private int[] offset = new int[45];
         private string[] ps2_pins = new string[4];
@@ -56,8 +57,10 @@ class FSMGen
         private bool IMU_compensatory = false;
         private Quaternion invQ = new Quaternion();
 
-        public FSMGen(NewMotion nMotion, int[] off, ArrayList motionlist, GlobalSettings gs, int opVar_num, List<ME_Trigger> trigger_cmd)
+        public FSMGen(NewMotion nMotion, int[] off, ArrayList motionlist, GlobalSettings gs,
+                      int opVar_num, List<ME_Trigger> trigger_cmd, Dictionary<string, string> lang_dic)
         {
+            this.FSMGen_lang_dic = lang_dic;
             this.Motion = nMotion;
             this.opVar_num = opVar_num;
             this.offset = off;
@@ -2069,7 +2072,7 @@ private void generate_example2(TextWriter writer, string class_name)
         public void generate_AllinOne()
         {
             FolderBrowserDialog path = new FolderBrowserDialog();
-            path.Description = Motion.NewMotion_lang_dic["GenerateAllInOne_Description"];
+            path.Description = FSMGen_lang_dic["GenerateAllInOne_Description"];
             var dialogResult = path.ShowDialog();
 
             if (dialogResult == DialogResult.OK && path.SelectedPath != null)
@@ -2120,7 +2123,7 @@ public void generate_AllinOne()
         public void generate_Library(string library_dir = "")
         {
             FolderBrowserDialog path = new FolderBrowserDialog();
-            path.Description = Motion.NewMotion_lang_dic["Generate_Description"];
+            path.Description = FSMGen_lang_dic["Generate_Description"];
             var dialogResult = path.ShowDialog();
 
             if (dialogResult == DialogResult.OK && path.SelectedPath != null)
@@ -2422,7 +2425,7 @@ private void generate_s2e(string path, string port)
 
         public void generate_ScratchProject()
         {
-            ScratchProperty properties = new ScratchProperty(Motion.NewMotion_lang_dic);
+            ScratchProperty properties = new ScratchProperty(FSMGen_lang_dic);
             var dialogResult = properties.ShowDialog();
             string path = properties.path;
             if (dialogResult == DialogResult.OK)

diff --git a/86ME/Main.cs b/86ME/Main.cs
@@ -3705,7 +3705,7 @@ private void Generate_Click(object sender, EventArgs e)
                 MessageBox.Show(Main_lang_dic["errorMsg16"]);
                 return;
             }
-            FSMGen g = new FSMGen(Motion, offset, ME_Motionlist, gs, compute_var.Count, trigger_cmd);
+            FSMGen g = new FSMGen(Motion, offset, ME_Motionlist, gs, compute_var.Count, trigger_cmd, Main_lang_dic);
             string lib_dir = Path.GetFileNameWithoutExtension(load_filename);
             //if ((new System.Text.RegularExpressions.Regex("^[a-zA-Z0-9_]{1,20}$")).IsMatch(lib_dir))
             //    g.generate_Library("\\" + lib_dir);
@@ -3724,7 +3724,7 @@ private void GenerateAllInOne_Click(object sender, EventArgs e)
                 MessageBox.Show(Main_lang_dic["errorMsg16"]);
                 return;
             }
-            FSMGen g = new FSMGen(Motion, offset, ME_Motionlist, gs, compute_var.Count, trigger_cmd);
+            FSMGen g = new FSMGen(Motion, offset, ME_Motionlist, gs, compute_var.Count, trigger_cmd, Main_lang_dic);
             g.generate_AllinOne();
             clearTmpData();
         }
@@ -3738,7 +3738,7 @@ private void GenerateScratch_Click(object sender, EventArgs e)
                 MessageBox.Show(Main_lang_dic["errorMsg16"]);
                 return;
             }
-            FSMGen g = new FSMGen(Motion, offset, ME_Motionlist, gs, compute_var.Count, trigger_cmd);
+            FSMGen g = new FSMGen(Motion, offset, ME_Motionlist, gs, compute_var.Count, trigger_cmd, Main_lang_dic);
             g.generate_ScratchProject();
             clearTmpData();
         }