Index: Core/Components/src/Core.Components.Charting/Properties/Resources.Designer.cs
===================================================================
diff -u -rc3fb6802834943dbe469243cc92ff3eb2e3ad880 -r8dc59c346c2c5a4fd1326a6be0f940571ee9a02d
--- Core/Components/src/Core.Components.Charting/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision c3fb6802834943dbe469243cc92ff3eb2e3ad880)
+++ Core/Components/src/Core.Components.Charting/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 8dc59c346c2c5a4fd1326a6be0f940571ee9a02d)
@@ -136,6 +136,15 @@
}
///
+ /// Looks up a localized string similar to Kruis.
+ ///
+ internal static string Cross_DisplayName {
+ get {
+ return ResourceManager.GetString("Cross_DisplayName", resourceCulture);
+ }
+ }
+
+ ///
/// Looks up a localized string similar to Ruit.
///
internal static string Diamond_DisplayName {
@@ -145,6 +154,15 @@
}
///
+ /// Looks up a localized string similar to Plus.
+ ///
+ internal static string Plus_DisplayName {
+ get {
+ return ResourceManager.GetString("Plus_DisplayName", resourceCulture);
+ }
+ }
+
+ ///
/// Looks up a localized string similar to De waarde voor grootte moet in het bereik {0} liggen..
///
internal static string Size_Value_should_be_in_Range_0_ {
Index: Core/Components/src/Core.Components.Charting/Properties/Resources.resx
===================================================================
diff -u -r7b94a3537bba9fa24775f9a632507bd9534067be -r8dc59c346c2c5a4fd1326a6be0f940571ee9a02d
--- Core/Components/src/Core.Components.Charting/Properties/Resources.resx (.../Resources.resx) (revision 7b94a3537bba9fa24775f9a632507bd9534067be)
+++ Core/Components/src/Core.Components.Charting/Properties/Resources.resx (.../Resources.resx) (revision 8dc59c346c2c5a4fd1326a6be0f940571ee9a02d)
@@ -156,4 +156,10 @@
De waarde voor lijndikte moet in het bereik {0} liggen.
+
+ Kruis
+
+
+ Plus
+
\ No newline at end of file
Index: Core/Components/src/Core.Components.Charting/Styles/ChartPointSymbol.cs
===================================================================
diff -u -r4ae122e1d83aaf61af8aec92f0b26ecd72d1adac -r8dc59c346c2c5a4fd1326a6be0f940571ee9a02d
--- Core/Components/src/Core.Components.Charting/Styles/ChartPointSymbol.cs (.../ChartPointSymbol.cs) (revision 4ae122e1d83aaf61af8aec92f0b26ecd72d1adac)
+++ Core/Components/src/Core.Components.Charting/Styles/ChartPointSymbol.cs (.../ChartPointSymbol.cs) (revision 8dc59c346c2c5a4fd1326a6be0f940571ee9a02d)
@@ -38,6 +38,10 @@
[ResourcesDisplayName(typeof(Resources), nameof(Resources.Triangle_DisplayName))]
Triangle,
[ResourcesDisplayName(typeof(Resources), nameof(Resources.Star_DisplayName))]
- Star
+ Star,
+ [ResourcesDisplayName(typeof(Resources), nameof(Resources.Cross_DisplayName))]
+ Cross,
+ [ResourcesDisplayName(typeof(Resources), nameof(Resources.Plus_DisplayName))]
+ Plus
}
}
\ No newline at end of file
Index: Core/Components/src/Core.Components.OxyPlot/Converter/ChartDataHelper.cs
===================================================================
diff -u -r7b94a3537bba9fa24775f9a632507bd9534067be -r8dc59c346c2c5a4fd1326a6be0f940571ee9a02d
--- Core/Components/src/Core.Components.OxyPlot/Converter/ChartDataHelper.cs (.../ChartDataHelper.cs) (revision 7b94a3537bba9fa24775f9a632507bd9534067be)
+++ Core/Components/src/Core.Components.OxyPlot/Converter/ChartDataHelper.cs (.../ChartDataHelper.cs) (revision 8dc59c346c2c5a4fd1326a6be0f940571ee9a02d)
@@ -94,6 +94,12 @@
case ChartPointSymbol.Star:
markerType = MarkerType.Star;
break;
+ case ChartPointSymbol.Cross:
+ markerType = MarkerType.Cross;
+ break;
+ case ChartPointSymbol.Plus:
+ markerType = MarkerType.Plus;
+ break;
default:
throw new InvalidEnumArgumentException(nameof(symbol),
(int) symbol,
Index: Core/Components/test/Core.Components.Charting.Test/Data/ChartPointSymbolTest.cs
===================================================================
diff -u -r4ae122e1d83aaf61af8aec92f0b26ecd72d1adac -r8dc59c346c2c5a4fd1326a6be0f940571ee9a02d
--- Core/Components/test/Core.Components.Charting.Test/Data/ChartPointSymbolTest.cs (.../ChartPointSymbolTest.cs) (revision 4ae122e1d83aaf61af8aec92f0b26ecd72d1adac)
+++ Core/Components/test/Core.Components.Charting.Test/Data/ChartPointSymbolTest.cs (.../ChartPointSymbolTest.cs) (revision 8dc59c346c2c5a4fd1326a6be0f940571ee9a02d)
@@ -49,6 +49,12 @@
},
{
ChartPointSymbol.Star, "Ster"
+ },
+ {
+ ChartPointSymbol.Cross, "Kruis"
+ },
+ {
+ ChartPointSymbol.Plus, "Plus"
}
};
}
@@ -74,6 +80,12 @@
},
{
ChartPointSymbol.Star, 4
+ },
+ {
+ ChartPointSymbol.Cross, 5
+ },
+ {
+ ChartPointSymbol.Plus, 6
}
};
}
Index: Core/Components/test/Core.Components.OxyPlot.Test/Converter/ChartDataHelperTest.cs
===================================================================
diff -u -r7b94a3537bba9fa24775f9a632507bd9534067be -r8dc59c346c2c5a4fd1326a6be0f940571ee9a02d
--- Core/Components/test/Core.Components.OxyPlot.Test/Converter/ChartDataHelperTest.cs (.../ChartDataHelperTest.cs) (revision 7b94a3537bba9fa24775f9a632507bd9534067be)
+++ Core/Components/test/Core.Components.OxyPlot.Test/Converter/ChartDataHelperTest.cs (.../ChartDataHelperTest.cs) (revision 8dc59c346c2c5a4fd1326a6be0f940571ee9a02d)
@@ -169,6 +169,26 @@
}
[Test]
+ public void Convert_Cross_ReturnsTriangle()
+ {
+ // Call
+ MarkerType markerType = ChartDataHelper.Convert(ChartPointSymbol.Cross);
+
+ // Assert
+ Assert.AreEqual(MarkerType.Cross, markerType);
+ }
+
+ [Test]
+ public void Convert_Plus_ReturnsStar()
+ {
+ // Call
+ MarkerType markerType = ChartDataHelper.Convert(ChartPointSymbol.Plus);
+
+ // Assert
+ Assert.AreEqual(MarkerType.Plus, markerType);
+ }
+
+ [Test]
public void Convert_UnknownChartPointSymbol_ThrowsInvalidEnumArgumentException()
{
// Call