Browse Source

模拟器chamber选择由手动改动变为都rt配置文件

lixiang 1 year ago
parent
commit
e52d3832a4

+ 5 - 1
Venus/Venus_Simulator/App.xaml.cs

@@ -1,6 +1,7 @@
 using System.Windows;
 using Venus_Simulator.Instances;
 using MECF.Framework.UI.Core.Applications;
+using Venus_Core;
 
 namespace Venus_Simulator
 {
@@ -12,11 +13,14 @@ namespace Venus_Simulator
         protected override void OnStartup(StartupEventArgs e)
         {
             base.OnStartup(e);
+            SystemConfig.Instance.Initialize();
+
 
             UiApplication.Instance.Initialize(new UiInstance());
 
             SimulatorSystem.Instance.Initialize();
-            SystemConfig.Instance.Initialize();
+
+
         }
 
         protected override void OnExit(ExitEventArgs e)

+ 2 - 0
Venus/Venus_Simulator/Instances/SimulatorSystem.cs

@@ -41,6 +41,8 @@ namespace Venus_Simulator.Instances
             //_MockDevices.Add(ModuleName.PMB, new AdTecMatchMock());
 
             // TODO
+            SimulatorJetChamber.CurrentPMAChamber = (JetChamber)SystemConfig.Instance.GetValue<int>($"PMA.ChamberType");
+            SimulatorJetChamber.CurrentPMBChamber = (JetChamber)SystemConfig.Instance.GetValue<int>($"PMB.ChamberType");
         }
 
         ~SimulatorSystem()

+ 1 - 0
Venus/Venus_Simulator/JetChamber.cs

@@ -1,4 +1,5 @@
 using Venus_Core;
+using Venus_Simulator.Instances;
 
 namespace Venus_Simulator
 {