From c36f74db1c630a4102418ae24359f0768e357f3b Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Sun, 16 Jul 2023 14:39:30 +0300 Subject: [PATCH] Remove unnecessary class --- src/Classes/controlLimitsClass.ts | 5 ++--- src/Classes/dataClass.ts | 5 ++--- src/Classes/plotKey.ts | 3 --- 3 files changed, 4 insertions(+), 9 deletions(-) delete mode 100644 src/Classes/plotKey.ts diff --git a/src/Classes/controlLimitsClass.ts b/src/Classes/controlLimitsClass.ts index 06d92cd..7b03568 100644 --- a/src/Classes/controlLimitsClass.ts +++ b/src/Classes/controlLimitsClass.ts @@ -1,5 +1,4 @@ import rep from "../Functions/rep"; -import plotKey from "./plotKey" import astronomical from "../Outlier Flagging/astronomical" import trend from "../Outlier Flagging/trend" import two_in_three from "../Outlier Flagging/two_in_three" @@ -8,7 +7,7 @@ import settingsClass from "./settingsClass"; import checkFlagDirection from "../Functions/checkFlagDirection" type controlLimitsArgs = { - keys: plotKey[]; + keys: { x: number, id: number, label: string }[]; values: number[]; numerators?: number[]; denominators?: number[]; @@ -23,7 +22,7 @@ type controlLimitsArgs = { class controlLimitsClass { [key: string] : any; - keys: plotKey[]; + keys: { x: number, id: number, label: string }[]; values: number[]; numerators?: number[]; denominators?: number[]; diff --git a/src/Classes/dataClass.ts b/src/Classes/dataClass.ts index a9f44dd..67d245b 100644 --- a/src/Classes/dataClass.ts +++ b/src/Classes/dataClass.ts @@ -6,12 +6,11 @@ import extractDataColumn from "../Functions/extractDataColumn" import settingsClass from "./settingsClass" import checkValidInput from "../Functions/checkValidInput" import extractValues from "../Functions/extractValues" -import plotKey from "./plotKey" import extractConditionalFormatting from "../Functions/extractConditionalFormatting" import { defaultSettingsType } from "./defaultSettings"; class dataClass { - keys: plotKey[]; + keys: { x: number, id: number, label: string }[]; numerators: number[]; denominators: number[]; xbar_sds: number[]; @@ -29,7 +28,7 @@ class dataClass { const scatter_cond = extractConditionalFormatting(inputView, "scatter", inputSettings) const valid_ids: number[] = new Array(); - const valid_keys: plotKey[] = new Array(); + const valid_keys: { x: number, id: number, label: string }[] = new Array<{ x: number, id: number, label: string }>(); for (let i: number = 0; i < numerators.length; i++) { if (checkValidInput(numerators[i], diff --git a/src/Classes/plotKey.ts b/src/Classes/plotKey.ts deleted file mode 100644 index 4aa9b19..0000000 --- a/src/Classes/plotKey.ts +++ /dev/null @@ -1,3 +0,0 @@ -type plotKey = { x: number, id: number, label: string } - -export default plotKey;