diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/AppMenuBar.qml b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/AppMenuBar.qml
index 59c7973..d0c2621 100644
--- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/AppMenuBar.qml
+++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/AppMenuBar.qml
@@ -20,7 +20,7 @@ import QtQuick
import Qt.labs.platform as Native
//import QtQuick.Controls 2.15
import eu.ad5001.MixedMenu 1.1
-import "js/historylib.mjs" as HistoryLib
+import "js/history/index.mjs" as HistoryLib
/*!
diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/History/History.qml b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/History/History.qml
index afc7281..e1e527d 100644
--- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/History/History.qml
+++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/History/History.qml
@@ -19,14 +19,14 @@
import QtQuick
import QtQml
import QtQuick.Window
-import "../js/historylib.mjs" as HistoryLib
+import "../js/history/index.mjs" as HistoryLib
/*!
\qmltype History
\inqmlmodule eu.ad5001.LogarithmPlotter.History
\brief QObject holding persistantly for undo & redo stacks.
- \sa HistoryBrowser, historylib
+ \sa HistoryBrowser, HistoryLib
*/
Item {
// Using a QtObject is necessary in order to have proper property propagation in QML
@@ -107,7 +107,7 @@ Item {
/*!
\qmlmethod void History::addToHistory(var action)
- Adds an instance of historylib.Action to history.
+ Adds an instance of HistoryLib.Action to history.
*/
function addToHistory(action) {
if(action instanceof HistoryLib.Action) {
@@ -124,7 +124,7 @@ Item {
/*!
\qmlmethod void History::undo(bool updateObjectList = true)
- Undoes the historylib.Action at the top of the undo stack and pushes it to the top of the redo stack.
+ Undoes the HistoryLib.Action at the top of the undo stack and pushes it to the top of the redo stack.
By default, will update the graph and the object list. This behavior can be disabled by setting the \c updateObjectList to false.
*/
function undo(updateObjectList = true) {
@@ -142,7 +142,7 @@ Item {
/*!
\qmlmethod void History::redo(bool updateObjectList = true)
- Redoes the historylib.Action at the top of the redo stack and pushes it to the top of the undo stack.
+ Redoes the HistoryLib.Action at the top of the redo stack and pushes it to the top of the undo stack.
By default, will update the graph and the object list. This behavior can be disabled by setting the \c updateObjectList to false.
*/
function redo(updateObjectList = true) {
@@ -160,7 +160,7 @@ Item {
/*!
\qmlmethod void History::undoMultipleDefered(int toUndoCount)
- Undoes several historylib.Action at the top of the undo stack and pushes them to the top of the redo stack.
+ Undoes several HistoryLib.Action at the top of the undo stack and pushes them to the top of the redo stack.
It undoes them deferedly to avoid overwhelming the computer while creating a cool short accelerated summary of all changes.
*/
function undoMultipleDefered(toUndoCount) {
@@ -173,7 +173,7 @@ Item {
/*!
\qmlmethod void History::redoMultipleDefered(int toRedoCount)
- Redoes several historylib.Action at the top of the redo stack and pushes them to the top of the undo stack.
+ Redoes several HistoryLib.Action at the top of the redo stack and pushes them to the top of the undo stack.
It redoes them deferedly to avoid overwhelming the computer while creating a cool short accelerated summary of all changes.
*/
function redoMultipleDefered(toRedoCount) {
diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/LogGraphCanvas.qml b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/LogGraphCanvas.qml
index c2d9f60..4159497 100644
--- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/LogGraphCanvas.qml
+++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/LogGraphCanvas.qml
@@ -19,7 +19,7 @@
import QtQuick
import Qt.labs.platform as Native
import "js/utils.mjs" as Utils
-import "js/mathlib.mjs" as MathLib
+import "js/math/index.mjs" as MathLib
/*!
\qmltype LogGraphCanvas
diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ObjectLists/Editor/CustomPropertyList.qml b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ObjectLists/Editor/CustomPropertyList.qml
index 17ffed9..361dcbf 100644
--- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ObjectLists/Editor/CustomPropertyList.qml
+++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ObjectLists/Editor/CustomPropertyList.qml
@@ -20,9 +20,9 @@ import QtQuick
import QtQuick.Controls
import Qt.labs.platform as Native
import eu.ad5001.LogarithmPlotter.Setting 1.0 as Setting
-import "../../js/historylib.mjs" as HistoryLib
+import "../../js/history/index.mjs" as HistoryLib
import "../../js/utils.mjs" as Utils
-import "../../js/mathlib.mjs" as MathLib
+import "../../js/math/index.mjs" as MathLib
/*!
\qmltype CustomPropertyList
diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ObjectLists/Editor/Dialog.qml b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ObjectLists/Editor/Dialog.qml
index 6f650ef..7a357b3 100644
--- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ObjectLists/Editor/Dialog.qml
+++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ObjectLists/Editor/Dialog.qml
@@ -22,9 +22,9 @@ import QtQuick.Dialogs as D
import Qt.labs.platform as Native
import eu.ad5001.LogarithmPlotter.Setting 1.0 as Setting
import eu.ad5001.LogarithmPlotter.Popup 1.0 as Popup
-import "../../js/historylib.mjs" as HistoryLib
+import "../../js/history/index.mjs" as HistoryLib
import "../../js/utils.mjs" as Utils
-import "../../js/mathlib.mjs" as MathLib
+import "../../js/math/index.mjs" as MathLib
/*!
\qmltype Dialog
diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectCreationGrid.qml b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectCreationGrid.qml
index 3e621b0..3d0a56a 100644
--- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectCreationGrid.qml
+++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectCreationGrid.qml
@@ -18,7 +18,7 @@
import QtQuick
import QtQuick.Controls
-import "../js/historylib.mjs" as HistoryLib
+import "../js/history/index.mjs" as HistoryLib
import eu.ad5001.LogarithmPlotter.Setting 1.0 as Setting
diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectRow.qml b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectRow.qml
index f846490..2dcd5c0 100644
--- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectRow.qml
+++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectRow.qml
@@ -21,7 +21,7 @@ import QtQuick.Dialogs
import QtQuick.Controls
import QtQuick.Window
import eu.ad5001.LogarithmPlotter.Setting 1.0 as Setting
-import "../js/historylib.mjs" as HistoryLib
+import "../js/history/index.mjs" as HistoryLib
/*!
diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/PickLocationOverlay.qml b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/PickLocationOverlay.qml
index 0139c5b..cecdf13 100644
--- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/PickLocationOverlay.qml
+++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/PickLocationOverlay.qml
@@ -19,8 +19,8 @@
import QtQuick
import QtQuick.Controls
import eu.ad5001.LogarithmPlotter.Setting 1.0 as Setting
-import "js/mathlib.mjs" as MathLib
-import "js/historylib.mjs" as HistoryLib
+import "js/math/index.mjs" as MathLib
+import "js/history/index.mjs" as HistoryLib
/*!
\qmltype PickLocationOverlay
diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Setting/ExpressionEditor.qml b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Setting/ExpressionEditor.qml
index e19fd9d..6a17423 100644
--- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Setting/ExpressionEditor.qml
+++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Setting/ExpressionEditor.qml
@@ -20,7 +20,7 @@ import QtQuick.Controls
import QtQuick
import Qt.labs.platform as Native
import eu.ad5001.LogarithmPlotter.Popup 1.0 as P
-import "../js/mathlib.mjs" as MathLib
+import "../js/math/index.mjs" as MathLib
import "../js/utils.mjs" as Utils
import "../js/parsing/parsing.mjs" as Parsing
diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ViewPositionChangeOverlay.qml b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ViewPositionChangeOverlay.qml
index 6ba180e..b06fbcf 100644
--- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ViewPositionChangeOverlay.qml
+++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ViewPositionChangeOverlay.qml
@@ -19,8 +19,8 @@
import QtQuick
import QtQuick.Controls
import eu.ad5001.LogarithmPlotter.Setting 1.0 as Setting
-import "js/mathlib.mjs" as MathLib
-import "js/historylib.mjs" as HistoryLib
+import "js/math/index.mjs" as MathLib
+import "js/history/index.mjs" as HistoryLib
/*!
\qmltype ViewPositionChangeOverlay
diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/history/editproperty.mjs b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/history/editproperty.mjs
index febed9a..de84449 100644
--- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/history/editproperty.mjs
+++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/history/editproperty.mjs
@@ -18,7 +18,7 @@
import Objects from "../module/objects.mjs"
import Latex from "../module/latex.mjs"
-import * as MathLib from "../mathlib.mjs"
+import * as MathLib from "../math/index.mjs"
import { Action } from "common.mjs"
import { DrawableObject } from "../objs/common.mjs"
diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/historylib.mjs b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/history/index.mjs
similarity index 83%
rename from LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/historylib.mjs
rename to LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/history/index.mjs
index 189d59b..aa57307 100644
--- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/historylib.mjs
+++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/history/index.mjs
@@ -19,14 +19,14 @@
// This library helps containing actions to be undone or redone (in other words, editing history)
// Each type of event is repertoried as an action that can be listed for everything that's undoable.
-import { Action as A } from "history/common.mjs"
-import Create from "history/create.mjs"
-import Delete from "history/delete.mjs"
-import EP from "history/editproperty.mjs"
-import Pos from "history/position.mjs"
-import V from "history/visibility.mjs"
-import Name from "history/name.mjs"
-import Color from "history/color.mjs"
+import { Action as A } from "./common.mjs"
+import Create from "./create.mjs"
+import Delete from "./delete.mjs"
+import EP from "./editproperty.mjs"
+import Pos from "./position.mjs"
+import V from "./visibility.mjs"
+import Name from "./name.mjs"
+import Color from "./color.mjs"
export const Action = A
diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/history/position.mjs b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/history/position.mjs
index 14b5bac..c568615 100644
--- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/history/position.mjs
+++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/history/position.mjs
@@ -18,7 +18,7 @@
import Objects from "../module/objects.mjs"
import Latex from "../module/latex.mjs"
-import * as MathLib from "../mathlib.mjs"
+import * as MathLib from "../math/index.mjs"
import { escapeHTML } from "../utils.mjs"
import { Action } from "common.mjs"
import { DrawableObject } from "../objs/common.mjs"
diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/mathlib.mjs b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/math/index.mjs
similarity index 91%
rename from LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/mathlib.mjs
rename to LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/math/index.mjs
index 88f9c1e..27be49e 100644
--- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/mathlib.mjs
+++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/math/index.mjs
@@ -17,9 +17,9 @@
*/
-import * as Expr from "math/expression.mjs"
-import * as Seq from "math/sequence.mjs"
-import * as Dom from "math/domain.mjs"
+import * as Expr from "./expression.mjs"
+import * as Seq from "./sequence.mjs"
+import * as Dom from "./domain.mjs"
export const Expression = Expr.Expression
diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/module/canvas.mjs b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/module/canvas.mjs
index cd86c6e..020ff88 100644
--- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/module/canvas.mjs
+++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/module/canvas.mjs
@@ -18,7 +18,7 @@
import { Module } from "./common.mjs"
import { textsup } from "../utils.mjs"
-import { Expression } from "../mathlib.mjs"
+import { Expression } from "../math/index.mjs"
import Latex from "./latex.mjs"
import Objects from "./objects.mjs"
import History from "./history.mjs"
diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/bodemagnitude.mjs b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/bodemagnitude.mjs
index 05e1150..7ca294d 100644
--- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/bodemagnitude.mjs
+++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/bodemagnitude.mjs
@@ -16,8 +16,8 @@
* along with this program. If not, see .
*/
-import { parseDomain, executeExpression, Expression, EmptySet, Domain } from "../mathlib.mjs"
-import { CreateNewObject } from "../historylib.mjs"
+import { parseDomain, executeExpression, Expression, EmptySet, Domain } from "../math/index.mjs"
+import { CreateNewObject } from "../history/index.mjs"
import * as P from "../parameters.mjs"
import Objects from "../module/objects.mjs"
import Latex from "../module/latex.mjs"
diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/bodemagnitudesum.mjs b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/bodemagnitudesum.mjs
index 4531bee..7d5c3e4 100644
--- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/bodemagnitudesum.mjs
+++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/bodemagnitudesum.mjs
@@ -16,7 +16,7 @@
* along with this program. If not, see .
*/
-import { Range, Expression, Domain } from "../mathlib.mjs"
+import { Range, Expression, Domain } from "../math/index.mjs"
import * as P from "../parameters.mjs"
import Objects from "../module/objects.mjs"
import Latex from "../module/latex.mjs"
diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/bodephase.mjs b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/bodephase.mjs
index cce63fa..3cafd52 100644
--- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/bodephase.mjs
+++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/bodephase.mjs
@@ -16,8 +16,8 @@
* along with this program. If not, see .
*/
-import { executeExpression, Expression } from "../mathlib.mjs"
-import { CreateNewObject } from "../historylib.mjs"
+import { executeExpression, Expression } from "../math/index.mjs"
+import { CreateNewObject } from "../history/index.mjs"
import * as P from "../parameters.mjs"
import Objects from "../module/objects.mjs"
import History from "../module/history.mjs"
diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/bodephasesum.mjs b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/bodephasesum.mjs
index d55a29c..cee3235 100644
--- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/bodephasesum.mjs
+++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/bodephasesum.mjs
@@ -16,7 +16,7 @@
* along with this program. If not, see .
*/
-import { executeExpression, Expression } from "../mathlib.mjs"
+import { executeExpression, Expression } from "../math/index.mjs"
import * as P from "../parameters.mjs"
import Objects from "../module/objects.mjs"
import Latex from "../module/latex.mjs"
diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/function.mjs b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/function.mjs
index 31afc37..752aa52 100644
--- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/function.mjs
+++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/function.mjs
@@ -19,7 +19,7 @@
import { textsub } from "../utils.mjs"
import Objects from "../module/objects.mjs"
import { ExecutableObject } from "common.mjs"
-import { parseDomain, Expression, SpecialDomain } from "../mathlib.mjs"
+import { parseDomain, Expression, SpecialDomain } from "../math/index.mjs"
import * as P from "../parameters.mjs"
import Latex from "../module/latex.mjs"
diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/point.mjs b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/point.mjs
index 7264894..33d3858 100644
--- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/point.mjs
+++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/point.mjs
@@ -16,7 +16,7 @@
* along with this program. If not, see .
*/
-import { Expression } from "../mathlib.mjs"
+import { Expression } from "../math/index.mjs"
import * as P from "../parameters.mjs"
import Objects from "../module/objects.mjs"
import Latex from "../module/latex.mjs"
diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/sequence.mjs b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/sequence.mjs
index 5d431af..0d2c488 100644
--- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/sequence.mjs
+++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/sequence.mjs
@@ -16,7 +16,7 @@
* along with this program. If not, see .
*/
-import { Sequence as MathSequence, Domain } from "../mathlib.mjs"
+import { Sequence as MathSequence, Domain } from "../math/index.mjs"
import * as P from "../parameters.mjs"
import Latex from "../module/latex.mjs"
import Objects from "../module/objects.mjs"
diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/text.mjs b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/text.mjs
index a819d7a..bd30dfe 100644
--- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/text.mjs
+++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/text.mjs
@@ -16,7 +16,7 @@
* along with this program. If not, see .
*/
-import { Expression } from "../mathlib.mjs"
+import { Expression } from "../math/index.mjs"
import * as P from "../parameters.mjs"
import Objects from "../module/objects.mjs"
import Latex from "../module/latex.mjs"
diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/xcursor.mjs b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/xcursor.mjs
index 63c85d3..20dc548 100644
--- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/xcursor.mjs
+++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/xcursor.mjs
@@ -16,7 +16,7 @@
* along with this program. If not, see .
*/
-import { Expression } from "../mathlib.mjs"
+import { Expression } from "../math/index.mjs"
import * as P from "../parameters.mjs"
import Latex from "../module/latex.mjs"
import Objects from "../module/objects.mjs"
diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/parameters.mjs b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/parameters.mjs
index 6cd9e04..b301997 100644
--- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/parameters.mjs
+++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/parameters.mjs
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-import {parseDomain, Expression as Expr, Domain} from "./mathlib.mjs"
+import {parseDomain, Expression as Expr, Domain} from "./math/index.mjs"
import Objects from "./module/objects.mjs"
const NONE = class Empty {}
diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/preferences/common.mjs b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/preferences/common.mjs
index 4503113..37c7577 100644
--- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/preferences/common.mjs
+++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/preferences/common.mjs
@@ -16,7 +16,7 @@
* along with this program. If not, see .
*/
-import {Expression} from "../mathlib.mjs"
+import {Expression} from "../math/index.mjs"
class Setting {
constructor(type, name, nameInConfig, icon) {