Commit Latest

This commit is contained in:
2025-06-17 20:08:25 -04:00
parent 8d0f7359f5
commit af63967244
8 changed files with 936 additions and 792 deletions

View File

@@ -6,6 +6,7 @@
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"
@@ -82,7 +83,8 @@
</Grid.RowDefinitions>
<TextBlock Grid.Row="0" FontSize="16" Text="{Binding Path=GraphTitle}" HorizontalAlignment="Center"></TextBlock>
<mxc:CartesianChart Grid.Row="1" >
<mxc:CartesianChart Grid.Row="1" >
<mxc:CartesianChart.AxesY>
<mxc:AxisY Title="Price" >
@@ -156,10 +158,17 @@
<mxc:CartesianChart.Series>
<mxc:CartesianSeries Name="ZeroPointMarkersPointsGraph" DataAdapter="{Binding ZeroPoint.DataAdapter}">
<mxc:CartesianPointSeriesView MarkerImage="{Binding Path=ZeroPointMarkers, Mode=OneWay}" ShowInCrosshair="False" MarkerSize="{Binding Path=MarkerSize, Converter={StaticResource OSValueConverter},ConverterParameter=25|.5}"/>
<localmxc:CartesianPointSeriesViewII MarkerImage="{Binding Path=ZeroPointMarkers, Mode=OneWay}" ShowInCrosshair="False" MarkerSize="{Binding Path=MarkerSize, Converter={StaticResource OSValueConverter},ConverterParameter=25|.5}"/>
</mxc:CartesianSeries>
</mxc:CartesianChart.Series>
<!-- <mxc:CartesianChart.Series>
<mxc:CartesianSeries Name="ZeroPointMarkersPointsGraph" DataAdapter="{Binding ZeroPoint.DataAdapter}">
<mxc:CartesianPointSeriesView MarkerImage="{Binding Path=ZeroPointMarkersTextMarkers, Mode=OneWay}" ShowInCrosshair="False" MarkerSize="30" />
</mxc:CartesianSeries>
</mxc:CartesianChart.Series> -->
<mxc:CartesianChart.Series>
<mxc:CartesianSeries Name="StopLimitMarkersPointsGraph" DataAdapter="{Binding StopLimits.DataAdapter}">
<mxc:CartesianPointSeriesView MarkerImage="{Binding Path=StopLimitMarkers, Mode=OneWay}" ShowInCrosshair="False" MarkerSize="{Binding Path=MarkerSize, Converter={StaticResource OSValueConverter},ConverterParameter=25|.5}"/>
@@ -203,6 +212,7 @@
</mxc:CartesianChart.Series>
</mxc:CartesianChart>
</Grid>
</Grid>

View File

@@ -84,6 +84,17 @@
</Grid.RowDefinitions>
<TextBlock Grid.Row="0" FontSize="16" Text="{Binding Path=GraphTitle}" HorizontalAlignment="Center"></TextBlock>
<mxc:CartesianChart Grid.Row="1">
<mxc:CartesianChart.AxesY>
<mxc:AxisY Title="Gain/Loss" >
<mxc:AxisYRange AlwaysShowZeroLevel="False" />
</mxc:AxisY>
</mxc:CartesianChart.AxesY>
<mxc:CartesianChart.AxesX>
<mxc:AxisX Title="Date"/>
</mxc:CartesianChart.AxesX>
<mxc:CartesianChart.Series>
<mxc:CartesianSeries Name="PerformanceSeries" DataAdapter="{Binding Data.DataAdapter}" >
<mxc:CartesianLineSeriesView ShowInCrosshair="False" Color="MidnightBlue" MarkerSize="4" ShowMarkers="{Binding Path=ShowMarkers, Mode=TwoWay}" Thickness="2"/>

View File

@@ -84,6 +84,17 @@
</Grid.RowDefinitions>
<TextBlock Grid.Row="0" FontSize="16" Text="{Binding Path=GraphTitle}" HorizontalAlignment="Center"></TextBlock>
<mxc:CartesianChart Grid.Row="1">
<mxc:CartesianChart.AxesY>
<mxc:AxisY Title="Gain/Loss" >
<mxc:AxisYRange AlwaysShowZeroLevel="False" />
</mxc:AxisY>
</mxc:CartesianChart.AxesY>
<mxc:CartesianChart.AxesX>
<mxc:AxisX Title="Date"/>
</mxc:CartesianChart.AxesX>
<mxc:CartesianChart.Series>
<mxc:CartesianSeries Name="PerformanceSeries" DataAdapter="{Binding Data.DataAdapter}" >
<mxc:CartesianLineSeriesView ShowInCrosshair="False" Color="MidnightBlue" MarkerSize="4" ShowMarkers="{Binding Path=ShowMarkers, Mode=TwoWay}" Thickness="2"/>

