diff options
| author | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2025-07-13 13:51:53 +0300 |
|---|---|---|
| committer | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2025-07-13 13:51:53 +0300 |
| commit | e528e98507e3822edb20390d95716f0385c5b826 (patch) | |
| tree | 4e1bf72c0ffc9c122ca3bce88caa8b1688350c61 /Software/Visual_Studio/PPC/Tango.PPC.UI | |
| parent | 74a17c16836a23edc6f0c4b4027a85cf04a63a86 (diff) | |
| download | Tango-e528e98507e3822edb20390d95716f0385c5b826.tar.gz Tango-e528e98507e3822edb20390d95716f0385c5b826.zip | |
Fixed module loading issue.
Diffstat (limited to 'Software/Visual_Studio/PPC/Tango.PPC.UI')
| -rw-r--r-- | Software/Visual_Studio/PPC/Tango.PPC.UI/Modules/DefaultPPCModuleLoader.cs | 27 | ||||
| -rw-r--r-- | Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs | 2 |
2 files changed, 16 insertions, 13 deletions
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Modules/DefaultPPCModuleLoader.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Modules/DefaultPPCModuleLoader.cs index 14f9db927..668188901 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Modules/DefaultPPCModuleLoader.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Modules/DefaultPPCModuleLoader.cs @@ -16,6 +16,7 @@ using Tango.PPC.Jobs; using System.Windows.Data; using Tango.Core.DI; using Tango.Settings; +using System.Threading; namespace Tango.PPC.UI.Modules { @@ -89,18 +90,18 @@ namespace Tango.PPC.UI.Modules if (!_loaded) { - //Preloaded - if (settings.UseJobsModuleV2) - { - LogManager.Log(String.Format("Loading module '{0}'...", nameof(JobsV2Module))); - AllModules.Add(new JobsV2Module()); - } - else - { - //LogManager.Log(String.Format("Loading module '{0}'...", nameof(JobsModule))); - //AllModules.Add(new JobsModule()); - } - //Preloaded + ////Preloaded + //if (settings.UseJobsModuleV2) + //{ + // LogManager.Log(String.Format("Loading module '{0}'...", nameof(JobsV2Module))); + // AllModules.Add(new JobsV2Module()); + //} + //else + //{ + // //LogManager.Log(String.Format("Loading module '{0}'...", nameof(JobsModule))); + // //AllModules.Add(new JobsModule()); + //} + ////Preloaded AllModules.Clear(); string assemblyFolder = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); @@ -162,6 +163,8 @@ namespace Tango.PPC.UI.Modules UserModules = AllModules.ToObservableCollection(); } + Thread.Sleep(1000); + ModulesLoaded?.Invoke(this, new EventArgs()); } diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs index 2287a486a..f068c73d6 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs @@ -8,4 +8,4 @@ using System.Windows; // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("Tango PPC Application")] -[assembly: AssemblyVersion("3.0.4.0")] +[assembly: AssemblyVersion("3.0.6.0")] |