Implemented Options3d and ParallelAxes

Author: JerrettDavis

DotNet.Highcharts/DotNet.Highcharts/DotNet.Highcharts.csproj

@@ -58,6 +58,9 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Enums\TickmarkPlacements.cs" />
+    <Compile Include="Helpers\StringNumber.cs" />
+    <Compile Include="Helpers\StringBool.cs" />
     <Compile Include="Options\Accessibility\Accessibility.cs" />
     <Compile Include="Options\Accessibility\AccessibilityKeyboardNavigation.cs" />
     <Compile Include="Options\Accessibility\AccessibilityKeyboardNavigationModes.cs" />
@@ -135,7 +138,16 @@
     <Compile Include="Options\Navigation.cs" />
     <Compile Include="Options\NavigationButtonOptions.cs" />
     <Compile Include="Options\Navigator.cs" />
+    <Compile Include="Options\Options3d\Options3d.cs" />
+    <Compile Include="Options\Options3d\Options3dFrame.cs" />
+    <Compile Include="Options\Options3d\Options3dFrameSide.cs" />
+    <Compile Include="Options\Options3d\Options3dSpecificFrameSide.cs" />
     <Compile Include="Options\Pane.cs" />
+    <Compile Include="Options\ParallelAxes\ParallelAxes.cs" />
+    <Compile Include="Options\ParallelAxes\ParallelAxesCrosshair.cs" />
+    <Compile Include="Options\ParallelAxes\ParallelAxesEvents.cs" />
+    <Compile Include="Options\ParallelAxes\ParallelAxesLabels.cs" />
+    <Compile Include="Options\ParallelAxes\ParallelAxesTitle.cs" />
     <Compile Include="Options\PlotOptions\PlotOptions.cs" />
     <Compile Include="Options\PlotOptions\PlotOptionsArea.cs" />
     <Compile Include="Options\PlotOptions\PlotOptionsAreaDataLabels.cs" />

DotNet.Highcharts/DotNet.Highcharts/Enums/TickmarkPlacements.cs

@@ -0,0 +1,8 @@
+namespace DotNet.Highcharts.Enums
+{
+    public enum TickmarkPlacements
+    {
+        Between,
+        On
+    }
+}

DotNet.Highcharts/DotNet.Highcharts/Helpers/StringBool.cs

@@ -0,0 +1,63 @@
+using System.Globalization;
+
+namespace DotNet.Highcharts.Helpers
+{
+    public struct StringBool
+    {
+        private readonly bool? _bool;
+        private readonly string _string;
+
+        public StringBool(string str)
+        {
+            _string = str;
+            _bool = null;
+        }
+
+        public StringBool(bool boolean)
+        {
+            _bool = boolean;
+            _string = null;
+        }
+
+        public static implicit operator StringBool(string value) { return new StringBool(value); }
+        public static implicit operator StringBool(bool value) { return new StringBool(value); }
+
+        public static StringBool GetValue(object o)
+        {
+            switch (o)
+            {
+                case string _:
+                    return new StringBool((string)o);
+                case Number _:
+                    return new StringBool((bool)o);
+            }
+
+            return new StringBool();
+        }
+
+        public static implicit operator string(StringBool a)
+        {
+            if (a._string != null)
+                return a._string;
+
+            return a._bool.HasValue ?
+                a._bool.ToString() : null;
+        }
+
+        public static implicit operator bool? (StringBool a)
+        {
+            if (a._bool.HasValue)
+                return a._bool;
+
+            return a._string != null ? a : null;
+        }
+
+        public override string ToString()
+        {
+            if (_bool.HasValue)
+                return _bool.ToString();
+
+            return _string?.ToString(CultureInfo.InvariantCulture) ?? string.Empty;
+        }
+    }
+}

DotNet.Highcharts/DotNet.Highcharts/Helpers/StringNumber.cs

