From c66d08b3522ded83b03da42aa4df55456131725e Mon Sep 17 00:00:00 2001 From: Ad5001 Date: Sun, 22 Sep 2024 21:59:11 +0200 Subject: [PATCH] Moving Modules to separate directory --- .../qml/eu/ad5001/LogarithmPlotter/js/autoload.mjs | 14 +++++++------- .../ad5001/LogarithmPlotter/js/history/color.mjs | 2 +- .../ad5001/LogarithmPlotter/js/history/common.mjs | 4 ++-- .../ad5001/LogarithmPlotter/js/history/create.mjs | 2 +- .../ad5001/LogarithmPlotter/js/history/delete.mjs | 2 +- .../LogarithmPlotter/js/history/editproperty.mjs | 4 ++-- .../eu/ad5001/LogarithmPlotter/js/history/name.mjs | 2 +- .../LogarithmPlotter/js/history/position.mjs | 4 ++-- .../LogarithmPlotter/js/history/visibility.mjs | 2 +- .../ad5001/LogarithmPlotter/js/math/expression.mjs | 6 +++--- .../ad5001/LogarithmPlotter/js/math/sequence.mjs | 6 +++--- .../LogarithmPlotter/js/{ => module}/canvas.mjs | 10 +++++----- .../js/{modules.mjs => module/common.mjs} | 0 .../integration.mjs => module/expreval.mjs} | 4 ++-- .../js/{history/module.mjs => module/history.mjs} | 4 ++-- .../ad5001/LogarithmPlotter/js/{ => module}/io.mjs | 4 ++-- .../LogarithmPlotter/js/{math => module}/latex.mjs | 2 +- .../LogarithmPlotter/js/{ => module}/objects.mjs | 4 ++-- .../js/{ => module}/preferences.mjs | 8 ++++---- .../ad5001/LogarithmPlotter/js/objs/autoload.mjs | 2 +- .../LogarithmPlotter/js/objs/bodemagnitude.mjs | 12 +++++------- .../LogarithmPlotter/js/objs/bodemagnitudesum.mjs | 4 ++-- .../ad5001/LogarithmPlotter/js/objs/bodephase.mjs | 10 +++++----- .../LogarithmPlotter/js/objs/bodephasesum.mjs | 4 ++-- .../eu/ad5001/LogarithmPlotter/js/objs/common.mjs | 4 ++-- .../LogarithmPlotter/js/objs/distribution.mjs | 4 ++-- .../ad5001/LogarithmPlotter/js/objs/function.mjs | 4 ++-- .../eu/ad5001/LogarithmPlotter/js/objs/point.mjs | 4 ++-- .../ad5001/LogarithmPlotter/js/objs/sequence.mjs | 4 ++-- .../eu/ad5001/LogarithmPlotter/js/objs/text.mjs | 4 ++-- .../eu/ad5001/LogarithmPlotter/js/objs/xcursor.mjs | 4 ++-- .../eu/ad5001/LogarithmPlotter/js/parameters.mjs | 8 ++++---- .../LogarithmPlotter/js/preferences/general.mjs | 4 ++-- 33 files changed, 77 insertions(+), 79 deletions(-) rename LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/{ => module}/canvas.mjs (98%) rename LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/{modules.mjs => module/common.mjs} (100%) rename LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/{lib/expr-eval/integration.mjs => module/expreval.mjs} (97%) rename LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/{history/module.mjs => module/history.mjs} (93%) rename LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/{ => module}/io.mjs (98%) rename LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/{math => module}/latex.mjs (99%) rename LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/{ => module}/objects.mjs (98%) rename LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/{ => module}/preferences.mjs (87%) diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/autoload.mjs b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/autoload.mjs index dcdaedb..085a5c5 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/autoload.mjs +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/autoload.mjs @@ -17,11 +17,11 @@ */ // Loading modules in order -import * as Objects from "./objects.mjs" -import * as ExprParser from "./lib/expr-eval/integration.mjs" +import * as Objects from "./module/objects.mjs" +import * as ExprParser from "./module/expreval.mjs" import * as ObjsAutoload from "./objs/autoload.mjs" -import * as Latex from "./math/latex.mjs" -import * as HistoryCommon from "./history/common.mjs" -import * as CanvasAPI from "./canvas.mjs" -import * as IOAPI from "./io.mjs" -import * as PreferencesAPI from "./preferences.mjs" +import * as Latex from "./module/latex.mjs" +import * as History from "./module/history.mjs" +import * as CanvasAPI from "./module/canvas.mjs" +import * as IOAPI from "./module/io.mjs" +import * as PreferencesAPI from "./module/preferences.mjs" diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/history/color.mjs b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/history/color.mjs index 12a8793..067da0c 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/history/color.mjs +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/history/color.mjs @@ -17,7 +17,7 @@ */ import EditedProperty from "editproperty.mjs" -import Objects from "../objects.mjs" +import Objects from "../module/objects.mjs" export default class ColorChanged extends EditedProperty { // Action used everytime when an object's color is changed diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/history/common.mjs b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/history/common.mjs index a9d7d60..41d28ce 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/history/common.mjs +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/history/common.mjs @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -import History from "./module.mjs" -import Latex from "../math/latex.mjs" +import History from "../module/history.mjs" +import Latex from "../module/latex.mjs" export class Action { /** diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/history/create.mjs b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/history/create.mjs index b2c7f2d..bd3dafd 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/history/create.mjs +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/history/create.mjs @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import Objects from "../objects.mjs" +import Objects from "../module/objects.mjs" import { Action } from "common.mjs" export default class CreateNewObject extends Action { diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/history/delete.mjs b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/history/delete.mjs index 7fa855d..c348c41 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/history/delete.mjs +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/history/delete.mjs @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import Objects from "../objects.mjs" +import Objects from "../module/objects.mjs" import CreateNewObject from "create.mjs" diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/history/editproperty.mjs b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/history/editproperty.mjs index 1280e54..febed9a 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/history/editproperty.mjs +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/history/editproperty.mjs @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -import Objects from "../objects.mjs" -import Latex from "../math/latex.mjs" +import Objects from "../module/objects.mjs" +import Latex from "../module/latex.mjs" import * as MathLib from "../mathlib.mjs" import { Action } from "common.mjs" import { DrawableObject } from "../objs/common.mjs" diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/history/name.mjs b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/history/name.mjs index 13417da..a852923 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/history/name.mjs +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/history/name.mjs @@ -17,7 +17,7 @@ */ import EditedProperty from "editproperty.mjs" -import Objects from "../objects.mjs" +import Objects from "../module/objects.mjs" export default class NameChanged extends EditedProperty { diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/history/position.mjs b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/history/position.mjs index b071cc7..14b5bac 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/history/position.mjs +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/history/position.mjs @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -import Objects from "../objects.mjs" -import Latex from "../math/latex.mjs" +import Objects from "../module/objects.mjs" +import Latex from "../module/latex.mjs" import * as MathLib from "../mathlib.mjs" import { escapeHTML } from "../utils.mjs" import { Action } from "common.mjs" diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/history/visibility.mjs b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/history/visibility.mjs index ebcb4fa..c04e0a4 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/history/visibility.mjs +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/history/visibility.mjs @@ -17,7 +17,7 @@ */ import EditedProperty from "editproperty.mjs" -import Objects from "../objects.mjs" +import Objects from "../module/objects.mjs" export default class EditedVisibility extends EditedProperty { diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/math/expression.mjs b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/math/expression.mjs index eb8ac8a..8a7bf77 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/math/expression.mjs +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/math/expression.mjs @@ -17,10 +17,10 @@ */ -import Latex from "latex.mjs" import * as Utils from "../utils.mjs" -import ExprParser from "../lib/expr-eval/integration.mjs" -import Objects from "../objects.mjs" +import Latex from "../module/latex.mjs" +import ExprParser from "../module/expreval.mjs" +import Objects from "../module/objects.mjs" /** * Represents any kind of x-based or non variable based expression. diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/math/sequence.mjs b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/math/sequence.mjs index abc04c1..d524e44 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/math/sequence.mjs +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/math/sequence.mjs @@ -18,9 +18,9 @@ import * as Expr from "expression.mjs" import * as Utils from "../utils.mjs" -import Latex from "./latex.mjs" -import Objects from "../objects.mjs" -import ExprParser from "../lib/expr-eval/integration.mjs" +import Latex from "../module/latex.mjs" +import Objects from "../module/objects.mjs" +import ExprParser from "../module/expreval.mjs" /** * Represents mathematical object for sequences. diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/canvas.mjs b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/module/canvas.mjs similarity index 98% rename from LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/canvas.mjs rename to LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/module/canvas.mjs index 3736a11..cd86c6e 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/canvas.mjs +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/module/canvas.mjs @@ -16,12 +16,12 @@ * along with this program. If not, see . */ -import { Module } from "./modules.mjs" -import { textsup } from "./utils.mjs" -import { Expression } from "./mathlib.mjs" -import Latex from "./math/latex.mjs" +import { Module } from "./common.mjs" +import { textsup } from "../utils.mjs" +import { Expression } from "../mathlib.mjs" +import Latex from "./latex.mjs" import Objects from "./objects.mjs" -import History from "./history/module.mjs" +import History from "./history.mjs" class CanvasAPI extends Module { diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/modules.mjs b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/module/common.mjs similarity index 100% rename from LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/modules.mjs rename to LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/module/common.mjs diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/lib/expr-eval/integration.mjs b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/module/expreval.mjs similarity index 97% rename from LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/lib/expr-eval/integration.mjs rename to LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/module/expreval.mjs index 2b99c9a..9ad06d5 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/lib/expr-eval/integration.mjs +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/module/expreval.mjs @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -import { Module } from "../../modules.mjs" -import { Parser } from "./parser.mjs" +import { Module } from "./common.mjs" +import { Parser } from "../lib/expr-eval/parser.mjs" const evalVariables = { // Variables not provided by expr-eval.js, needs to be provided manually diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/history/module.mjs b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/module/history.mjs similarity index 93% rename from LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/history/module.mjs rename to LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/module/history.mjs index 873502a..27eedcb 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/history/module.mjs +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/module/history.mjs @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -import { Module } from "../modules.mjs" -import Latex from "../math/latex.mjs" +import { Module } from "./common.mjs" +import Latex from "./latex.mjs" class HistoryAPI extends Module { diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/io.mjs b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/module/io.mjs similarity index 98% rename from LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/io.mjs rename to LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/module/io.mjs index 0186321..bc9a1db 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/io.mjs +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/module/io.mjs @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -import { Module } from "./modules.mjs" +import { Module } from "./common.mjs" import Objects from "./objects.mjs" -import History from "./history/module.mjs" +import History from "./history.mjs" import Canvas from "./canvas.mjs" class IOAPI extends Module { diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/math/latex.mjs b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/module/latex.mjs similarity index 99% rename from LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/math/latex.mjs rename to LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/module/latex.mjs index ad4c1f2..32f048b 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/math/latex.mjs +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/module/latex.mjs @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import { Module } from "../modules.mjs" +import { Module } from "./common.mjs" import * as Instruction from "../lib/expr-eval/instruction.mjs" import { escapeValue } from "../lib/expr-eval/expression.mjs" diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objects.mjs b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/module/objects.mjs similarity index 98% rename from LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objects.mjs rename to LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/module/objects.mjs index ef45429..5a63386 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objects.mjs +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/module/objects.mjs @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -import { Module } from './modules.mjs' -import { textsub } from './utils.mjs' +import { Module } from './common.mjs' +import { textsub } from '../utils.mjs' class ObjectsAPI extends Module { diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/preferences.mjs b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/module/preferences.mjs similarity index 87% rename from LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/preferences.mjs rename to LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/module/preferences.mjs index 40ac532..e76596e 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/preferences.mjs +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/module/preferences.mjs @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -import {Module} from "modules.mjs" -import General from "preferences/general.mjs" -import Editor from "preferences/expression.mjs" -import DefaultGraph from "preferences/default.mjs" +import {Module} from "./common.mjs" +import General from "../preferences/general.mjs" +import Editor from "../preferences/expression.mjs" +import DefaultGraph from "../preferences/default.mjs" class PreferencesAPI extends Module { constructor() { diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/autoload.mjs b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/autoload.mjs index 6173faf..a7351b5 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/autoload.mjs +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/autoload.mjs @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import Objects from "../objects.mjs" +import Objects from "../module/objects.mjs" import { DrawableObject } from "common.mjs" import Point from "point.mjs" import Text from "text.mjs" diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/bodemagnitude.mjs b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/bodemagnitude.mjs index c01bcae..05e1150 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/bodemagnitude.mjs +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/bodemagnitude.mjs @@ -17,17 +17,15 @@ */ import { parseDomain, executeExpression, Expression, EmptySet, Domain } from "../mathlib.mjs" +import { CreateNewObject } from "../historylib.mjs" import * as P from "../parameters.mjs" -import Objects from "../objects.mjs" -import Latex from "../math/latex.mjs" +import Objects from "../module/objects.mjs" +import Latex from "../module/latex.mjs" +import History from "../module/history.mjs" import { ExecutableObject } from "common.mjs" import Function from "function.mjs" -import { API as HistoryAPI } from "../history/common.mjs" -import { CreateNewObject } from "../historylib.mjs" - - export default class BodeMagnitude extends ExecutableObject { static type(){return 'Gain Bode'} static displayType(){return qsTranslate("bodemagnitude", 'Bode Magnitude')} @@ -52,7 +50,7 @@ export default class BodeMagnitude extends ExecutableObject { if(om_0 == null) { // Create new point om_0 = Objects.createNewRegisteredObject('Point', [Objects.getNewName('ω'), true, this.color, 'name']) - HistoryAPI.addToHistory(new CreateNewObject(om_0.name, 'Point', om_0.export())) + History.addToHistory(new CreateNewObject(om_0.name, 'Point', om_0.export())) om_0.update() labelPosition = 'below' } diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/bodemagnitudesum.mjs b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/bodemagnitudesum.mjs index 82bf6b6..4531bee 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/bodemagnitudesum.mjs +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/bodemagnitudesum.mjs @@ -18,8 +18,8 @@ import { Range, Expression, Domain } from "../mathlib.mjs" import * as P from "../parameters.mjs" -import Objects from "../objects.mjs" -import Latex from "../math/latex.mjs" +import Objects from "../module/objects.mjs" +import Latex from "../module/latex.mjs" import { ExecutableObject } from "common.mjs" import Function from "function.mjs" diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/bodephase.mjs b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/bodephase.mjs index 23119ef..cce63fa 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/bodephase.mjs +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/bodephase.mjs @@ -17,11 +17,11 @@ */ import { executeExpression, Expression } from "../mathlib.mjs" -import * as P from "../parameters.mjs" -import Objects from "../objects.mjs" -import { API as HistoryAPI } from "../history/common.mjs" import { CreateNewObject } from "../historylib.mjs" -import Latex from "../math/latex.mjs" +import * as P from "../parameters.mjs" +import Objects from "../module/objects.mjs" +import History from "../module/history.mjs" +import Latex from "../module/latex.mjs" import { ExecutableObject } from "common.mjs" @@ -52,7 +52,7 @@ export default class BodePhase extends ExecutableObject { // Create new point om_0 = Objects.createNewRegisteredObject('Point', [Objects.getNewName('ω'), this.color, 'name']) om_0.labelPosition = this.phase.execute() >= 0 ? 'above' : 'below' - HistoryAPI.history.addToHistory(new CreateNewObject(om_0.name, 'Point', om_0.export())) + History.history.addToHistory(new CreateNewObject(om_0.name, 'Point', om_0.export())) labelPosition = 'below' } om_0.requiredBy.push(this) diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/bodephasesum.mjs b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/bodephasesum.mjs index 1f1a0fa..d55a29c 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/bodephasesum.mjs +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/bodephasesum.mjs @@ -18,8 +18,8 @@ import { executeExpression, Expression } from "../mathlib.mjs" import * as P from "../parameters.mjs" -import Objects from "../objects.mjs" -import Latex from "../math/latex.mjs" +import Objects from "../module/objects.mjs" +import Latex from "../module/latex.mjs" import { ExecutableObject } from "common.mjs" diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/common.mjs b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/common.mjs index b27cbf3..9b13fbd 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/common.mjs +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/common.mjs @@ -17,8 +17,8 @@ */ import { getRandomColor, textsub } from "../utils.mjs" -import Objects from "../objects.mjs" -import Latex from "../math/latex.mjs" +import Objects from "../module/objects.mjs" +import Latex from "../module/latex.mjs" import {ensureTypeSafety, serializesByPropertyType} from "../parameters.mjs" // This file contains the default data to be imported from all other objects diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/distribution.mjs b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/distribution.mjs index e0fe698..1ad9a7e 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/distribution.mjs +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/distribution.mjs @@ -17,8 +17,8 @@ */ import * as P from "../parameters.mjs" -import Objects from "../objects.mjs" -import Latex from "../math/latex.mjs" +import Objects from "../module/objects.mjs" +import Latex from "../module/latex.mjs" import { ExecutableObject } from "common.mjs" diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/function.mjs b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/function.mjs index eb3f081..31afc37 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/function.mjs +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/function.mjs @@ -17,11 +17,11 @@ */ import { textsub } from "../utils.mjs" -import Objects from "../objects.mjs" +import Objects from "../module/objects.mjs" import { ExecutableObject } from "common.mjs" import { parseDomain, Expression, SpecialDomain } from "../mathlib.mjs" import * as P from "../parameters.mjs" -import Latex from "../math/latex.mjs" +import Latex from "../module/latex.mjs" export default class Function extends ExecutableObject { diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/point.mjs b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/point.mjs index 503026e..7264894 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/point.mjs +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/point.mjs @@ -18,8 +18,8 @@ import { Expression } from "../mathlib.mjs" import * as P from "../parameters.mjs" -import Objects from "../objects.mjs" -import Latex from "../math/latex.mjs" +import Objects from "../module/objects.mjs" +import Latex from "../module/latex.mjs" import { DrawableObject } from "common.mjs" diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/sequence.mjs b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/sequence.mjs index b05a66e..5d431af 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/sequence.mjs +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/sequence.mjs @@ -18,8 +18,8 @@ import { Sequence as MathSequence, Domain } from "../mathlib.mjs" import * as P from "../parameters.mjs" -import Latex from "../math/latex.mjs" -import Objects from "../objects.mjs" +import Latex from "../module/latex.mjs" +import Objects from "../module/objects.mjs" import { ExecutableObject } from "common.mjs" import Function from "function.mjs" diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/text.mjs b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/text.mjs index 3ad1e82..a819d7a 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/text.mjs +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/text.mjs @@ -18,8 +18,8 @@ import { Expression } from "../mathlib.mjs" import * as P from "../parameters.mjs" -import Objects from "../objects.mjs" -import Latex from "../math/latex.mjs" +import Objects from "../module/objects.mjs" +import Latex from "../module/latex.mjs" import { DrawableObject } from "common.mjs" diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/xcursor.mjs b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/xcursor.mjs index f377a74..63c85d3 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/xcursor.mjs +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/xcursor.mjs @@ -18,8 +18,8 @@ import { Expression } from "../mathlib.mjs" import * as P from "../parameters.mjs" -import Latex from "../math/latex.mjs" -import Objects from "../objects.mjs" +import Latex from "../module/latex.mjs" +import Objects from "../module/objects.mjs" import { DrawableObject } from "common.mjs" diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/parameters.mjs b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/parameters.mjs index 477e3d5..6cd9e04 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/parameters.mjs +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/parameters.mjs @@ -16,7 +16,7 @@ * along with this program. If not, see . */ import {parseDomain, Expression as Expr, Domain} from "./mathlib.mjs" -import { Objects } from "./objects.mjs" +import Objects from "./module/objects.mjs" const NONE = class Empty {} @@ -175,15 +175,15 @@ export class List extends PropertyType { parse(value) { let result = NONE if(typeof value == 'object' && value.__proto__ === Array) { - let list = [] + let valid = 0 for(let v of value) { if (this.format.test(v)) { v = stringValuesValidators[this.valueType][0](v) if(stringValuesValidators[this.valueType][1](v)) - list.append(v) + valid++ } } - if(list.length === value.length) + if(valid === value.length) // Ensure every value is valid. result = value } return result diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/preferences/general.mjs b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/preferences/general.mjs index d5f2fb5..2c5ef17 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/preferences/general.mjs +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/preferences/general.mjs @@ -17,8 +17,8 @@ */ import {BoolSetting} from "common.mjs" -import Canvas from "../canvas.mjs" -import LatexAPI from "../math/latex.mjs" +import Canvas from "../module/canvas.mjs" +import LatexAPI from "../module/latex.mjs" const CHECK_FOR_UPDATES = new BoolSetting( qsTranslate("general", "Check for updates on startup"),