Moving mathlib and historylib into math/index and history/index
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
This commit is contained in:
parent
bac802ec5b
commit
45dff33bb5
GPG key ID:
EF45F9C6AFE20160
26 changed files with 47 additions and 47 deletions
|
|
@ -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
|
||||
|
||||
|
||||
/*!
|
||||
|
|
|
|||
|
|
@ -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) {
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
||||
/*!
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -16,8 +16,8 @@
|
|||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
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"
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
* 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 Objects from "../module/objects.mjs"
|
||||
import Latex from "../module/latex.mjs"
|
||||
|
|
|
|||
|
|
@ -16,8 +16,8 @@
|
|||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
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"
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
* 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 Objects from "../module/objects.mjs"
|
||||
import Latex from "../module/latex.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"
|
||||
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
* 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 Objects from "../module/objects.mjs"
|
||||
import Latex from "../module/latex.mjs"
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
* 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 Latex from "../module/latex.mjs"
|
||||
import Objects from "../module/objects.mjs"
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
* 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 Objects from "../module/objects.mjs"
|
||||
import Latex from "../module/latex.mjs"
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
* 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 Latex from "../module/latex.mjs"
|
||||
import Objects from "../module/objects.mjs"
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
* You should have received a copy of the GNU General Public License
|
||||
* 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"
|
||||
|
||||
const NONE = class Empty {}
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
* 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 {
|
||||
constructor(type, name, nameInConfig, icon) {
|
||||
|
|
|
|||
Loading…
Reference in a new issue