Commit Latest

This commit is contained in:
2025-06-21 18:53:21 -04:00
parent 8647d86ea2
commit 981a873dee
5 changed files with 586 additions and 229 deletions

View File

@@ -2,7 +2,6 @@ using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.ComponentModel;
using System.IO;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
@@ -11,7 +10,6 @@ using CommunityToolkit.Mvvm.Input;
using DynamicData;
using Eremex.AvaloniaUI.Charts;
using MarketData;
using MarketData.CNNProcessing;
using MarketData.DataAccess;
using MarketData.Generator;
using MarketData.MarketDataModel;
@@ -22,61 +20,9 @@ using PortfolioManager.DataSeriesViewModels;
using PortfolioManager.Extensions;
using PortfolioManager.Models;
using PortfolioManager.UIUtils;
using ScottPlot;
using SkiaSharp;
namespace PortfolioManager.ViewModels
{
public static class TextMarkerImageGenerator
{
public static Image GenerateImage(String text)
{
ImageHelper imageHelper = new ImageHelper();
int fontSize = 12;
int width = 130;
int height = 24;
imageHelper.CreateImage(width, height); //, new PointMapping(width,height,width,0,height,0));
imageHelper.Fill(SKColors.White);
SKTextAlign align = SKTextAlign.Center;
// SKFont font = new SKFont(SKTypeface.FromFamilyName("Arial",SKFontStyle.Normal), fontSize);
SKFont font = new SKFont(SKTypeface.FromFamilyName("Arial",500,5,SKFontStyleSlant.Upright), fontSize);
// SKFont font = new SKFont(SKTypeface.Default, fontSize);
imageHelper.DrawLine(SKColors.Black,1, new SKPoint(0,0), new SKPoint(width-1,0)); // bottom left to right
imageHelper.DrawLine(SKColors.Black,1, new SKPoint(width-1,0), new SKPoint(width-1,height-1)); // up lefthand side
imageHelper.DrawLine(SKColors.Black,1, new SKPoint(0,height-1), new SKPoint(width-1,height-1)); // top left to right
imageHelper.DrawLine(SKColors.Black,1, new SKPoint(0,height-1), new SKPoint(0,0)); // left hand side top to bottom
imageHelper.DrawText(text, new SKPoint(width / 2, height-8), SKColors.Black, align, font);
using MemoryStream memoryStream = new MemoryStream();
imageHelper.ToStream().CopyTo(memoryStream);
return new ScottPlot.Image(memoryStream.ToArray());
}
// public static IImage GenerateImage(String text)
// {
// ImageHelper imageHelper = new ImageHelper();
// int fontSize = 36;
// int width = 130;
// imageHelper.CreateImage(width, fontSize);
// imageHelper.Fill(SKColors.White);
// SKTextAlign align = SKTextAlign.Center;
// SKFont font = new SKFont(SKTypeface.FromFamilyName("Helvetica"), fontSize);
// imageHelper.DrawText(text, new SKPoint(width / 2, fontSize - 2), SKColors.Black, align, font);
// Avalonia.Media.Imaging.Bitmap avBitmap = new Avalonia.Media.Imaging.Bitmap(imageHelper.ToStream());
// return avBitmap;
// // avBitmap.Save("c:\\3\\mybitmap.jpg"); }
// }
public static IImage GenerateImage(int width, int height, SKColor color)
{
ImageHelper imageHelper = new ImageHelper();
imageHelper.CreateImage(width, height);
imageHelper.Fill(color);
Avalonia.Media.Imaging.Bitmap avBitmap = new Avalonia.Media.Imaging.Bitmap(imageHelper.ToStream());
return avBitmap;
// avBitmap.Save("c:\\3\\mybitmap.jpg"); }
}
}
public partial class BollingerBandViewModel : WorkspaceViewModel
{

View File

@@ -1,171 +1,9 @@
using System;
using Avalonia.Media;
using Eremex.AvaloniaUI.Charts;
using MarketData.DataAccess;
using MarketData.Generator;
using MarketData.MarketDataModel;
using PortfolioManager.DataSeriesViewModels;
using PortfolioManager.Models;
using ScottPlot;
using PortfolioManager.Renderers;
using ScottPlot.Avalonia;
using ScottPlot.Plottables;
using ShimSkiaSharp;
using SkiaSharp;
namespace PortfolioManager.ViewModels
{
public class BollingerBandCompositeDataSourceGenerater
{
public BollingerBandCompositeDataSourceGenerater()
{
}
public void Render(AvaPlot plotter)
{
plotter.Plot.Axes.AutoScale();
plotter.Plot.HideLegend();
plotter.Refresh();
}
public void SetData(String selectedSymbol, int selectedDayCount, AvaPlot plotter)
{
Prices prices = PricingDA.GetPrices(selectedSymbol, selectedDayCount);
BollingerBands bollingerBands = BollingerBandGenerator.GenerateBollingerBands(prices);
// calculate the break even price on the open trades for this symbol
PortfolioTrades portfolioTrades = PortfolioDA.GetTradesSymbol(selectedSymbol);
PortfolioTrades openTrades = portfolioTrades.GetOpenTrades();
DateTime latestPricingDate = PricingDA.GetLatestDate(selectedSymbol);
Price latestPrice = PricingDA.GetPrice(selectedSymbol, latestPricingDate);
Price zeroPrice = ParityGenerator.GenerateGainLossValue(openTrades, latestPrice);
GenerateCompositeDataSources(plotter, bollingerBands);
GenerateZeroPoint(plotter, zeroPrice);
}
private void GenerateZeroPoint(AvaPlot plotter, Price zeroPrice)
{
ZeroPoint = GainLossModel.Price(zeroPrice);
(DateTime[] dates, double[] values) = ZeroPoint.ToXYData();
Scatter scatter = plotter.Plot.Add.Scatter(dates, values, ScottPlot.Color.FromSKColor(SKColors.Blue));
// Marker marker = plotter.Plot.Add.Marker(dates[0].ToOADate(), values[0] / 1.025);
// marker.MarkerFillColor = ScottPlot.Color.FromSKColor(SKColors.Blue);
// marker.MarkerStyle.Shape = MarkerShape.TriUp;
// marker.MarkerStyle.Size = 15;
Image image = TextMarkerImageGenerator.GenerateImage("Even $52.14 (+.25%)");
Coordinates coordinates = new Coordinates(dates[0].ToOADate(), values[0] / 1.0125);
ImageMarker marker = plotter.Plot.Add.ImageMarker(coordinates, image);
// Marker marker=plotter.Plot.Add.Marker(K.DataAdapter.ItemCount-1,values[0]);
// Marker marker=plotter.Plot.Add.Marker(0,values[0]);
// marker.MarkerFillColor = ScottPlot.Color.FromSKColor(SKColors.Blue);
// marker.MarkerStyle.Shape = MarkerShape.TriUp;
// marker.MarkerStyle.Size = 15;
}
private void GenerateCompositeDataSources(AvaPlot plotter, BollingerBands bollingerBands)
{
K = BollingerBandModel.K(bollingerBands);
KL1 = BollingerBandModel.KL1(bollingerBands);
L = BollingerBandModel.L(bollingerBands);
LP1 = BollingerBandModel.LP1(bollingerBands);
High = BollingerBandModel.High(bollingerBands);
Low = BollingerBandModel.Low(bollingerBands);
Close = BollingerBandModel.Close(bollingerBands);
SMAN = BollingerBandModel.SMAN(bollingerBands);
Volume = BollingerBandModel.Volume(bollingerBands);
LeastSquares = BollingerBandModel.LeastSquares(bollingerBands);
Scatter scatter = default;
{
(DateTime[] dates, double[] values) = K.ToXYData();
scatter = plotter.Plot.Add.ScatterLine(dates, values, ScottPlot.Color.FromSKColor(SKColors.Green));
scatter.LegendText = "K";
scatter.LineWidth = 3;
}
{
(DateTime[] dates, double[] values) = KL1.ToXYData();
scatter = plotter.Plot.Add.ScatterLine(dates, values, ScottPlot.Color.FromSKColor(SKColors.Green));
scatter.LegendText = "KL1";
scatter.LineWidth = 2;
}
{
(DateTime[] dates, double[] values) = L.ToXYData();
scatter = plotter.Plot.Add.ScatterLine(dates, values, ScottPlot.Color.FromSKColor(SKColors.Green));
scatter.LegendText = "L";
scatter.LineWidth = 3;
}
{
(DateTime[] dates, double[] values) = LP1.ToXYData();
scatter = plotter.Plot.Add.ScatterLine(dates, values, ScottPlot.Color.FromSKColor(SKColors.Green));
scatter.LegendText = "LP1";
scatter.LineWidth = 2;
}
{
(DateTime[] dates, double[] values) = High.ToXYData();
scatter = plotter.Plot.Add.ScatterLine(dates, values, ScottPlot.Color.FromSKColor(SKColors.Blue));
scatter.LegendText = "High";
scatter.LineWidth = 2;
}
{
(DateTime[] dates, double[] values) = Low.ToXYData();
scatter = plotter.Plot.Add.ScatterLine(dates, values, ScottPlot.Color.FromSKColor(SKColors.Red));
scatter.LegendText = "Low";
scatter.LineWidth = 2;
}
{
(DateTime[] dates, double[] values) = Close.ToXYData();
scatter = plotter.Plot.Add.ScatterLine(dates, values, ScottPlot.Color.FromSKColor(SKColors.Black));
scatter.LegendText = "Close";
scatter.LineWidth = 2;
}
{
(DateTime[] dates, double[] values) = LeastSquares.ToXYData();
scatter = plotter.Plot.Add.ScatterLine(dates, values, ScottPlot.Color.FromSKColor(SKColors.Orange));
scatter.LegendText = "LeastSquares";
scatter.LineWidth = 2;
}
{
(DateTime[] dates, double[] values) = SMAN.ToXYData();
scatter = plotter.Plot.Add.ScatterLine(dates, values, ScottPlot.Color.FromSKColor(SKColors.Purple));
scatter.LegendText = "SMAN";
scatter.LineWidth = 2;
}
}
public CompositeDataSource K { get; private set; } = Empty();
public CompositeDataSource KL1 { get; private set; } = Empty();
public CompositeDataSource L { get; private set; } = Empty();
public CompositeDataSource LP1 { get; private set; } = Empty();
public CompositeDataSource High { get; private set; } = Empty();
public CompositeDataSource Low { get; private set; } = Empty();
public CompositeDataSource Close { get; private set; } = Empty();
public CompositeDataSource SMAN { get; private set; } = Empty();
public CompositeDataSource Volume { get; private set; } = Empty();
public CompositeDataSource LeastSquares { get; private set; } = Empty();
public CompositeDataSource ZeroPoint { get; private set; } = Empty();
private static CompositeDataSource Empty()
{
return new CompositeDataSource()
{
DataAdapter = new SortedDateTimeDataAdapter()
};
}
}
public partial class ScottPlotViewModel : PlotterWorkspaceViewModel
{
@@ -180,18 +18,10 @@ namespace PortfolioManager.ViewModels
String selectedSymbol = "CRS";
int selectedDayCount = 180;
plotter = e.AvaPlot; // we should store this somewhere
// Prices prices = PricingDA.GetPrices("SPY", 180);
// BollingerBands bollingerBands = BollingerBandGenerator.GenerateBollingerBands(prices);
BollingerBandCompositeDataSourceGenerater bollingerBandCompositeDataSourceGenerater = new BollingerBandCompositeDataSourceGenerater();
bollingerBandCompositeDataSourceGenerater.SetData(selectedSymbol, selectedDayCount, plotter);
//public void SetData(String selectedSymbol, int selectedDayCount, AvaPlot plotter)
// bollingerBandCompositeDataSourceGenerater.GenerateCompositeDataSources(plotter, bollingerBands);
bollingerBandCompositeDataSourceGenerater.Render(plotter);
// plotter.Plot.Axes.AutoScale();
// plotter.Refresh();
plotter = e.AvaPlot;
BollingerBandRenderer bollingerBandRenderer = new BollingerBandRenderer(plotter);
bollingerBandRenderer.SetData(selectedSymbol, selectedDayCount);
bollingerBandRenderer.Render();
}
// ********************************************** P E R S I S T E N C E *************************
public override bool CanPersist()