@@ -0,0 +1,65 @@
+using System.Globalization;
+
+namespace DotNet.Highcharts.Helpers
+{
+    public struct StringNumber
+    {
+        private readonly Number? _heightInPixels;
+        private readonly string _heightInPercent;
+
+        public StringNumber(string percent)
+        {
+            _heightInPercent = percent;
+            _heightInPixels = null;
+        }
+
+        public StringNumber(Number number)
+        {
+            _heightInPixels = number;
+            _heightInPercent = null;
+        }
+
+        public static implicit operator StringNumber(string value) { return new StringNumber(value); }
+        public static implicit operator StringNumber(Number value) { return new StringNumber(value); }
+        public static implicit operator StringNumber(int value) { return new StringNumber(value); }
+        public static implicit operator StringNumber(double value) { return new StringNumber(value); }
+
+        public static StringNumber GetHeight(object o)
+        {
+            switch (o)
+            {
+                case string _:
+                    return new StringNumber((string)o);
+                case Number _:
+                    return new StringNumber((Number)o);
+            }
+
+            return new StringNumber();
+        }
+
+        public static implicit operator string(StringNumber a)
+        {
+            if (a._heightInPercent != null)
+                return a._heightInPercent;
+
+            return a._heightInPixels.HasValue ?
+                a._heightInPixels.ToString() : null;
+        }
+
+        public static implicit operator Number? (StringNumber a)
+        {
+            if (a._heightInPixels.HasValue)
+                return a._heightInPixels;
+
+            return a._heightInPercent != null ? a : null;
+        }
+
+        public override string ToString()
+        {
+            if (_heightInPixels.HasValue)
+                return _heightInPixels.ToString();
+
+            return _heightInPercent?.ToString(CultureInfo.InvariantCulture) ?? string.Empty;
+        }
+    }
+}

DotNet.Highcharts/DotNet.Highcharts/Highcharts.cs

@@ -391,7 +391,9 @@ public virtual string GetOptions()
             }
             else
             {
-                options.Append(_chart != null ? "chart: {{ renderTo:'{0}', {1} }}".FormatWith(ContainerName, JsonSerializer.Serialize(_chart, false)) : "chart: {{ renderTo:'{0}' }}".FormatWith(ContainerName));
+                options.Append(_chart != null ? 
+                    "chart: {{ renderTo:'{0}', {1} }}".FormatWith(ContainerName, JsonSerializer.Serialize(_chart, false)) : 
+                    "chart: {{ renderTo:'{0}' }}".FormatWith(ContainerName));
             }
 
             if (_accessibility != null)

DotNet.Highcharts/DotNet.Highcharts/JsonSerializer.cs

@@ -147,7 +147,7 @@ static string GetValue(object value, Type type, JsonFormatter formatter)
                     jsonFormat = JSON_DEFAULT_FORMAT;
                 return GetJsonString(formatter.JsonValueFormat, jsonFormat, value.ToString().Replace("\r\n", " ").Replace("  ", ""));
             }
-            if (value is int || value is long || value is short || value is byte || type == typeof(Number))
+            if (value is int || value is long || value is short || value is byte || type == typeof(Number) || type == typeof(StringNumber) || type == typeof(StringBool))
                 return GetJsonString(formatter.JsonValueFormat, JSON_DEFAULT_FORMAT, value.ToString());
             if (value is double)
                 return GetJsonString(formatter.JsonValueFormat, JSON_DEFAULT_FORMAT, ((double)value).ToString(CultureInfo.InvariantCulture));

DotNet.Highcharts/DotNet.Highcharts/Options/Chart.cs

@@ -3,6 +3,7 @@
 using DotNet.Highcharts.Enums;
 using DotNet.Highcharts.Attributes;
 using DotNet.Highcharts.Helpers;
