Moving mathlib and historylib into math/index and history/index
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
Ad5001 2024-09-23 18:32:11 +02:00
parent bac802ec5b
commit 45dff33bb5
Signed by: Ad5001
GPG key ID: EF45F9C6AFE20160
26 changed files with 47 additions and 47 deletions

View file

@ -20,7 +20,7 @@ import QtQuick
import Qt.labs.platform as Native import Qt.labs.platform as Native
//import QtQuick.Controls 2.15 //import QtQuick.Controls 2.15
import eu.ad5001.MixedMenu 1.1 import eu.ad5001.MixedMenu 1.1
import "js/historylib.mjs" as HistoryLib import "js/history/index.mjs" as HistoryLib
/*! /*!

View file

@ -19,14 +19,14 @@
import QtQuick import QtQuick
import QtQml import QtQml
import QtQuick.Window import QtQuick.Window
import "../js/historylib.mjs" as HistoryLib import "../js/history/index.mjs" as HistoryLib
/*! /*!
\qmltype History \qmltype History
\inqmlmodule eu.ad5001.LogarithmPlotter.History \inqmlmodule eu.ad5001.LogarithmPlotter.History
\brief QObject holding persistantly for undo & redo stacks. \brief QObject holding persistantly for undo & redo stacks.
\sa HistoryBrowser, historylib \sa HistoryBrowser, HistoryLib
*/ */
Item { Item {
// Using a QtObject is necessary in order to have proper property propagation in QML // 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) \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) { function addToHistory(action) {
if(action instanceof HistoryLib.Action) { if(action instanceof HistoryLib.Action) {
@ -124,7 +124,7 @@ Item {
/*! /*!
\qmlmethod void History::undo(bool updateObjectList = true) \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. 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) { function undo(updateObjectList = true) {
@ -142,7 +142,7 @@ Item {
/*! /*!
\qmlmethod void History::redo(bool updateObjectList = true) \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. 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) { function redo(updateObjectList = true) {
@ -160,7 +160,7 @@ Item {
/*! /*!
\qmlmethod void History::undoMultipleDefered(int toUndoCount) \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. It undoes them deferedly to avoid overwhelming the computer while creating a cool short accelerated summary of all changes.
*/ */
function undoMultipleDefered(toUndoCount) { function undoMultipleDefered(toUndoCount) {
@ -173,7 +173,7 @@ Item {
/*! /*!
\qmlmethod void History::redoMultipleDefered(int toRedoCount) \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. It redoes them deferedly to avoid overwhelming the computer while creating a cool short accelerated summary of all changes.
*/ */
function redoMultipleDefered(toRedoCount) { function redoMultipleDefered(toRedoCount) {

View file

@ -19,7 +19,7 @@
import QtQuick import QtQuick
import Qt.labs.platform as Native import Qt.labs.platform as Native
import "js/utils.mjs" as Utils import "js/utils.mjs" as Utils
import "js/mathlib.mjs" as MathLib import "js/math/index.mjs" as MathLib
/*! /*!
\qmltype LogGraphCanvas \qmltype LogGraphCanvas

View file

@ -20,9 +20,9 @@ import QtQuick
import QtQuick.Controls import QtQuick.Controls
import Qt.labs.platform as Native import Qt.labs.platform as Native
import eu.ad5001.LogarithmPlotter.Setting 1.0 as Setting 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/utils.mjs" as Utils
import "../../js/mathlib.mjs" as MathLib import "../../js/math/index.mjs" as MathLib
/*! /*!
\qmltype CustomPropertyList \qmltype CustomPropertyList

View file

@ -22,9 +22,9 @@ import QtQuick.Dialogs as D
import Qt.labs.platform as Native import Qt.labs.platform as Native
import eu.ad5001.LogarithmPlotter.Setting 1.0 as Setting import eu.ad5001.LogarithmPlotter.Setting 1.0 as Setting
import eu.ad5001.LogarithmPlotter.Popup 1.0 as Popup 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/utils.mjs" as Utils
import "../../js/mathlib.mjs" as MathLib import "../../js/math/index.mjs" as MathLib
/*! /*!
\qmltype Dialog \qmltype Dialog

View file

@ -18,7 +18,7 @@
import QtQuick import QtQuick
import QtQuick.Controls 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 import eu.ad5001.LogarithmPlotter.Setting 1.0 as Setting

View file

@ -21,7 +21,7 @@ import QtQuick.Dialogs
import QtQuick.Controls import QtQuick.Controls
import QtQuick.Window import QtQuick.Window
import eu.ad5001.LogarithmPlotter.Setting 1.0 as Setting import eu.ad5001.LogarithmPlotter.Setting 1.0 as Setting
import "../js/historylib.mjs" as HistoryLib import "../js/history/index.mjs" as HistoryLib
/*! /*!

View file

@ -19,8 +19,8 @@
import QtQuick import QtQuick
import QtQuick.Controls import QtQuick.Controls
import eu.ad5001.LogarithmPlotter.Setting 1.0 as Setting import eu.ad5001.LogarithmPlotter.Setting 1.0 as Setting
import "js/mathlib.mjs" as MathLib import "js/math/index.mjs" as MathLib
import "js/historylib.mjs" as HistoryLib import "js/history/index.mjs" as HistoryLib
/*! /*!
\qmltype PickLocationOverlay \qmltype PickLocationOverlay

View file

@ -20,7 +20,7 @@ import QtQuick.Controls
import QtQuick import QtQuick
import Qt.labs.platform as Native import Qt.labs.platform as Native
import eu.ad5001.LogarithmPlotter.Popup 1.0 as P 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/utils.mjs" as Utils
import "../js/parsing/parsing.mjs" as Parsing import "../js/parsing/parsing.mjs" as Parsing

View file

@ -19,8 +19,8 @@
import QtQuick import QtQuick
import QtQuick.Controls import QtQuick.Controls
import eu.ad5001.LogarithmPlotter.Setting 1.0 as Setting import eu.ad5001.LogarithmPlotter.Setting 1.0 as Setting
import "js/mathlib.mjs" as MathLib import "js/math/index.mjs" as MathLib
import "js/historylib.mjs" as HistoryLib import "js/history/index.mjs" as HistoryLib
/*! /*!
\qmltype ViewPositionChangeOverlay \qmltype ViewPositionChangeOverlay

View file

@ -18,7 +18,7 @@
import Objects from "../module/objects.mjs" import Objects from "../module/objects.mjs"
import Latex from "../module/latex.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 { Action } from "common.mjs"
import { DrawableObject } from "../objs/common.mjs" import { DrawableObject } from "../objs/common.mjs"

View file

@ -19,14 +19,14 @@
// This library helps containing actions to be undone or redone (in other words, editing history) // 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. // 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 { Action as A } from "./common.mjs"
import Create from "history/create.mjs" import Create from "./create.mjs"
import Delete from "history/delete.mjs" import Delete from "./delete.mjs"
import EP from "history/editproperty.mjs" import EP from "./editproperty.mjs"
import Pos from "history/position.mjs" import Pos from "./position.mjs"
import V from "history/visibility.mjs" import V from "./visibility.mjs"
import Name from "history/name.mjs" import Name from "./name.mjs"
import Color from "history/color.mjs" import Color from "./color.mjs"
export const Action = A export const Action = A

View file

@ -18,7 +18,7 @@
import Objects from "../module/objects.mjs" import Objects from "../module/objects.mjs"
import Latex from "../module/latex.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 { escapeHTML } from "../utils.mjs"
import { Action } from "common.mjs" import { Action } from "common.mjs"
import { DrawableObject } from "../objs/common.mjs" import { DrawableObject } from "../objs/common.mjs"

View file

@ -17,9 +17,9 @@
*/ */
import * as Expr from "math/expression.mjs" import * as Expr from "./expression.mjs"
import * as Seq from "math/sequence.mjs" import * as Seq from "./sequence.mjs"
import * as Dom from "math/domain.mjs" import * as Dom from "./domain.mjs"
export const Expression = Expr.Expression export const Expression = Expr.Expression

View file

@ -18,7 +18,7 @@
import { Module } from "./common.mjs" import { Module } from "./common.mjs"
import { textsup } from "../utils.mjs" import { textsup } from "../utils.mjs"
import { Expression } from "../mathlib.mjs" import { Expression } from "../math/index.mjs"
import Latex from "./latex.mjs" import Latex from "./latex.mjs"
import Objects from "./objects.mjs" import Objects from "./objects.mjs"
import History from "./history.mjs" import History from "./history.mjs"

View file

@ -16,8 +16,8 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
import { parseDomain, executeExpression, Expression, EmptySet, Domain } from "../mathlib.mjs" import { parseDomain, executeExpression, Expression, EmptySet, Domain } from "../math/index.mjs"
import { CreateNewObject } from "../historylib.mjs" import { CreateNewObject } from "../history/index.mjs"
import * as P from "../parameters.mjs" import * as P from "../parameters.mjs"
import Objects from "../module/objects.mjs" import Objects from "../module/objects.mjs"
import Latex from "../module/latex.mjs" import Latex from "../module/latex.mjs"

View file

@ -16,7 +16,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
import { Range, Expression, Domain } from "../mathlib.mjs" import { Range, Expression, Domain } from "../math/index.mjs"
import * as P from "../parameters.mjs" import * as P from "../parameters.mjs"
import Objects from "../module/objects.mjs" import Objects from "../module/objects.mjs"
import Latex from "../module/latex.mjs" import Latex from "../module/latex.mjs"

View file

@ -16,8 +16,8 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
import { executeExpression, Expression } from "../mathlib.mjs" import { executeExpression, Expression } from "../math/index.mjs"
import { CreateNewObject } from "../historylib.mjs" import { CreateNewObject } from "../history/index.mjs"
import * as P from "../parameters.mjs" import * as P from "../parameters.mjs"
import Objects from "../module/objects.mjs" import Objects from "../module/objects.mjs"
import History from "../module/history.mjs" import History from "../module/history.mjs"

View file

@ -16,7 +16,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
import { executeExpression, Expression } from "../mathlib.mjs" import { executeExpression, Expression } from "../math/index.mjs"
import * as P from "../parameters.mjs" import * as P from "../parameters.mjs"
import Objects from "../module/objects.mjs" import Objects from "../module/objects.mjs"
import Latex from "../module/latex.mjs" import Latex from "../module/latex.mjs"

View file

@ -19,7 +19,7 @@
import { textsub } from "../utils.mjs" import { textsub } from "../utils.mjs"
import Objects from "../module/objects.mjs" import Objects from "../module/objects.mjs"
import { ExecutableObject } from "common.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 * as P from "../parameters.mjs"
import Latex from "../module/latex.mjs" import Latex from "../module/latex.mjs"

View file

@ -16,7 +16,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
import { Expression } from "../mathlib.mjs" import { Expression } from "../math/index.mjs"
import * as P from "../parameters.mjs" import * as P from "../parameters.mjs"
import Objects from "../module/objects.mjs" import Objects from "../module/objects.mjs"
import Latex from "../module/latex.mjs" import Latex from "../module/latex.mjs"

View file

@ -16,7 +16,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
import { Sequence as MathSequence, Domain } from "../mathlib.mjs" import { Sequence as MathSequence, Domain } from "../math/index.mjs"
import * as P from "../parameters.mjs" import * as P from "../parameters.mjs"
import Latex from "../module/latex.mjs" import Latex from "../module/latex.mjs"
import Objects from "../module/objects.mjs" import Objects from "../module/objects.mjs"

View file

@ -16,7 +16,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
import { Expression } from "../mathlib.mjs" import { Expression } from "../math/index.mjs"
import * as P from "../parameters.mjs" import * as P from "../parameters.mjs"
import Objects from "../module/objects.mjs" import Objects from "../module/objects.mjs"
import Latex from "../module/latex.mjs" import Latex from "../module/latex.mjs"

View file

@ -16,7 +16,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
import { Expression } from "../mathlib.mjs" import { Expression } from "../math/index.mjs"
import * as P from "../parameters.mjs" import * as P from "../parameters.mjs"
import Latex from "../module/latex.mjs" import Latex from "../module/latex.mjs"
import Objects from "../module/objects.mjs" import Objects from "../module/objects.mjs"

View file

@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
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" import Objects from "./module/objects.mjs"
const NONE = class Empty {} const NONE = class Empty {}

View file

@ -16,7 +16,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
import {Expression} from "../mathlib.mjs" import {Expression} from "../math/index.mjs"
class Setting { class Setting {
constructor(type, name, nameInConfig, icon) { constructor(type, name, nameInConfig, icon) {