diff --git a/PortfolioManager/UIUtils/CartesianPointSeriesViewII.cs b/PortfolioManager/UIUtils/CartesianPointSeriesViewII.cs deleted file mode 100644 index 48681be..0000000 --- a/PortfolioManager/UIUtils/CartesianPointSeriesViewII.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Avalonia.Media; -using Eremex.AvaloniaUI.Charts; -using Eremex.AvaloniaUI.Charts.Native; - -namespace Eremex.AvaloniaUI.Charts -{ - public class CartesianPointSeriesViewII : CartesianPointSeriesView - { - public CartesianPointSeriesViewII() - { - } - - protected override SeriesViewPainter CreatePainter() - { - return new MarkerPainter(); - } - } -} \ No newline at end of file diff --git a/PortfolioManager/ViewModels/BollingerBandViewModel.cs b/PortfolioManager/ViewModels/BollingerBandViewModel.cs index dd4c0bd..80a4238 100644 --- a/PortfolioManager/ViewModels/BollingerBandViewModel.cs +++ b/PortfolioManager/ViewModels/BollingerBandViewModel.cs @@ -102,17 +102,21 @@ namespace PortfolioManager.ViewModels private CompositeDataSource compositeDataSourceTradePoints = null; private BollingerBands bollingerBands; - - public BollingerBandViewModel(bool loadedFromParams = false) + + public BollingerBandViewModel() { -// CartesianLineSeriesView ch = new CartesianLineSeriesView(); - CartesianPointSeriesView ch = new CartesianPointSeriesView(); - - InitializeDataSources(); PropertyChanged += OnViewModelPropertyChanged; DisplayName = "Bollinger"; - Initialize(loadedFromParams ? false : true); + Initialize(true); + } + + public BollingerBandViewModel(bool loadedFromParams = false) + { + InitializeDataSources(); + PropertyChanged += OnViewModelPropertyChanged; + DisplayName = "Bollinger"; + Initialize(false); } protected override void OnDispose() @@ -229,7 +233,7 @@ namespace PortfolioManager.ViewModels } set { - if (String.IsNullOrEmpty(selectedSymbol)) + if (String.IsNullOrEmpty(value)) { return; } diff --git a/PortfolioManager/Views/BollingerBandView.axaml b/PortfolioManager/Views/BollingerBandView.axaml index 222f879..6142eb8 100644 --- a/PortfolioManager/Views/BollingerBandView.axaml +++ b/PortfolioManager/Views/BollingerBandView.axaml @@ -6,7 +6,6 @@ xmlns:vw="using:PortfolioManager.Views" xmlns:md="using:PortfolioManager.Models" xmlns:local="using:PortfolioManager.UIUtils" - xmlns:localmxc="using:Eremex.AvaloniaUI.Charts" xmlns:li="using:LoadingIndicators.Avalonia" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" xmlns:mxc="https://schemas.eremexcontrols.net/avalonia/charts" @@ -158,7 +157,7 @@ - + diff --git a/PortfolioManager/saveparams.config b/PortfolioManager/saveparams.config index e17316f..523cdbd 100644 --- a/PortfolioManager/saveparams.config +++ b/PortfolioManager/saveparams.config @@ -4,3 +4,4 @@ Type,PortfolioManager.ViewModels.CMTrendViewModel,PathFileName,C:\boneyard\marke Type,PortfolioManager.ViewModels.MGSHMomentumViewModel,PathFileName,C:\boneyard\marketdata\Sessions\MGSH20250331.TXT Type,PortfolioManager.ViewModels.BollingerBandViewModel,SelectedSymbol,NRG,SelectedWatchList,Valuations,SelectedDayCount,360,SyncTradeToBand,True,ShowTradeLabels,True,UseLeastSquaresFit,True,ShowInsiderTransactions,True Type,PortfolioManager.ViewModels.BollingerBandViewModel,SelectedSymbol,DBX,SelectedWatchList,Valuations,SelectedDayCount,180,SyncTradeToBand,False,ShowTradeLabels,True,UseLeastSquaresFit,True,ShowInsiderTransactions,True +Type,PortfolioManager.ViewModels.BollingerBandViewModel,SelectedSymbol,CRS,SelectedWatchList,Valuations,SelectedDayCount,90,SyncTradeToBand,True,ShowTradeLabels,True,UseLeastSquaresFit,True,ShowInsiderTransactions,True