fix: enable user functions for scatter plots

mgreminger · Nov 14, 2023 · 505594e · 505594e
1 parent e7086c6
commit 505594e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/public/dimensional_analysis.py b/public/dimensional_analysis.py
@@ -317,6 +317,9 @@ class ScatterQueryStatement(TypedDict):
     cellNum: int
     isFromPlotCell: bool
     params: list[str] # will be empty list
+    functions: list[UserFunction | UserFunctionRange | FunctionUnitsQuery]
+    arguments: list[FunctionArgumentQuery | FunctionArgumentAssignment]
+    localSubs: list[LocalSubstitution | LocalSubstitutionRange]  
     implicitParams: list[ImplicitParameter]
     exponents: list[Exponent | ExponentName]
     xValuesQuery: ScatterXValuesQueryStatement

diff --git a/src/parser/LatexToSympy.ts b/src/parser/LatexToSympy.ts
@@ -679,10 +679,17 @@ export class LatexToSympy extends LatexParserVisitor<string | Statement | UnitBl
       outputUnits = this.visitU_block(ctx.u_block(1));
     }
 
+    if (this.rangeCount > 0) {
+      this.addParsingErrorMessage('Range may not be specified for a scatter plot.');
+    }
+
     return {
       type: "scatterQuery",
       asLines: Boolean(ctx.AS_LINES()),
       params: [],
+      functions: this.functions,
+      arguments: this.arguments,
+      localSubs: this.localSubs,
       implicitParams: this.implicitParams,
       exponents: this.exponents,
       equationIndex: this.equationIndex,

diff --git a/src/parser/types.ts b/src/parser/types.ts
@@ -219,6 +219,9 @@ export type ScatterQueryStatement = {
   type: "scatterQuery";
   asLines: boolean;
   params: [];
+  functions: (UserFunction | UserFunctionRange | FunctionUnitsQuery)[];
+  arguments: (FunctionArgumentAssignment | FunctionArgumentQuery) [];
+  localSubs: (LocalSubstitution | LocalSubstitutionRange)[];
   implicitParams: ImplicitParameter[];
   exponents: Exponent[];
   equationIndex: number;