View File

@@ -100,6 +100,17 @@
</Grid.RowDefinitions>
<TextBlock Grid.Row="0" FontSize="16" Text="{Binding Path=GraphTitle}" HorizontalAlignment="Center"></TextBlock>
<mxc:CartesianChart Grid.Row="1">
<mxc:CartesianChart.AxesY>
<mxc:AxisY Title="Gain/Loss" >
<mxc:AxisYRange AlwaysShowZeroLevel="False" />
</mxc:AxisY>
</mxc:CartesianChart.AxesY>
<mxc:CartesianChart.AxesX>
<mxc:AxisX Title="Date"/>
</mxc:CartesianChart.AxesX>
<mxc:CartesianChart.Series>
<mxc:CartesianSeries Name="PerformanceSeries" DataAdapter="{Binding Data.DataAdapter}" >
<mxc:CartesianLineSeriesView ShowInCrosshair="False" Color="MidnightBlue" MarkerSize="4" ShowMarkers="{Binding Path=ShowMarkers, Mode=TwoWay}" Thickness="2"/>

View File

@@ -6,6 +6,8 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:controls="clr-namespace:HyperText.Avalonia.Controls;assembly=HyperText.Avalonia"
xmlns:mxc="https://schemas.eremexcontrols.net/avalonia/charts"
xmlns:mx="clr-namespace:Eremex.AvaloniaUI.Controls;assembly=Eremex.Avalonia.Controls"
xmlns:mxe="clr-namespace:Eremex.AvaloniaUI.Controls.Editors;assembly=Eremex.Avalonia.Controls"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="PortfolioManager.Views.MainWindow"
x:DataType="vm:MainWindowViewModel"
@@ -130,7 +132,7 @@
<HeaderedContentControl.ContentTemplate>
<DataTemplate>
<!-- <TabControl Margin="4" ItemsSource="{Binding}" SelectedIndex="{Binding Path=SelectedIndex,RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type vm:WorkspaceViewModel}}}, Mode=TwoWay"> -->
<TabControl x:Name="TabViews" Margin="4" ItemsSource="{Binding}" SelectionChanged="tabControl_SelectionChanged">
<mx:MxTabControl x:Name="TabViews" TabDragMode="Reorder" Margin="4" ItemsSource="{Binding}" SelectionChanged="tabControl_SelectionChanged">
<TabControl.ItemTemplate>
<DataTemplate DataType="vm:WorkspaceViewModel">
<DockPanel>
@@ -153,7 +155,7 @@
</DockPanel>
</DataTemplate>
</TabControl.ItemTemplate>
</TabControl>
</mx:MxTabControl>
</DataTemplate>
</HeaderedContentControl.ContentTemplate>
</HeaderedContentControl>

View File

@@ -69,8 +69,6 @@
</Border>
</ToolTip.Tip>
</TextBox>
</StackPanel>
<DockPanel x:Name="DockPanelA" Grid.Row="2" Grid.Column="2" Width="NaN" Height="NaN" >
@@ -84,6 +82,17 @@
</Grid.RowDefinitions>
<TextBlock Grid.Row="0" FontSize="16" Text="{Binding Path=GraphTitle}" HorizontalAlignment="Center"></TextBlock>
<mxc:CartesianChart Grid.Row="1">
<mxc:CartesianChart.AxesY>
<mxc:AxisY Title="Gain/Loss" >
<mxc:AxisYRange AlwaysShowZeroLevel="False" />
</mxc:AxisY>
</mxc:CartesianChart.AxesY>
<mxc:CartesianChart.AxesX>
<mxc:AxisX Title="Date"/>
</mxc:CartesianChart.AxesX>
<mxc:CartesianChart.Series>
<mxc:CartesianSeries Name="PerformanceSeries" DataAdapter="{Binding Data.DataAdapter}" >
<mxc:CartesianLineSeriesView ShowInCrosshair="False" Color="MidnightBlue" MarkerSize="4" ShowMarkers="{Binding Path=ShowMarkers, Mode=TwoWay}" Thickness="2"/>