Compare commits
No commits in common. "bc35b18da06464a924f75b101621c0686be7d962" and "4fe1086d681f774963aa59f024e89ab7619b3b94" have entirely different histories.
bc35b18da0
...
4fe1086d68
10 changed files with 10 additions and 81 deletions
|
@ -54,7 +54,6 @@ Item {
|
|||
anchors.right: parent.right
|
||||
anchors.top: parent.top
|
||||
placeholderText: qsTr("Filter...")
|
||||
category: "all"
|
||||
}
|
||||
|
||||
ScrollView {
|
||||
|
|
|
@ -103,21 +103,14 @@ Repeater {
|
|||
height: 30
|
||||
label: propertyLabel
|
||||
icon: `settings/custom/${propertyIcon}.svg`
|
||||
isDouble: propertyType == "number"
|
||||
isDouble: propertyType == 'number'
|
||||
defValue: obj[propertyName] == null ? '' : obj[propertyName].toString()
|
||||
category: {
|
||||
return {
|
||||
"Domain": "domain",
|
||||
"string": "all",
|
||||
"number": "all"
|
||||
}[propertyType]
|
||||
}
|
||||
onChanged: function(newValue) {
|
||||
try {
|
||||
var newValueParsed = {
|
||||
"Domain": () => MathLib.parseDomain(newValue),
|
||||
"string": () => newValue,
|
||||
"number": () => parseFloat(newValue)
|
||||
'Domain': () => MathLib.parseDomain(newValue),
|
||||
'string': () => newValue,
|
||||
'number': () => parseFloat(newValue)
|
||||
}[propertyType]()
|
||||
|
||||
// Ensuring old and new values are different to prevent useless adding to history.
|
||||
|
|
|
@ -107,7 +107,6 @@ Popup.BaseDialog {
|
|||
height: 30
|
||||
label: qsTr("Name")
|
||||
icon: "common/label.svg"
|
||||
category: "name"
|
||||
width: dlgProperties.width
|
||||
value: objEditor.obj.name
|
||||
onChanged: function(newValue) {
|
||||
|
|
|
@ -31,19 +31,8 @@ Popup {
|
|||
|
||||
signal selected(string character)
|
||||
|
||||
/*!
|
||||
\qmlproperty string InsertCharacter::category
|
||||
Type of special character to insert.
|
||||
Possible values:
|
||||
- expression
|
||||
- domain
|
||||
- name
|
||||
- all
|
||||
*/
|
||||
property string category: 'all'
|
||||
|
||||
width: 280
|
||||
height: Math.ceil(insertGrid.insertChars.length/insertGrid.columns)*(width/insertGrid.columns)+5
|
||||
height: insertGrid.insertChars.length/insertGrid.columns*(width/insertGrid.columns)
|
||||
modal: true
|
||||
closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutsideParent
|
||||
|
||||
|
@ -52,40 +41,17 @@ Popup {
|
|||
width: parent.width
|
||||
columns: 7
|
||||
|
||||
property var insertCharsExpression: [
|
||||
"∞","π","¹","²","³","⁴","⁵",
|
||||
"⁶","⁷","⁸","⁹","⁰"
|
||||
]
|
||||
|
||||
property var insertCharsDomain: [
|
||||
"∅","∪","∩","∖","ℝ","ℕ","ℤ",
|
||||
"⁺","⁻",...insertCharsExpression
|
||||
]
|
||||
|
||||
property var insertCharsName: [
|
||||
property var insertChars: [
|
||||
"α","β","γ","δ","ε","ζ","η",
|
||||
"π","θ","κ","λ","μ","ξ","ρ",
|
||||
"ς","σ","τ","φ","χ","ψ","ω",
|
||||
"Γ","Δ","Θ","Λ","Ξ","Π","Σ",
|
||||
"Φ","Ψ","Ω","ₐ","ₑ","ₒ","ₓ",
|
||||
"ₕ","ₖ","ₗ","ₘ","ₙ","ₚ","ₛ",
|
||||
"ₜ","₁","₂","₃","₄","₅","₆",
|
||||
"₇","₈","₉","₀"
|
||||
"ₜ","¹","²","³","⁴","⁵","⁶",
|
||||
"⁷","⁸","⁹","⁰","₁","₂","₃",
|
||||
"₄","₅","₆","₇","₈","₉","₀"
|
||||
]
|
||||
|
||||
property var insertCharsAll: [
|
||||
...insertCharsName, ...insertCharsDomain
|
||||
]
|
||||
|
||||
property var insertChars: {
|
||||
return {
|
||||
"expression": insertCharsExpression,
|
||||
"domain": insertCharsDomain,
|
||||
"name": insertCharsName,
|
||||
"all": insertCharsAll
|
||||
}[insertPopup.category]
|
||||
}
|
||||
|
||||
Repeater {
|
||||
model: parent.insertChars.length
|
||||
|
||||
|
|
|
@ -507,8 +507,6 @@ Item {
|
|||
x: Math.round((parent.width - width) / 2)
|
||||
y: Math.round((parent.height - height) / 2)
|
||||
|
||||
category: "expression"
|
||||
|
||||
onSelected: function(c) {
|
||||
editor.insert(editor.cursorPosition, c)
|
||||
insertPopup.close()
|
||||
|
|
|
@ -49,12 +49,6 @@ Item {
|
|||
If true, the input is being parsed an double before being emitting the \a changed signal.
|
||||
*/
|
||||
property bool isDouble: false
|
||||
/*!
|
||||
\qmlproperty bool TextSetting::category
|
||||
Type of special character to insert from the popup.
|
||||
\sa InsertCharacter::category
|
||||
*/
|
||||
property alias category: insertPopup.category
|
||||
/*!
|
||||
\qmlproperty double TextSetting::min
|
||||
Minimum value for numbers that can be entered into the input.
|
||||
|
|
|
@ -255,7 +255,6 @@ ScrollView {
|
|||
Setting.TextSetting {
|
||||
id: xAxisStep
|
||||
height: 30
|
||||
category: "expression"
|
||||
label: qsTr("X Axis Step")
|
||||
icon: "settings/xaxisstep.svg"
|
||||
width: settings.settingWidth
|
||||
|
@ -270,7 +269,6 @@ ScrollView {
|
|||
Setting.TextSetting {
|
||||
id: yAxisStep
|
||||
height: 30
|
||||
category: "expression"
|
||||
label: qsTr("Y Axis Step")
|
||||
icon: "settings/yaxisstep.svg"
|
||||
width: settings.settingWidth
|
||||
|
|
|
@ -72,13 +72,11 @@ class Domain {
|
|||
case "RP":
|
||||
case "R+":
|
||||
case "ℝ⁺":
|
||||
case "ℝ+":
|
||||
return Domain.RP
|
||||
break;
|
||||
case "RM":
|
||||
case "R-":
|
||||
case "ℝ⁻":
|
||||
case "ℝ-":
|
||||
return Domain.RM
|
||||
break;
|
||||
case "RPE":
|
||||
|
@ -87,8 +85,6 @@ class Domain {
|
|||
case "R*+":
|
||||
case "ℝ*⁺":
|
||||
case "ℝ⁺*":
|
||||
case "ℝ*+":
|
||||
case "ℝ+*":
|
||||
return Domain.RPE
|
||||
break;
|
||||
case "RME":
|
||||
|
@ -97,21 +93,16 @@ 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":
|
||||
|
@ -120,15 +111,12 @@ 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":
|
||||
|
@ -138,7 +126,6 @@ class Domain {
|
|||
case "ZM":
|
||||
case "Z-":
|
||||
case "ℤ⁻":
|
||||
case "ℤ-":
|
||||
return Domain.ZM
|
||||
break;
|
||||
case "ZME":
|
||||
|
@ -147,8 +134,6 @@ class Domain {
|
|||
case "Z*-":
|
||||
case "ℤ⁻*":
|
||||
case "ℤ*⁻":
|
||||
case "ℤ-*":
|
||||
case "ℤ*-":
|
||||
return Domain.ZME
|
||||
break;
|
||||
case "ZE":
|
||||
|
|
3
setup.py
3
setup.py
|
@ -67,9 +67,6 @@ 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
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
name: logarithmplotter
|
||||
title: LogarithmPlotter
|
||||
version: '0.4.1'
|
||||
version: '0.4.0'
|
||||
summary: 2D logarithmic-scaled plotter software to create asymptotic Bode plots
|
||||
confinement: strict
|
||||
base: core20
|
||||
|
|
Loading…
Reference in a new issue