Merge branch 'master' of https://github.com/visualHFT/VisualHFT

Author: silahian

ViewModel/vmDashboard.cs

@@ -48,21 +48,23 @@ private async Task LoadTilesAsync()
             {
                 try
                 {
-                    //first, load single studies
-                    foreach (var study in PluginManager.PluginManager.AllPlugins.Where(x => x is IStudy && x.GetCustomUI() == null))
-                    {
+                    var allPlugins = PluginManager.PluginManager.AllPlugins;
+
+                    // Group plugins by their type and UI characteristics
+                    var singleStudiesWithoutUI = allPlugins.Where(x => x is IStudy && x.GetCustomUI() == null);
+                    var multiStudiesWithoutUI = allPlugins.Where(x => x is IMultiStudy && x.GetCustomUI() == null);
+                    var pluginsWithUI = allPlugins.Where(x => x is PluginManager.IPlugin && x.GetCustomUI() != null);
+
+                    // Load tiles in this specific order (single studies, multi studies, plugins with UI)
+                    foreach (var study in singleStudiesWithoutUI)
                         Tiles.Add(new vmTile(study as IStudy));
-                    }
-                    //then, load multi-studies
-                    foreach (var study in PluginManager.PluginManager.AllPlugins.Where(x => x is IMultiStudy && x.GetCustomUI() == null))
-                    {
+
+                    foreach (var study in multiStudiesWithoutUI)
                         Tiles.Add(new vmTile(study as IMultiStudy));
-                    }
-                    //then, load custom UIs
-                    foreach (var study in PluginManager.PluginManager.AllPlugins.Where(x => x is PluginManager.IPlugin && x.GetCustomUI() != null))
-                    {
+
+                    foreach (var study in pluginsWithUI)
                         Tiles.Add(new vmTile(study as PluginManager.IPlugin));
-                    }
+
                 }
                 catch (Exception ex)
                 {
@@ -155,7 +157,8 @@ public string SelectedStrategy
                     RaisePropertyChanged(nameof(SelectedStrategy));
                     RaisePropertyChanged(nameof(SelectedSymbol));
                     RaisePropertyChanged(nameof(SelectedLayer));
-                };
+                }
+                ;
             }
         }
         public string SelectedSymbol

ViewModel/vmTile.cs

@@ -10,7 +10,7 @@
 using VisualHFT.Commons.Studies;
 using VisualHFT.View;
 using System.Collections.ObjectModel;
-using System.Windows.Controls; 
+using System.Windows.Controls;
 
 namespace VisualHFT.ViewModel
 {
@@ -52,9 +52,11 @@ public vmTile(IStudy study)
             IsGroup = false;
 
             _study = study;
+            _customControl = _study.GetCustomUI() as UserControl;
+            IsUserControl = _customControl != null;
             _tile_id = ((PluginManager.IPlugin)_study).GetPluginUniqueID();
             Title = _study.TileTitle;
-            Tooltip = _study.TileToolTip; 
+            Tooltip = _study.TileToolTip;
 
             _localModel.ValueFormatted = ".";
             _localModel.Tooltip = "Waiting for data...";
@@ -63,13 +65,18 @@ public vmTile(IStudy study)
 
             OpenSettingsCommand = new RelayCommand<vmTile>(OpenSettings);
             OpenChartCommand = new RelayCommand<vmTile>(OpenChartClick);
-             
-
             uiUpdater = new UIUpdater(uiUpdaterAction, UI_UPDATE_TIME_MS);
 
+            if (IsUserControl)
+            {
+                IsGroup = true;
+                ValueVisibility = Visibility.Hidden;
+                UCVisibility = Visibility.Visible;
+
+                OpenSettingsCommand = new RelayCommand<vmTile>(OpenSettings);
+            }
             RaisePropertyChanged(nameof(SelectedSymbol));
             RaisePropertyChanged(nameof(SelectedProviderName));
-
             RaisePropertyChanged(nameof(IsGroup));
             SettingButtonVisibility = Visibility.Visible;
             ChartButtonVisibility = Visibility.Visible;
@@ -194,7 +201,7 @@ public void UpdateAllUI()
             RaisePropertyChanged(nameof(SelectedProviderName));
         }
 
-        public ICommand OpenSettingsCommand { get; set; } 
+        public ICommand OpenSettingsCommand { get; set; }
         public ICommand OpenChartCommand { get; private set; }
 
         public string Value { get => _value; set => SetProperty(ref _value, value); }
@@ -300,7 +307,7 @@ private void OpenSettings(object obj)
             RaisePropertyChanged(nameof(SelectedProviderName));
 
         }
-         
+
         protected virtual void Dispose(bool disposing)
         {
             if (!_disposed)

VisualHFT.Commons.WPF/Helper/UIUpdater.cs

@@ -13,8 +13,8 @@ public class UIUpdater : IDisposable
 
         public UIUpdater(Action updateAction, double debounceTimeInMilliseconds = 30)
         {
+            debounceTimeInMilliseconds = Math.Max(debounceTimeInMilliseconds, 1); // Ensure debounce time is at least 1 ms
             _updateAction = updateAction;
-
             _debounceTimer = new DispatcherTimer();
             _debounceTimer.Interval = TimeSpan.FromMilliseconds(debounceTimeInMilliseconds);
             _debounceTimer.Tick += _debounceTimer_Tick;

VisualHFT.Commons/Studies/IStudy.cs

@@ -11,6 +11,9 @@ public interface IStudy : IDisposable
         Task StopAsync();
         string TileTitle { get; set; }
         string TileToolTip { get; set; }
+        object GetCustomUI();   //Allow to setup own UI for the plugin
+        //using object type because this csproj doesn't support UI
+
     }
 
 }