+// ReSharper disable InconsistentNaming
 
 namespace DotNet.Highcharts.Options
 {
@@ -58,6 +59,7 @@ public class Chart
 		/// Alias of <code>type</code>.
 		/// Default: line
 		/// </summary>
+		[Obsolete]
 		public ChartTypes? DefaultSeriesType { get; set; }
 
         /// <summary>
@@ -72,10 +74,12 @@ public class Chart
 		/// </summary>
 		public ChartEvents Events { get; set; }
 
-		/// <summary>
-		/// An explicit height for the chart. By default the height is calculated from the offset height of the containing element, or 400 pixels if the containing element's height is 0.
-		/// </summary>
-		public Number? Height { get; set; }
+        /// <summary>
+        /// An explicit height for the chart. If a number, the height is given in pixels. If given a percentage string (for example '56%'), the height is given as the percentage of the actual chart width. This allows for preserving the aspect ratio across responsive sizes.
+        /// By default (when null) the height is calculated from the offset height of the containing element, or 400 pixels if the containing element's height is 0.
+        /// Default: null
+        /// </summary>
+        public StringNumber? Height { get; set; }
 
 		/// <summary>
 		/// If true, the axes will scale to the remaining visible series once one series is hidden. If false, hiding and showing a series will not affect the axes or the other series. For stacks, once one series within the stack is hidden, the rest of the stack will close in around it even if the axis is not affected.
@@ -92,7 +96,7 @@ public class Chart
 		/// <summary>
 		/// <p>The margin between the outer edge of the chart and the plot area. The numbers in the array designate top, right, bottom and left respectively. Use the options <code>marginTop</code>, <code>marginRight</code>, <code>marginBottom</code> and <code>marginLeft</code> for shorthand setting of one option.</p> <p>Since version 2.1, the margin is 0 by default. The actual space is dynamically calculated  from the offset of axis labels, axis title, title, subtitle and legend in addition to the <code>spacingTop</code>, <code>spacingRight</code>, <code>spacingBottom</code> and <code>spacingLeft</code> options.</p> Defaults to <code>[null]</code>.
 		/// </summary>
-		public int[] Margin { get; set; }
+		public Number?[] Margin { get; set; }
 
 		/// <summary>
 		/// The margin between the bottom outer edge of the chart and the plot area. Use this to set a fixed pixel value for the margin as opposed to the default dynamic margin. See also <code>spacingBottom</code>.
@@ -114,6 +118,51 @@ public class Chart
 		/// </summary>
 		public Number? MarginTop { get; set; }
 
+        /// <summary>
+        /// Options to render charts in 3 dimensions. This feature requires highcharts-3d.js, found in the download package or online at code.highcharts.com/highcharts-3d.js.
+        /// </summary>
+        public Options3d.Options3d Options3d { get; set; }
+
+        /// <summary>
+        /// Allows setting a key to switch between zooming and panning. Can be one of alt, ctrl, meta (the command key on Mac and Windows key on Windows) or shift. The keys are mapped directly to the key properties of the click event argument (event.altKey, event.ctrlKey, event.metaKey and event.shiftKey).
+        /// Default: undefined
+        /// </summary>
+        public string PanKey { get; set; }
+
+        /// <summary>
+        /// Allow panning in a chart. Best used with panKey to combine zooming and panning.
+        /// On touch devices, when the tooltip.followTouchMove option is true (default), panning requires two fingers. To allow panning with one finger, set followTouchMove to false.
+        /// Default: false
+        /// </summary>
+        public bool? Panning { get; set; }
+
+        /// <summary>
+        /// Common options for all yAxes rendered in a parallel coordinates plot. This feature requires modules/parallel-coordinates.js.
+        /// The default options are:
+        ///parallelAxes: {
+        ///     lineWidth: 1,       // classic mode only
+        ///     gridlinesWidth: 0,  // classic mode only
+        ///     title: {
+        ///         text: '',
+        ///         reserveSpace: false
+        ///     },
+        ///     labels: {
+        ///         x: 0,
+        ///         y: 0,
+        ///         align: 'center',
+        ///         reserveSpace: false
+        ///     },
+        ///     offset: 0
+        ///  }
+        /// </summary>
+        public ParallelAxes.ParallelAxes ParallelAxes { get; set; }
+
+        /// <summary>
+        /// Flag to render charts as a parallel coordinates plot. In a parallel coordinates plot (||-coords) by default all required yAxes are generated and the legend is disabled. This feature requires modules/parallel-coordinates.js.
+        /// Default: false
+        /// </summary>
+        public bool? ParallelCoordinates { get; set; }
+
 		/// <summary>
 		/// Equivalent to <a href='#chart.zoomType'>zoomType</a>, but for multitouch gestures only. By default, the <code>pinchType</code> is the same as the <code>zoomType</code> setting. However, pinching can be enabled separately in some cases, for example in stock charts where a mouse drag pans the chart, while pinching is enabled.
 		/// Default: null