diff --git a/PortfolioManager/Assets/BlueTriangleUp.png b/PortfolioManager/Assets/BlueTriangleUp.png
index 8565fec..d99ec39 100644
Binary files a/PortfolioManager/Assets/BlueTriangleUp.png and b/PortfolioManager/Assets/BlueTriangleUp.png differ
diff --git a/PortfolioManager/Assets/GreenTriangleDown.png b/PortfolioManager/Assets/GreenTriangleDown.png
index 7c1324e..53574cb 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 85314d8..5b519fa 100644
Binary files a/PortfolioManager/Assets/GreenTriangleUp.png and b/PortfolioManager/Assets/GreenTriangleUp.png differ
diff --git a/PortfolioManager/Assets/RedTriangleDown.png b/PortfolioManager/Assets/RedTriangleDown.png
index 9e3e9d6..c3f6273 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 7c0500e..4aac92b 100644
Binary files a/PortfolioManager/Assets/RedTriangleUp.png and b/PortfolioManager/Assets/RedTriangleUp.png differ
diff --git a/PortfolioManager/Assets/YellowTriangleUp.png b/PortfolioManager/Assets/YellowTriangleUp.png
index 6a281b1..bac1a63 100644
Binary files a/PortfolioManager/Assets/YellowTriangleUp.png and b/PortfolioManager/Assets/YellowTriangleUp.png differ
diff --git a/PortfolioManager/ViewModels/BollingerBandViewModel.cs b/PortfolioManager/ViewModels/BollingerBandViewModel.cs
index 34d1928..a2d5b60 100644
--- a/PortfolioManager/ViewModels/BollingerBandViewModel.cs
+++ b/PortfolioManager/ViewModels/BollingerBandViewModel.cs
@@ -267,14 +267,12 @@ namespace PortfolioManager.ViewModels
base.OnPropertyChanged("InsiderTransactionPointAcquiredMedium");
base.OnPropertyChanged("InsiderTransactionPointAcquiredLarge");
-
- // base.OnPropertyChanged("InsiderTransactionPointMarkersDisposedSmall");
- // base.OnPropertyChanged("InsiderTransactionPointMarkersDisposedMedium");
- // base.OnPropertyChanged("InsiderTransactionPointMarkersDisposedLarge");
-
- // base.OnPropertyChanged("InsiderTransactionPointMarkersAcquiredSmall");
- // base.OnPropertyChanged("InsiderTransactionPointMarkersAcquiredMedium");
- // base.OnPropertyChanged("InsiderTransactionPointMarkersAcquiredLarge");
+ base.OnPropertyChanged("InsiderTransactionPointMarkersDisposedSmall");
+ base.OnPropertyChanged("InsiderTransactionPointMarkersDisposedMedium");
+ base.OnPropertyChanged("InsiderTransactionPointMarkersDisposedLarge");
+ base.OnPropertyChanged("InsiderTransactionPointMarkersAcquiredSmall");
+ base.OnPropertyChanged("InsiderTransactionPointMarkersAcquiredMedium");
+ base.OnPropertyChanged("InsiderTransactionPointMarkersAcquiredLarge");
base.OnPropertyChanged("LeastSquares");
}
}
@@ -506,13 +504,13 @@ namespace PortfolioManager.ViewModels
base.OnPropertyChanged("InsiderTransactionPointAcquiredMedium");
base.OnPropertyChanged("InsiderTransactionPointAcquiredLarge");
- // base.OnPropertyChanged("InsiderTransactionPointMarkersDisposedSmall");
- // base.OnPropertyChanged("InsiderTransactionPointMarkersDisposedMedium");
- // base.OnPropertyChanged("InsiderTransactionPointMarkersDisposedLarge");
+ base.OnPropertyChanged("InsiderTransactionPointMarkersDisposedSmall");
+ base.OnPropertyChanged("InsiderTransactionPointMarkersDisposedMedium");
+ base.OnPropertyChanged("InsiderTransactionPointMarkersDisposedLarge");
- // base.OnPropertyChanged("InsiderTransactionPointMarkersAcquiredSmall");
- // base.OnPropertyChanged("InsiderTransactionPointMarkersAcquiredMedium");
- // base.OnPropertyChanged("InsiderTransactionPointMarkersAcquiredLarge");
+ base.OnPropertyChanged("InsiderTransactionPointMarkersAcquiredSmall");
+ base.OnPropertyChanged("InsiderTransactionPointMarkersAcquiredMedium");
+ base.OnPropertyChanged("InsiderTransactionPointMarkersAcquiredLarge");
});
}
else if (eventArgs.PropertyName.Equals("SelectedWatchList"))
@@ -539,7 +537,7 @@ namespace PortfolioManager.ViewModels
}
}
-// ************************************************* C O M P O S I T E P R O P E R T I E S ********************************************
+// ************************************************* C O M P O S I T E D A T A S O U R C E S ********************************************
public CompositeDataSource K
{
@@ -624,15 +622,6 @@ namespace PortfolioManager.ViewModels
}
}
- public IImage TradePointMarkers
- {
- get
- {
- if (!showTradeLabels) return null;
- return ImageCache.GetInstance().GetImage(ImageCache.ImageType.YellowTriangleUp);
- }
- }
-
public CompositeDataSource ZeroPoint
{
get
@@ -642,15 +631,6 @@ namespace PortfolioManager.ViewModels
}
}
- public IImage ZeroPointMarkers
- {
- get
- {
- if (!showTradeLabels) return null;
- return ImageCache.GetInstance().GetImage(ImageCache.ImageType.BlueTriangleUp);
- }
- }
-
public CompositeDataSource StopLimits
{
get
@@ -660,15 +640,6 @@ namespace PortfolioManager.ViewModels
}
}
- public IImage StopLimitMarkers
- {
- get
- {
- if (!showTradeLabels) return null;
- return ImageCache.GetInstance().GetImage(ImageCache.ImageType.RedTriangleUp);
- }
- }
-
public CompositeDataSource InsiderTransactionPointDisposedSmall
{
get
@@ -721,7 +692,102 @@ namespace PortfolioManager.ViewModels
if (!showInsiderTransactions) return Empty();
return compositeDataSourceInsiderTransactionPointAcquiredLarge;
}
- }
+ }
+
+ // ******************************************************** M A R K E R S **************************************************
+
+ public IImage StopLimitMarkers
+ {
+ get
+ {
+ if (!showTradeLabels) return null;
+ return ImageCache.GetInstance().GetImage(ImageCache.ImageType.RedTriangleUp);
+ }
+ }
+
+ public IImage ZeroPointMarkers
+ {
+ get
+ {
+ if (!showTradeLabels) return null;
+ return ImageCache.GetInstance().GetImage(ImageCache.ImageType.BlueTriangleUp);
+ }
+ }
+
+ public IImage TradePointMarkers
+ {
+ get
+ {
+ if (!showTradeLabels) return null;
+ return ImageCache.GetInstance().GetImage(ImageCache.ImageType.YellowTriangleUp);
+ }
+ }
+
+ ///
+ /// This size is controlled in the XAML
+ ///
+ public IImage InsiderTransactionPointMarkersDisposedSmall
+ {
+ get
+ {
+ return ImageCache.GetInstance().GetImage(ImageCache.ImageType.RedTriangleDown);
+ }
+ }
+
+ ///
+ /// This size is controlled in the XAML
+ ///
+ public IImage InsiderTransactionPointMarkersDisposedMedium
+ {
+ get
+ {
+ return ImageCache.GetInstance().GetImage(ImageCache.ImageType.RedTriangleDown);
+ }
+ }
+
+ ///
+ /// This size is controlled in the XAML
+ ///
+ public IImage InsiderTransactionPointMarkersDisposedLarge
+ {
+ get
+ {
+ return ImageCache.GetInstance().GetImage(ImageCache.ImageType.RedTriangleDown);
+ }
+ }
+
+ ///
+ /// This size is controlled in the XAML
+ ///
+ public IImage InsiderTransactionPointMarkersAcquiredSmall
+ {
+ get
+ {
+ return ImageCache.GetInstance().GetImage(ImageCache.ImageType.GreenTriangleUp);
+ }
+ }
+
+ ///
+ /// This size is controlled in the XAML
+ ///
+ public IImage InsiderTransactionPointMarkersAcquiredMedium
+ {
+ get
+ {
+ return ImageCache.GetInstance().GetImage(ImageCache.ImageType.GreenTriangleUp);
+ }
+ }
+
+ ///
+ /// This size is controlled in the XAML
+ ///
+ public IImage InsiderTransactionPointMarkersAcquiredLarge
+ {
+ get
+ {
+ return ImageCache.GetInstance().GetImage(ImageCache.ImageType.GreenTriangleUp);
+ }
+ }
// *********************************************************************************************************************************************
public void CreateCompositeDataSources()
diff --git a/PortfolioManager/Views/BollingerBandView.axaml b/PortfolioManager/Views/BollingerBandView.axaml
index c5be122..5512d94 100644
--- a/PortfolioManager/Views/BollingerBandView.axaml
+++ b/PortfolioManager/Views/BollingerBandView.axaml
@@ -150,55 +150,55 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+