1796 serializer for residual vs time chart missing (#1797)

* Fixes #1796 and also #1789 * Fixes #1796 and also #1789
Open-Systems-Pharmacology · Nov 29, 2022 · 12641e5 · 12641e5
1 parent b13a918
commit 12641e5
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 18 deletions.
diff --git a/src/OSPSuite.Core/Chart/CurveOptions.cs b/src/OSPSuite.Core/Chart/CurveOptions.cs
@@ -18,7 +18,14 @@ public enum Symbols
       Circle,
       Diamond,
       Triangle,
-      Square
+      Square,
+      InvertedTriangle,
+      Plus,
+      Cross,
+      Star,
+      Pentagon,
+      Hexagon,
+      ThinCross,
    }
 
    public enum InterpolationModes

diff --git a/src/OSPSuite.Core/Serialization/Chart/CurveChartXmlSerializer.cs b/src/OSPSuite.Core/Serialization/Chart/CurveChartXmlSerializer.cs
@@ -1,10 +1,11 @@
 using System.Xml.Linq;
 using OSPSuite.Core.Chart;
+using OSPSuite.Core.Chart.Simulations;
 using OSPSuite.Core.Serialization.Xml;
 
 namespace OSPSuite.Core.Serialization.Chart
 {
-   public abstract class CurveChartXmlSerializer<TCurveChart> : OSPSuiteXmlSerializer<TCurveChart> where TCurveChart: CurveChart
+   public abstract class CurveChartXmlSerializer<TCurveChart> : OSPSuiteXmlSerializer<TCurveChart> where TCurveChart : CurveChart
    {
       public override void PerformMapping()
       {
@@ -31,6 +32,18 @@ protected override void TypedDeserialize(TCurveChart curveChart, XElement output
 
    public class CurveChartXmlSerializer : CurveChartXmlSerializer<CurveChart>
    {
-
+   }
+
+   public class SimulationPredictedVsObservedChartXmlSerializer : CurveChartXmlSerializer<SimulationPredictedVsObservedChart>
+   {
+      public override void PerformMapping()
+      {
+         base.PerformMapping();
+         Map(x => x.DeviationFoldValues);
+      }
+   }
+
+   public class SimulationResidualVsTimeChartSerializer : CurveChartXmlSerializer<SimulationResidualVsTimeChart>
+   {
    }
 }
diff --git a/src/OSPSuite.Core/Serialization/Xml/SimulationPredictedVsObservedChartXmlSerializer.cs b/src/OSPSuite.Core/Serialization/Xml/SimulationPredictedVsObservedChartXmlSerializer.cs
diff --git a/src/OSPSuite.UI/Binders/CurveBinder.cs b/src/OSPSuite.UI/Binders/CurveBinder.cs
@@ -488,6 +488,7 @@ private static MarkerKind mapFrom(Symbols symbol)
          switch (symbol)
          {
             case Symbols.None:
+               //We return an arbitrary symbol for none as it does not exist in DevExpress
                return MarkerKind.Square;
             case Symbols.Circle:
                return MarkerKind.Circle;
@@ -497,6 +498,21 @@ private static MarkerKind mapFrom(Symbols symbol)
                return MarkerKind.Triangle;
             case Symbols.Square:
                return MarkerKind.Square;
+            case Symbols.InvertedTriangle:
+               return MarkerKind.InvertedTriangle;
+            case Symbols.Plus:
+               return MarkerKind.Plus;
+            case Symbols.Cross:
+               return MarkerKind.Cross;
+            case Symbols.Star:
+               return MarkerKind.Star;
+            case Symbols.Pentagon:
+               return MarkerKind.Pentagon;
+            case Symbols.Hexagon:
+               return MarkerKind.Hexagon;
+            case Symbols.ThinCross:
+               return MarkerKind.ThinCross;
+
             default:
                throw new ArgumentOutOfRangeException(nameof(symbol));
          }