Merge pull request #163 from SpiceSharp/fix_plot

Fix .PLOT directive
SpiceSharp · Oct 19, 2024 · da694c4 · da694c4
2 parents 074807d + 910aa0a
commit da694c4
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/src/SpiceSharpParser/ModelReaders/Netlist/Spice/Readers/Controls/PlotControl.cs b/src/SpiceSharpParser/ModelReaders/Netlist/Spice/Readers/Controls/PlotControl.cs
@@ -155,15 +155,33 @@ private void AddPlotToResultIfValid(string plotImage, IReadingContext context, X
             }
             else
             {
-                context.Result.ValidationResult.AddError(ValidationEntrySource.Reader,  $"{plotImage} is not valid for: {simulation.Name}");
+                context.Result.ValidationResult.AddError(ValidationEntrySource.Reader, $"{plotImage} is not valid for: {simulation.Name}");
             }
         }
 
         private void CreatePointForSeries(ISimulationWithEvents simulation, IReadingContext context, object eventArgs, List<Export> exports, List<Series> series)
         {
             double x = 0;
 
-            //TODO
+            if (simulation is Transient transient)
+            {
+                x = transient.Time;
+            }
+
+            if (simulation is AC frequency)
+            {
+                x = frequency.Frequency;
+            }
+
+            if (simulation is Noise noise)
+            {
+                x = noise.Frequency;
+            }
+
+            if (simulation is DC dc)
+            {
+                x = dc.GetCurrentSweepValue().FirstOrDefault();
+            }
 
             for (var i = 0; i < exports.Count; i++)
             {

diff --git a/src/SpiceSharpParser/SpiceSharpParser.csproj b/src/SpiceSharpParser/SpiceSharpParser.csproj
@@ -22,7 +22,7 @@
     <StartupObject />
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <LangVersion>latest</LangVersion>
-    <Version>3.2.0</Version>
+    <Version>3.2.1</Version>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard1.5|AnyCPU'">