Merge pull request #64 from visualHFT/profiled-improvments

Profiled improvments

Author: silahian

ViewModel/vmTile.cs

@@ -56,7 +56,6 @@ public vmTile(IStudy study)
             Title = _study.TileTitle;
             Tooltip = _study.TileToolTip;
 
-            _localModel.ValueFormatted = ".";
             _localModel.Tooltip = "Waiting for data...";
 
             _study.OnCalculated += _study_OnCalculated;
@@ -94,7 +93,6 @@ public vmTile(IMultiStudy multiStudy)
             Title = _multiStudy.TileTitle;
             Tooltip = _multiStudy.TileToolTip;
 
-            _localModel.ValueFormatted = ".";
             _localModel.Tooltip = "Waiting for data...";
 
             OpenSettingsCommand = new RelayCommand<vmTile>(OpenSettings);
@@ -159,9 +157,10 @@ private void _study_OnCalculated(object? sender, BaseStudyModel e)
                 _localModel.copyFrom(e);
             }
 
-            if (_localModel.ValueFormatted == ".")
+
+            if (!_localModel.HasData && !_localModel.HasError && !_localModel.IsStale)
                 _localModel.Tooltip = "Waiting for data...";
-            else if (!string.IsNullOrEmpty(_localModel.Tooltip))
+            else if (!string.IsNullOrEmpty(e.Tooltip))
                 _localModel.Tooltip = e.Tooltip;
             else
                 _localModel.Tooltip = null;
@@ -172,16 +171,16 @@ private void _study_OnCalculated(object? sender, BaseStudyModel e)
 
         ~vmTile() { Dispose(false); }
 
+        // In uiUpdaterAction - format on demand:
         private void uiUpdaterAction()
         {
             if (_localModel == null || !_DATA_AVAILABLE)
                 return;
             lock (_lock)
             {
-                Value = _localModel.ValueFormatted;
+                Value = GetDisplayValue(_localModel);
                 ValueTooltip = _localModel.Tooltip;
 
-                //update color if set or has changed
                 if (_localModel.ValueColor != null)
                 {
                     if (_valueColor == null || _valueColor.ToString() != _localModel.ValueColor)
@@ -191,6 +190,33 @@ private void uiUpdaterAction()
                 _DATA_AVAILABLE = true;
             }
         }
+        /// <summary>
+        /// Gets the display value based on model state.
+        /// Formatting happens here (UI layer) only when needed.
+        /// </summary>
+        private static string GetDisplayValue(BaseStudyModel model)
+        {
+            // Priority: Error > Stale > No Data > Normal
+            if (model.HasError)
+                return "Err";
+
+            if (model.IsStale)
+                return "...";
+
+            if (!model.HasData)
+                return ".";
+
+            // Normal case: format the value
+            if (model.CustomFormatter != null)
+                return model.CustomFormatter(model.Value);
+
+            if (string.IsNullOrEmpty(model.Format))
+                return model.Value.ToString();
+
+            return model.Value.ToString(model.Format);
+        }
+
+
         public void UpdateAllUI()
         {
             _DATA_AVAILABLE = true;
@@ -341,7 +367,31 @@ protected virtual void Dispose(bool disposing)
                                     }
                                 }
                                 ChildTiles.Clear();
+                                ChildTiles = null;
                             }
+
+                            // Dispose the multi-study itself
+                            foreach (var study in _multiStudy.Studies)
+                            {
+                                try
+                                {
+                                    study.StopAsync();
+                                    study.Dispose();
+                                }
+                                catch (Exception ex)
+                                {
+                                    System.Diagnostics.Debug.WriteLine($"Error disposing study: {ex.Message}");
+                                }
+                            }
+                            _multiStudy.Dispose();
+                            _multiStudy = null;
+                        }
+
+                        // Dispose plugin
+                        if (_plugin != null)
+                        {
+                            // Note: Plugin disposal handled by PluginManager
+                            _plugin = null;
                         }
 
                         // Dispose UI updater

VisualHFT.Commons/Model/BaseStudyModel.cs

@@ -6,10 +6,15 @@ public partial class BaseStudyModel
     {
         private DateTime _timestamp;
         private decimal _value;
-        private string _valueFormatted;
         private string _format;
         private string _valueColor = null;
         private decimal _marketMidPrice;
+        private bool _hasData = false;
+
+        /// <summary>
+        /// Optional custom formatter. When set, UI uses this instead of Format string.
+        /// </summary>
+        public Func<decimal, string> CustomFormatter { get; set; }
 
         public BaseStudyModel()
         {
@@ -20,57 +25,91 @@ public DateTime Timestamp
             get => _timestamp;
             set => _timestamp = value;
         }
+
         public decimal Value
         {
             get => _value;
-            set => _value = value;
+            set
+            {
+                _value = value;
+                _hasData = true;
+            }
         }
 
+        /// <summary>
+        /// Standard .NET format string (e.g., "n1", "F2").
+        /// Ignored if CustomFormatter is set.
+        /// </summary>
         public string Format
         {
             get => _format;
             set => _format = value;
         }
-        public string ValueFormatted
-        {
-            get => _valueFormatted;
-            set => _valueFormatted = value;
-        }
+
+        /// <summary>
+        /// Indicates whether real data has been received.
+        /// False = waiting for data (".")
+        /// True = has valid data or had data but now stale ("...")
+        /// </summary>
+        public bool HasData => _hasData;
+
+        /// <summary>
+        /// Indicates an error state ("Err").
+        /// When true, UI should display error indicator.
+        /// </summary>
+        public bool HasError { get; set; }
+
+        /// <summary>
+        /// Indicates stale data state ("...").
+        /// When true, data was received but is now stale.
+        /// </summary>
+        public bool IsStale { get; set; }
+
         public string ValueColor
         {
             get => _valueColor;
             set => _valueColor = value;
         }
+
         public decimal MarketMidPrice
         {
             get => _marketMidPrice;
             set => _marketMidPrice = value;
         }
+
         public string Tooltip { get; set; }
         public string Tag { get; set; }
         public bool AddItemSkippingAggregation { get; set; }
 
         public void copyFrom(BaseStudyModel e)
         {
-            _timestamp = e.Timestamp;
-            _value = e.Value;
-            _format = e.Format;
-            _valueFormatted = e.ValueFormatted;
-            _valueColor = e.ValueColor;
-            _marketMidPrice = e.MarketMidPrice;
+            _timestamp = e._timestamp;
+            _value = e._value;
+            _format = e._format;
+            _hasData = e._hasData;
+            CustomFormatter = e.CustomFormatter;
+            _valueColor = e._valueColor;
+            _marketMidPrice = e._marketMidPrice;
+            HasError = e.HasError;
+            IsStale = e.IsStale;
             Tooltip = e.Tooltip;
+            Tag = e.Tag;
             AddItemSkippingAggregation = false;
         }
 
         public void Reset()
         {
             _timestamp = DateTime.MinValue;
             _value = 0;
-            _format = "";
-            _valueFormatted = "";
-            _valueColor = "";
+            _format = null;
+            _hasData = false;
+            CustomFormatter = null;
+            _valueColor = null;
             _marketMidPrice = 0;
-            Tooltip = "";
+            HasError = false;
+            IsStale = false;
+            Tooltip = null;
+            Tag = null;
             AddItemSkippingAggregation = false;
         }
     }