diff --git a/PortfolioManager/Assets/AmberTriangleDown.png b/PortfolioManager/Assets/AmberTriangleDown.png new file mode 100644 index 0000000..9aa482b Binary files /dev/null and b/PortfolioManager/Assets/AmberTriangleDown.png differ diff --git a/PortfolioManager/Assets/AmberTriangleUp.png b/PortfolioManager/Assets/AmberTriangleUp.png index 158a36a..f5c720c 100644 Binary files a/PortfolioManager/Assets/AmberTriangleUp.png and b/PortfolioManager/Assets/AmberTriangleUp.png differ diff --git a/PortfolioManager/Assets/Blank.png b/PortfolioManager/Assets/Blank.png new file mode 100644 index 0000000..5b93c00 Binary files /dev/null and b/PortfolioManager/Assets/Blank.png differ diff --git a/PortfolioManager/Assets/BlueTriangleDown.png b/PortfolioManager/Assets/BlueTriangleDown.png new file mode 100644 index 0000000..2d0a110 Binary files /dev/null and b/PortfolioManager/Assets/BlueTriangleDown.png differ diff --git a/PortfolioManager/Assets/BlueTriangleUp.png b/PortfolioManager/Assets/BlueTriangleUp.png index d99ec39..2e20d6f 100644 Binary files a/PortfolioManager/Assets/BlueTriangleUp.png and b/PortfolioManager/Assets/BlueTriangleUp.png differ diff --git a/PortfolioManager/Assets/DarkBlueTriangleDown.png b/PortfolioManager/Assets/DarkBlueTriangleDown.png new file mode 100644 index 0000000..d2ab7be Binary files /dev/null and b/PortfolioManager/Assets/DarkBlueTriangleDown.png differ diff --git a/PortfolioManager/Assets/DarkBlueTriangleUp.png b/PortfolioManager/Assets/DarkBlueTriangleUp.png index 9b50619..36a7f8a 100644 Binary files a/PortfolioManager/Assets/DarkBlueTriangleUp.png and b/PortfolioManager/Assets/DarkBlueTriangleUp.png differ diff --git a/PortfolioManager/Assets/GreenTriangleDown.png b/PortfolioManager/Assets/GreenTriangleDown.png index 53574cb..81917ab 100644 Binary files a/PortfolioManager/Assets/GreenTriangleDown.png and b/PortfolioManager/Assets/GreenTriangleDown.png differ diff --git a/PortfolioManager/Assets/GreenTriangleUp.png b/PortfolioManager/Assets/GreenTriangleUp.png index 5b519fa..52f0a00 100644 Binary files a/PortfolioManager/Assets/GreenTriangleUp.png and b/PortfolioManager/Assets/GreenTriangleUp.png differ diff --git a/PortfolioManager/Assets/MagentaTriangleDown.png b/PortfolioManager/Assets/MagentaTriangleDown.png new file mode 100644 index 0000000..eccde9d Binary files /dev/null and b/PortfolioManager/Assets/MagentaTriangleDown.png differ diff --git a/PortfolioManager/Assets/MagentaTriangleUp.png b/PortfolioManager/Assets/MagentaTriangleUp.png index 24b29c2..eaa9b92 100644 Binary files a/PortfolioManager/Assets/MagentaTriangleUp.png and b/PortfolioManager/Assets/MagentaTriangleUp.png differ diff --git a/PortfolioManager/Assets/OrangeTriangleDown.png b/PortfolioManager/Assets/OrangeTriangleDown.png new file mode 100644 index 0000000..a7d0b41 Binary files /dev/null and b/PortfolioManager/Assets/OrangeTriangleDown.png differ diff --git a/PortfolioManager/Assets/OrangeTriangleUp.png b/PortfolioManager/Assets/OrangeTriangleUp.png index 63d223b..c76cbd2 100644 Binary files a/PortfolioManager/Assets/OrangeTriangleUp.png and b/PortfolioManager/Assets/OrangeTriangleUp.png differ diff --git a/PortfolioManager/Assets/RedTriangleDown.png b/PortfolioManager/Assets/RedTriangleDown.png index c3f6273..52f0abf 100644 Binary files a/PortfolioManager/Assets/RedTriangleDown.png and b/PortfolioManager/Assets/RedTriangleDown.png differ diff --git a/PortfolioManager/Assets/RedTriangleUp.png b/PortfolioManager/Assets/RedTriangleUp.png index 4aac92b..63245ba 100644 Binary files a/PortfolioManager/Assets/RedTriangleUp.png and b/PortfolioManager/Assets/RedTriangleUp.png differ diff --git a/PortfolioManager/Assets/YellowTriangleDown.png b/PortfolioManager/Assets/YellowTriangleDown.png new file mode 100644 index 0000000..bb8fa75 Binary files /dev/null and b/PortfolioManager/Assets/YellowTriangleDown.png differ diff --git a/PortfolioManager/Assets/YellowTriangleUp.png b/PortfolioManager/Assets/YellowTriangleUp.png index bac1a63..ed53b72 100644 Binary files a/PortfolioManager/Assets/YellowTriangleUp.png and b/PortfolioManager/Assets/YellowTriangleUp.png differ diff --git a/PortfolioManager/Cache/ImageCache.cs b/PortfolioManager/Cache/ImageCache.cs index 5eed752..ffdbb0c 100644 --- a/PortfolioManager/Cache/ImageCache.cs +++ b/PortfolioManager/Cache/ImageCache.cs @@ -5,6 +5,8 @@ using Avalonia.Media.Imaging; using System.Linq; using System.IO; using MarketData; +using MarketData.CNNProcessing; +using SkiaSharp; namespace PortfolioManager.Cache { @@ -29,6 +31,7 @@ namespace PortfolioManager.Cache pathToAssets = currentDirectory + "/Assets"; } MDTrace.WriteLine(LogLevel.DEBUG, $"Reading assets from {pathToAssets}"); + imageCache.Add(ImageCache.ImageType.BlueTriangleUp, new Bitmap(pathToAssets + "/BlueTriangleUp.png")); imageCache.Add(ImageCache.ImageType.GreenTriangleUp, new Bitmap(pathToAssets + "/GreenTriangleUp.png")); imageCache.Add(ImageCache.ImageType.GreenTriangleDown, new Bitmap(pathToAssets + "/GreenTriangleDown.png")); diff --git a/PortfolioManager/PortfolioManager.sln b/PortfolioManager/PortfolioManager.sln index 57b0ef4..dad15f1 100644 --- a/PortfolioManager/PortfolioManager.sln +++ b/PortfolioManager/PortfolioManager.sln @@ -1,9 +1,11 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 +Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.5.2.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PortfolioManager", "PortfolioManager.csproj", "{5E9565B6-29DD-1DBB-4B36-668515E703C9}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MarketDataLib", "..\..\Boneyard\ARM64\MarketData\MarketDataLib\MarketDataLib.csproj", "{BDF9EE7B-4118-4914-8BF8-07AD75A79F88}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -14,6 +16,10 @@ Global {5E9565B6-29DD-1DBB-4B36-668515E703C9}.Debug|Any CPU.Build.0 = Debug|Any CPU {5E9565B6-29DD-1DBB-4B36-668515E703C9}.Release|Any CPU.ActiveCfg = Release|Any CPU {5E9565B6-29DD-1DBB-4B36-668515E703C9}.Release|Any CPU.Build.0 = Release|Any CPU + {BDF9EE7B-4118-4914-8BF8-07AD75A79F88}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BDF9EE7B-4118-4914-8BF8-07AD75A79F88}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BDF9EE7B-4118-4914-8BF8-07AD75A79F88}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BDF9EE7B-4118-4914-8BF8-07AD75A79F88}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/PortfolioManager/ViewModels/BollingerBandViewModel.cs b/PortfolioManager/ViewModels/BollingerBandViewModel.cs index f725713..fd0598d 100644 --- a/PortfolioManager/ViewModels/BollingerBandViewModel.cs +++ b/PortfolioManager/ViewModels/BollingerBandViewModel.cs @@ -30,7 +30,7 @@ namespace PortfolioManager.ViewModels private BollingerBandRenderer bollingerBandRenderer = default; private bool showInsiderTransactions = true; private bool showTradeLabels = true; - private bool syncTradeToBand = true; + private bool syncTradeToBand = false; private bool useLeastSquaresFit = true; private StopLimits stopLimits = default; @@ -185,9 +185,9 @@ namespace PortfolioManager.ViewModels try { if (saveParameters.ContainsKey("SyncTradeToBand")) syncTradeToBand = Boolean.Parse((from KeyValuePair item in saveParameters where item.Key.Equals("SyncTradeToBand") select item).FirstOrDefault().Value); - else syncTradeToBand = true; + else syncTradeToBand = false; } - catch (Exception) { syncTradeToBand = true; } + catch (Exception) { syncTradeToBand = false; } try { if (saveParameters.ContainsKey("ShowTradeLabels")) showTradeLabels = Boolean.Parse((from KeyValuePair item in saveParameters where item.Key.Equals("ShowTradeLabels") select item).FirstOrDefault().Value); diff --git a/PortfolioManager/saveparams.config b/PortfolioManager/saveparams.config index 342141f..cba1dc0 100644 --- a/PortfolioManager/saveparams.config +++ b/PortfolioManager/saveparams.config @@ -5,5 +5,8 @@ Type,PortfolioManager.ViewModels.CMTrendViewModel,PathFileName,C:\boneyard\marke Type,PortfolioManager.ViewModels.BollingerBandViewModel,SelectedSymbol,SPOT,SelectedWatchList,Valuations,SelectedDayCount,90,SyncTradeToBand,False,ShowTradeLabels,True,UseLeastSquaresFit,True,ShowInsiderTransactions,True Type,PortfolioManager.ViewModels.BollingerBandViewModel,SelectedSymbol,GWRE,SelectedWatchList,Valuations,SelectedDayCount,90,SyncTradeToBand,True,ShowTradeLabels,True,UseLeastSquaresFit,True,ShowInsiderTransactions,True Type,PortfolioManager.ViewModels.BollingerBandViewModel,SelectedSymbol,CRS,SelectedWatchList,Valuations,SelectedDayCount,90,SyncTradeToBand,True,ShowTradeLabels,True,UseLeastSquaresFit,True,ShowInsiderTransactions,True -Type,PortfolioManager.ViewModels.BollingerBandViewModel,SelectedSymbol,SPY,SelectedWatchList,Valuations,SelectedDayCount,360,SyncTradeToBand,False,ShowTradeLabels,True,UseLeastSquaresFit,True,ShowInsiderTransactions,True -Type,PortfolioManager.ViewModels.BollingerBandViewModel,SelectedSymbol,OPRA,SelectedWatchList,Valuations,SelectedDayCount,90,SyncTradeToBand,True,ShowTradeLabels,True,UseLeastSquaresFit,True,ShowInsiderTransactions,True +Type,PortfolioManager.ViewModels.BollingerBandViewModel,SelectedSymbol,T,SelectedWatchList,Valuations,SelectedDayCount,90,SyncTradeToBand,True,ShowTradeLabels,True,UseLeastSquaresFit,True,ShowInsiderTransactions,True +Type,PortfolioManager.ViewModels.BollingerBandViewModel,SelectedSymbol,NRG,SelectedWatchList,Valuations,SelectedDayCount,90,SyncTradeToBand,False,ShowTradeLabels,True,UseLeastSquaresFit,True,ShowInsiderTransactions,True +Type,PortfolioManager.ViewModels.BollingerBandViewModel,SelectedSymbol,PSO,SelectedWatchList,Valuations,SelectedDayCount,90,SyncTradeToBand,True,ShowTradeLabels,True,UseLeastSquaresFit,True,ShowInsiderTransactions,True +Type,PortfolioManager.ViewModels.BollingerBandViewModel,SelectedSymbol,PARR,SelectedWatchList,Valuations,SelectedDayCount,180,SyncTradeToBand,False,ShowTradeLabels,True,UseLeastSquaresFit,True,ShowInsiderTransactions,True +Type,PortfolioManager.ViewModels.BollingerBandViewModel,SelectedSymbol,SH,SelectedWatchList,Valuations,SelectedDayCount,90,SyncTradeToBand,False,ShowTradeLabels,True,UseLeastSquaresFit,True,ShowInsiderTransactions,True