From 7542d631217e8112b2c9caabcc31039608055a97 Mon Sep 17 00:00:00 2001 From: Ad5001 Date: Mon, 9 Oct 2023 17:20:32 +0200 Subject: [PATCH] Adding new characters to insert chars popup. --- .../LogarithmPlotter/Popup/InsertCharacter.qml | 1 + .../eu/ad5001/LogarithmPlotter/js/math/domain.js | 15 +++++++++++++++ setup.py | 3 +++ snapcraft.yaml | 2 +- 4 files changed, 20 insertions(+), 1 deletion(-) diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Popup/InsertCharacter.qml b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Popup/InsertCharacter.qml index 57f7e7d..d893d43 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Popup/InsertCharacter.qml +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Popup/InsertCharacter.qml @@ -42,6 +42,7 @@ Popup { columns: 7 property var insertChars: [ + "∞","π","ℝ","ℕ","ℤ","∪","∩", "α","β","γ","δ","ε","ζ","η", "π","θ","κ","λ","μ","ξ","ρ", "ς","σ","τ","φ","χ","ψ","ω", diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/math/domain.js b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/math/domain.js index 3586bc0..b27dbc6 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/math/domain.js +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/math/domain.js @@ -72,11 +72,13 @@ class Domain { case "RP": case "R+": case "ℝ⁺": + case "ℝ+": return Domain.RP break; case "RM": case "R-": case "ℝ⁻": + case "ℝ-": return Domain.RM break; case "RPE": @@ -85,6 +87,8 @@ class Domain { case "R*+": case "ℝ*⁺": case "ℝ⁺*": + case "ℝ*+": + case "ℝ+*": return Domain.RPE break; case "RME": @@ -93,16 +97,21 @@ class Domain { case "R*-": case "ℝ⁻*": case "ℝ*⁻": + case "ℝ-*": + case "ℝ*-": return Domain.RME break; case "ℕ": case "N": case "ZP": + case "Z+": case "ℤ⁺": + case "ℤ+": return Domain.N break; case "NLOG": case "ℕˡᵒᵍ": + case "ℕLOG": return Domain.NLog break; case "NE": @@ -111,12 +120,15 @@ class Domain { case "N+": case "ℕ*": case "ℕ⁺": + case "ℕ+": case "ZPE": case "ZEP": case "Z+*": case "Z*+": case "ℤ⁺*": case "ℤ*⁺": + case "ℤ+*": + case "ℤ*+": return Domain.NE break; case "Z": @@ -126,6 +138,7 @@ class Domain { case "ZM": case "Z-": case "ℤ⁻": + case "ℤ-": return Domain.ZM break; case "ZME": @@ -134,6 +147,8 @@ class Domain { case "Z*-": case "ℤ⁻*": case "ℤ*⁻": + case "ℤ-*": + case "ℤ*-": return Domain.ZME break; case "ZE": diff --git a/setup.py b/setup.py index 8e78439..841664c 100644 --- a/setup.py +++ b/setup.py @@ -67,6 +67,9 @@ Operating System :: POSIX :: BSD Operating System :: POSIX :: Linux Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.9 +Programming Language :: Python :: 3.10 +Programming Language :: Python :: 3.11 +Programming Language :: Python :: 3.12 Programming Language :: Python :: Implementation :: CPython Topic :: Utilities Topic :: Scientific/Engineering diff --git a/snapcraft.yaml b/snapcraft.yaml index 7be0d43..f052558 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -1,6 +1,6 @@ name: logarithmplotter title: LogarithmPlotter -version: '0.4.0' +version: '0.4.1' summary: 2D logarithmic-scaled plotter software to create asymptotic Bode plots confinement: strict base: core20