Ad5001/LogarithmPlotter
Ad5001/LogarithmPlotter
1
0
Fork 0
Code Issues 6 Pull requests Projects Releases Wiki Activity

Paramerters and enums as class, now simpler implementation with more abstractions for parameters.

Browse source 
Also fixing a lot of bugs along the way.
This commit is contained in:
Adsooi 2020-12-26 14:49:48 +01:00
parent 5af98c67b0
commit 7e47b3cdf9
5 changed files with 125 additions and 87 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
qml/ListSetting.qml
View file

@ -97,7 +97,7 @@ Column {
verticalAlignment: TextInput.AlignVCenter verticalAlignment: TextInput.AlignVCenter
horizontalAlignment: TextInput.AlignHCenter horizontalAlignment: TextInput.AlignHCenter
color: sysPalette.windowText color: sysPalette.windowText
text: visible ? control.model.get(index).key : false text: visible ? control.model.get(index).val : false
selectByMouse: true selectByMouse: true
onEditingFinished: { onEditingFinished: {
var value = text var value = text
@ -112,7 +112,7 @@ Column {
value = "" value = ""
} }
if(value != "" && keyInput.acceptableInput) { if(value != "" && keyInput.acceptableInput) {
control.model.setProperty(index, 'value', value) control.model.setProperty(index, 'val', value)
control.changed() control.changed()
} }
} }
@ -128,8 +128,8 @@ Column {
onClicked: { onClicked: {
control.model.append({ control.model.append({
key: "", key: control.keyType == 'string' ? '' : model.count,
value: "" val: control.valueType == 'string' ? '' : 0
}) })
} }
} }
@ -138,8 +138,8 @@ Column {
model.clear() model.clear()
for(var key in importer) for(var key in importer)
model.append({ model.append({
key: key, key: control.keyType == 'string' ? key.toString() : parseFloat(key),
value: importer[key] val: control.valueType == 'string' ? importer[key].toString() : parseFloat(importer[key])
}) })
} }
@ -147,12 +147,12 @@ Column {
if(dictionaryMode) { if(dictionaryMode) {
var ret = {} var ret = {}
for(var i = 0; i < model.count; i++) for(var i = 0; i < model.count; i++)
ret[model.get(i).key] = model.get(i).value ret[model.get(i).key] = model.get(i).val
return ret return ret
} else { } else {
var ret = [] var ret = []
for(var i = 0; i < model.count; i++) for(var i = 0; i < model.count; i++)
ret.push(model.get(i).value) ret.push(model.get(i).val)
} }
} }
} }

41
qml/ObjectLists.qml
View file

@ -246,8 +246,8 @@ ListView {
currentIndex: model.indexOf(objEditor.obj.labelContent) currentIndex: model.indexOf(objEditor.obj.labelContent)
onActivated: function(newIndex) { onActivated: function(newIndex) {
Objects.currentObjects[objEditor.objType][objEditor.objIndex].labelContent = model[newIndex] Objects.currentObjects[objEditor.objType][objEditor.objIndex].labelContent = model[newIndex]
objEditor.obj = Objects.currentObjects[objEditor.objType][objEditor.objIndex] //objEditor.obj = Objects.currentObjects[objEditor.objType][objEditor.objIndex]
objEditor.editingRow.obj = Objects.currentObjects[objEditor.objType][objEditor.objIndex] //objEditor.editingRow.obj = objEditor.obj
objectListList.update() objectListList.update()
} }
} }
@ -266,7 +266,7 @@ ListView {
height: 30 height: 30
width: parent.width width: parent.width
visible: modelData[0].startsWith('comment') visible: modelData[0].startsWith('comment')
text: visible ? modelData[1].replace('{name}', objEditor.obj.name) : '' text: visible ? modelData[1].replace(/\{name\}/g, objEditor.obj.name) : ''
color: sysPalette.windowText color: sysPalette.windowText
} }
@ -276,7 +276,7 @@ ListView {
width: parent.width width: parent.width
label: parent.label label: parent.label
isDouble: modelData[1] == 'number' isDouble: modelData[1] == 'number'
visible: ['Expression', 'Domain', 'string', 'number'].includes(modelData[1]) visible: paramTypeIn(modelData[1], ['Expression', 'Domain', 'string', 'number'])
defValue: visible ? { defValue: visible ? {
'Expression': () => Utils.simplifyExpression(objEditor.obj[modelData[0]].toEditableString()), 'Expression': () => Utils.simplifyExpression(objEditor.obj[modelData[0]].toEditableString()),
'Domain': () => objEditor.obj[modelData[0]].toString(), 'Domain': () => objEditor.obj[modelData[0]].toString(),
@ -314,20 +314,20 @@ ListView {
width: dlgProperties.width width: dlgProperties.width
label: parent.label label: parent.label
// True to select an object of type, false for enums. // True to select an object of type, false for enums.
property bool selectObjMode: (typeof modelData[1] == "string" && Object.keys(Objects.types).includes(modelData[1])) property bool selectObjMode: paramTypeIn(modelData[1], ['ObjectType'])
model: visible ? model: visible ?
(selectObjMode ? Objects.getObjectsName(modelData[1]).concat(['+ Create new ' + modelData[1]]) : modelData[1]) (selectObjMode ? Objects.getObjectsName(modelData[1].objType).concat(['+ Create new ' + modelData[1].objType]) : modelData[1].values)
: [] : []
visible: Array.isArray(modelData[1]) || selectObjMode visible: paramTypeIn(modelData[1], ['ObjectType', 'Enum'])
currentIndex: model.indexOf(selectObjMode ? objEditor.obj[modelData[0]].name : objEditor.obj[modelData[0]]) currentIndex: model.indexOf(selectObjMode ? objEditor.obj[modelData[0]].name : objEditor.obj[modelData[0]])
onActivated: function(newIndex) { onActivated: function(newIndex) {
// Setting object property. // Setting object property.
if(selectObjMode) { if(selectObjMode) {
var selectedObj = Objects.getObjectByName(model[newIndex], modelData[1]) var selectedObj = Objects.getObjectByName(model[newIndex], modelData[1].objType)
if(selectedObj == null) { if(selectedObj == null) {
selectedObj = Objects.createNewRegisteredObject(modelData[1]) selectedObj = Objects.createNewRegisteredObject(modelData[1].objType)
model = Objects.getObjectsName(modelData[1]).concat(['+ Create new ' + modelData[1]]) model = Objects.getObjectsName(modelData[1].objType).concat(['+ Create new ' + modelData[1].objType])
currentIndex = model.indexOf(selectedObj.name) currentIndex = model.indexOf(selectedObj.name)
} }
Objects.currentObjects[objEditor.objType][objEditor.objIndex][modelData[0]].requiredBy = objEditor.obj[modelData[0]].filter((obj) => objEditor.obj.name != obj.name) Objects.currentObjects[objEditor.objType][objEditor.objIndex][modelData[0]].requiredBy = objEditor.obj[modelData[0]].filter((obj) => objEditor.obj.name != obj.name)
@ -346,24 +346,23 @@ ListView {
id: customPropListDict id: customPropListDict
width: parent.width width: parent.width
visible: typeof modelData[1] == 'object' && 'type' in modelData[1] && (modelData[1].type == 'List' || modelData[1].type == 'Dict') visible: paramTypeIn(modelData[1], ['List', 'Dict'])
label: parent.label label: parent.label
dictionaryMode: visible ? modelData[1].type == 'Dict' : false dictionaryMode: paramTypeIn(modelData[1], ['Dict'])
keyType: dictionaryMode ? modelData[1].keyType : 'string' keyType: dictionaryMode ? modelData[1].keyType : 'string'
valueType: visible ? modelData[1].type : 'string' valueType: visible ? modelData[1].valueType : 'string'
preKeyLabel: (dictionaryMode ? modelData[1].preKeyLabel : modelData[1].label).replace('{name}', objEditor.obj.name) preKeyLabel: visible ? (dictionaryMode ? modelData[1].preKeyLabel : modelData[1].label).replace(/\{name\}/g, objEditor.obj.name) : ''
postKeyLabel: (dictionaryMode ? modelData[1].postKeyLabel : '').replace('{name}', objEditor.obj.name) postKeyLabel: visible ? (dictionaryMode ? modelData[1].postKeyLabel : '').replace(/\{name\}/g, objEditor.obj.name) : ''
keyRegexp: dictionaryMode ? modelData[1].keyFormat : /^.+$/ keyRegexp: dictionaryMode ? modelData[1].keyFormat : /^.+$/
valueRegexp: visible ? modelData[1].format : /^.+$/ valueRegexp: visible ? modelData[1].format : /^.+$/
forbidAdding: visible ? modelData[1].forbidAdding : false forbidAdding: visible ? modelData[1].forbidAdding : false
onChanged: { onChanged: {
Objects.currentObjects[objEditor.objType][objEditor.objIndex][modelData[0]] = exportModel() Objects.currentObjects[objEditor.objType][objEditor.objIndex][modelData[0]] = exportModel()
objectListList.update()
} }
Component.onCompleted: { Component.onCompleted: {
console.log('Visible', visible, modelData[0], modelData[1])
console.log('Type', ('type' in modelData[1]), modelData[1].type)
if(visible) importModel(objEditor.obj[modelData[0]]) if(visible) importModel(objEditor.obj[modelData[0]])
} }
} }
@ -372,6 +371,7 @@ ListView {
} }
function show() { function show() {
dlgCustomProperties.model = [] // Reset
var objProps = Objects.types[objEditor.objType].properties() var objProps = Objects.types[objEditor.objType].properties()
dlgCustomProperties.model = Object.keys(objProps).map(prop => [prop, objProps[prop]]) // Converted to 2-dimentional array. dlgCustomProperties.model = Object.keys(objProps).map(prop => [prop, objProps[prop]]) // Converted to 2-dimentional array.
objEditor.open() objEditor.open()
@ -415,4 +415,11 @@ ListView {
objectListList.listViews[objType].model = Objects.currentObjects[objType] objectListList.listViews[objType].model = Objects.currentObjects[objType]
} }
} }
function paramTypeIn(parameter, types = []) {
if(types.includes(parameter.toString())) return true
if(typeof parameter == 'object' && 'type' in parameter)
return types.includes(parameter.type)
return false
}
} }

32
qml/js/mathlib.js
View file

@ -223,7 +223,7 @@ class EmptySet extends Domain {
static import(frm) { return new EmptySet() } static import(frm) { return new EmptySet() }
} }
class Interval extends Domain { class Range extends Domain {
constructor(begin, end, openBegin, openEnd) { constructor(begin, end, openBegin, openEnd) {
super() super()
if(typeof begin == 'number' || typeof begin == 'string') begin = new Expression(begin.toString()) if(typeof begin == 'number' || typeof begin == 'string') begin = new Expression(begin.toString())
@ -251,7 +251,7 @@ class Interval extends Domain {
if(domain instanceof UnionDomain) return domain.union(this) if(domain instanceof UnionDomain) return domain.union(this)
if(domain instanceof IntersectionDomain) return new UnionDomain(this, domain) if(domain instanceof IntersectionDomain) return new UnionDomain(this, domain)
if(domain instanceof MinusDomain) return new UnionDomain(this, domain) if(domain instanceof MinusDomain) return new UnionDomain(this, domain)
if(domain instanceof Interval) return new UnionDomain(this, domain) if(domain instanceof Range) return new UnionDomain(this, domain)
} }
intersection(domain) { intersection(domain) {
@ -260,14 +260,14 @@ class Interval extends Domain {
if(domain instanceof UnionDomain) return new IntersectionDomain(this, domain) if(domain instanceof UnionDomain) return new IntersectionDomain(this, domain)
if(domain instanceof IntersectionDomain) return domain.intersection(this) if(domain instanceof IntersectionDomain) return domain.intersection(this)
if(domain instanceof MinusDomain) return new IntersectionDomain(this, domain) if(domain instanceof MinusDomain) return new IntersectionDomain(this, domain)
if(domain instanceof Interval) return new IntersectionDomain(this, domain) if(domain instanceof Range) return new IntersectionDomain(this, domain)
} }
static import(frm) { static import(frm) {
var openBegin = frm.trim().charAt(0) == "]" var openBegin = frm.trim().charAt(0) == "]"
var openEnd = frm.trim().charAt(frm.length -1) == "[" var openEnd = frm.trim().charAt(frm.length -1) == "["
var [begin, end] = frm.substr(1, frm.length-2).split(";") var [begin, end] = frm.substr(1, frm.length-2).split(";")
return new Interval(begin.trim(), end.trim(), openBegin, openEnd) return new Range(begin.trim(), end.trim(), openBegin, openEnd)
} }
} }
@ -312,7 +312,7 @@ class SpecialDomain extends Domain {
if(domain instanceof UnionDomain) return new UnionDomain(this, domain) if(domain instanceof UnionDomain) return new UnionDomain(this, domain)
if(domain instanceof IntersectionDomain) return new UnionDomain(this, domain) if(domain instanceof IntersectionDomain) return new UnionDomain(this, domain)
if(domain instanceof MinusDomain) return new UnionDomain(this, domain) if(domain instanceof MinusDomain) return new UnionDomain(this, domain)
if(domain instanceof Interval) return new UnionDomain(this, domain) if(domain instanceof Range) return new UnionDomain(this, domain)
} }
intersection(domain) { intersection(domain) {
@ -321,7 +321,7 @@ class SpecialDomain extends Domain {
if(domain instanceof UnionDomain) return new IntersectionDomain(this, domain) if(domain instanceof UnionDomain) return new IntersectionDomain(this, domain)
if(domain instanceof IntersectionDomain) return new IntersectionDomain(this, domain) if(domain instanceof IntersectionDomain) return new IntersectionDomain(this, domain)
if(domain instanceof MinusDomain) return new IntersectionDomain(this, domain) if(domain instanceof MinusDomain) return new IntersectionDomain(this, domain)
if(domain instanceof Interval) return new IntersectionDomain(this, domain) if(domain instanceof Range) return new IntersectionDomain(this, domain)
} }
} }
@ -389,7 +389,7 @@ class DomainSet extends SpecialDomain {
var notIncludedValues = [] var notIncludedValues = []
for(var value in this.values) { for(var value in this.values) {
var value = this.executedValues[i] var value = this.executedValues[i]
if(domain instanceof Interval) { if(domain instanceof Range) {
if(domain.begin.execute() == value && domain.openBegin) { if(domain.begin.execute() == value && domain.openBegin) {
domain.openBegin = false domain.openBegin = false
} }
@ -416,7 +416,7 @@ class DomainSet extends SpecialDomain {
var includedValues = [] var includedValues = []
for(var i in this.values) { for(var i in this.values) {
var value = this.executedValues[i] var value = this.executedValues[i]
if(domain instanceof Interval) { if(domain instanceof Range) {
if(domain.begin.execute() == value && !domain.openBegin) { if(domain.begin.execute() == value && !domain.openBegin) {
domain.openBegin = false domain.openBegin = false
} }
@ -455,7 +455,7 @@ class UnionDomain extends Domain {
union(domain) { union(domain) {
if(domain instanceof EmptySet) return this if(domain instanceof EmptySet) return this
if(domain instanceof DomainSet) return domain.union(this) if(domain instanceof DomainSet) return domain.union(this)
if(domain instanceof Interval) return domain.union(this) if(domain instanceof Range) return domain.union(this)
if(domain instanceof UnionDomain) return new UnionDomain(this, domain) if(domain instanceof UnionDomain) return new UnionDomain(this, domain)
if(domain instanceof IntersectionDomain) return new UnionDomain(this, domain) if(domain instanceof IntersectionDomain) return new UnionDomain(this, domain)
if(domain instanceof MinusDomain) return new MinusDomain(this, domain) if(domain instanceof MinusDomain) return new MinusDomain(this, domain)
@ -496,7 +496,7 @@ class IntersectionDomain extends Domain {
union(domain) { union(domain) {
if(domain instanceof EmptySet) return this if(domain instanceof EmptySet) return this
if(domain instanceof DomainSet) return domain.union(this) if(domain instanceof DomainSet) return domain.union(this)
if(domain instanceof Interval) return domain.union(this) if(domain instanceof Range) return domain.union(this)
if(domain instanceof UnionDomain) return this.dom1.union(domain.dom1).union(this.dom2).union(domain.dom2) if(domain instanceof UnionDomain) return this.dom1.union(domain.dom1).union(this.dom2).union(domain.dom2)
if(domain instanceof IntersectionDomain) return new UnionDomain(this, domain) if(domain instanceof IntersectionDomain) return new UnionDomain(this, domain)
if(domain instanceof MinusDomain) return new MinusDomain(this, domain) if(domain instanceof MinusDomain) return new MinusDomain(this, domain)
@ -545,15 +545,15 @@ class MinusDomain extends Domain {
Domain.RE = new MinusDomain("R", "{0}") Domain.RE = new MinusDomain("R", "{0}")
Domain.RE.displayName = "ℝ*" Domain.RE.displayName = "ℝ*"
Domain.R = new Interval(-Infinity,Infinity,true,true) Domain.R = new Range(-Infinity,Infinity,true,true)
Domain.R.displayName = "ℝ" Domain.R.displayName = "ℝ"
Domain.RP = new Interval(0,Infinity,true,false) Domain.RP = new Range(0,Infinity,true,false)
Domain.RP.displayName = "ℝ⁺" Domain.RP.displayName = "ℝ⁺"
Domain.RM = new Interval(-Infinity,0,true,false) Domain.RM = new Range(-Infinity,0,true,false)
Domain.RM.displayName = "ℝ⁻" Domain.RM.displayName = "ℝ⁻"
Domain.RPE = new Interval(0,Infinity,true,true) Domain.RPE = new Range(0,Infinity,true,true)
Domain.RPE.displayName = "ℝ⁺*" Domain.RPE.displayName = "ℝ⁺*"
Domain.RME = new Interval(-Infinity,0,true,true) Domain.RME = new Range(-Infinity,0,true,true)
Domain.RME.displayName = "ℝ⁻*" Domain.RME.displayName = "ℝ⁻*"
Domain.N = new SpecialDomain('ℕ', x => x%1==0 && x >= 0, Domain.N = new SpecialDomain('ℕ', x => x%1==0 && x >= 0,
x => Math.max(Math.floor(x)+1, 0), x => Math.max(Math.floor(x)+1, 0),
@ -601,7 +601,7 @@ function parseDomainSimple(domain) {
if(domain.includes("∩")) return IntersectionDomain.import(domain) if(domain.includes("∩")) return IntersectionDomain.import(domain)
if(domain.includes("∖") || domain.includes("\\")) return MinusDomain.import(domain) if(domain.includes("∖") || domain.includes("\\")) return MinusDomain.import(domain)
if(domain.charAt(0) == "{" && domain.charAt(domain.length -1) == "}") return DomainSet.import(domain) if(domain.charAt(0) == "{" && domain.charAt(domain.length -1) == "}") return DomainSet.import(domain)
if(domain.includes("]") || domain.includes("[")) return Interval.import(domain) if(domain.includes("]") || domain.includes("[")) return Range.import(domain)
if(["R", "ℝ", "N", "ℕ", "Z", "ℤ"].some(str => domain.toUpperCase().includes(str))) if(["R", "ℝ", "N", "ℕ", "Z", "ℤ"].some(str => domain.toUpperCase().includes(str)))
return Domain.import(domain) return Domain.import(domain)
if(domain[0] == 'D') return refedDomains[parseInt(domain.substr(1))] if(domain[0] == 'D') return refedDomains[parseInt(domain.substr(1))]

67
qml/js/objects.js
View file

@ -20,7 +20,7 @@
.import "utils.js" as Utils .import "utils.js" as Utils
.import "mathlib.js" as MathLib .import "mathlib.js" as MathLib
.import "parameters.js" as P
function getNewName(allowedLetters) { function getNewName(allowedLetters) {
@ -35,31 +35,6 @@ function getNewName(allowedLetters) {
return ret return ret
} }
class List {
constructor(type, format = /^.+$/, label = '', forbidAdding = false) {
// type can be string, int and double.
this.type = 'List'
this.valueType = type
this.format = format
this.label = label
this.forbidAdding = forbidAdding
}
}
class Dictionary {
constructor(type, keyType = 'string', format = /^.+$/, keyFormat = /^.+$/, preKeyLabel = '', postKeyLabel = ': ', forbidAdding = false) {
// type & keyType can be string, int and double.
this.type = 'Dict'
this.valueType = type
this.keyType = keyType
this.format = format
this.keyFormat = keyFormat
this.preKeyLabel = preKeyLabel
this.postKeyLabel = postKeyLabel
this.forbidAdding = forbidAdding
}
}
class DrawableObject { class DrawableObject {
// Class to extend for every type of object that // Class to extend for every type of object that
// can be drawn on the canvas. // can be drawn on the canvas.
@ -144,8 +119,8 @@ class Point extends DrawableObject {
static properties() {return { static properties() {return {
'x': 'Expression', 'x': 'Expression',
'y': 'Expression', 'y': 'Expression',
'labelPosition': ['top', 'bottom', 'left', 'right', 'top-left', 'top-right', 'bottom-left', 'bottom-right'], 'labelPosition': new P.Enum('top', 'bottom', 'left', 'right', 'top-left', 'top-right', 'bottom-left', 'bottom-right'),
'pointStyle': ['●', '✕', '＋'], 'pointStyle': new P.Enum('●', '✕', '＋'),
}} }}
constructor(name = null, visible = true, color = null, labelContent = 'name + value', constructor(name = null, visible = true, color = null, labelContent = 'name + value',
@ -229,8 +204,8 @@ class Function extends ExecutableObject {
'inDomain': 'Domain', 'inDomain': 'Domain',
'outDomain': 'Domain', 'outDomain': 'Domain',
'comment1': 'Ex: R+* (ℝ⁺*), N* (ℕ*), Z-* (ℤ⁻*), ]0;1[, {3;4;5}', 'comment1': 'Ex: R+* (ℝ⁺*), N* (ℕ*), Z-* (ℤ⁻*), ]0;1[, {3;4;5}',
'labelPosition': ['above', 'below'], 'labelPosition': new P.Enum('above', 'below'),
'displayMode': ['application', 'function'], 'displayMode': new P.Enum('application', 'function'),
'labelX': 'number' 'labelX': 'number'
}} }}
@ -348,10 +323,10 @@ class GainBode extends ExecutableObject {
static type(){return 'Gain Bode'} static type(){return 'Gain Bode'}
static typeMultiple(){return 'Gains Bode'} static typeMultiple(){return 'Gains Bode'}
static properties() {return { static properties() {return {
'om_0': 'Point', 'om_0': new P.ObjectType('Point'),
'pass': ['high', 'low'], 'pass': new P.Enum('high', 'low'),
'gain': 'Expression', 'gain': 'Expression',
'labelPosition': ['above', 'below'], 'labelPosition': new P.Enum('above', 'below'),
'labelX': 'number' 'labelX': 'number'
}} }}
@ -463,7 +438,7 @@ class SommeGainsBode extends DrawableObject {
static typeMultiple(){return 'Somme gains Bode'} static typeMultiple(){return 'Somme gains Bode'}
static createable() {return false} static createable() {return false}
static properties() {return { static properties() {return {
'labelPosition': ['above', 'below'], 'labelPosition': new P.Enum('above', 'below'),
'labelX': 'number' 'labelX': 'number'
}} }}
@ -588,10 +563,10 @@ class PhaseBode extends ExecutableObject {
static type(){return 'Phase Bode'} static type(){return 'Phase Bode'}
static typeMultiple(){return 'Phases Bode'} static typeMultiple(){return 'Phases Bode'}
static properties() {return { static properties() {return {
'om_0': 'Point', 'om_0': new P.ObjectType('Point'),
'phase': 'Expression', 'phase': 'Expression',
'unit': ['°', 'deg', 'rad'], 'unit': new P.Enum('°', 'deg', 'rad'),
'labelPosition': ['above', 'below'], 'labelPosition': new P.Enum('above', 'below'),
'labelX': 'number' 'labelX': 'number'
}} }}
@ -700,7 +675,7 @@ class SommePhasesBode extends ExecutableObject {
static typeMultiple(){return 'Somme phases Bode'} static typeMultiple(){return 'Somme phases Bode'}
static createable() {return false} static createable() {return false}
static properties() {return { static properties() {return {
'labelPosition': ['above', 'below'], 'labelPosition': new P.Enum('above', 'below'),
'labelX': 'number' 'labelX': 'number'
}} }}
@ -816,16 +791,16 @@ class CursorX extends DrawableObject {
}) })
return { return {
'x': 'Expression', 'x': 'Expression',
'targetElement': elementNames, 'targetElement': new P.Enum(...elementNames),
'labelPosition': ['left', 'right'], 'labelPosition': new P.Enum('left', 'right'),
'approximate': 'Boolean', 'approximate': 'Boolean',
'rounding': 'number', 'rounding': 'number',
'displayStyle': [ 'displayStyle': new P.Enum(
'— — — — — — —', '— — — — — — —',
'⸺⸺⸺⸺⸺⸺', '⸺⸺⸺⸺⸺⸺',
'• • • • • • • • • •' '• • • • • • • • • •'
], ),
'targetValuePosition' : ['Next to target', 'With label', 'Hidden'] 'targetValuePosition' : new P.Enum('Next to target', 'With label', 'Hidden')
} }
} }
@ -947,9 +922,9 @@ class Sequence extends ExecutableObject {
static type(){return 'Sequence'} static type(){return 'Sequence'}
static typeMultiple(){return 'Sequences'} static typeMultiple(){return 'Sequences'}
static properties() {return { static properties() {return {
'defaultExpression': new Dictionary('string', 'int', /^.+$/, /^(\d+)$/, '{name}[n+', '] = ', true), 'defaultExpression': new P.Dictionary('string', 'int', /^.+$/, /^(\d+)$/, '{name}[n+', '] = ', true),
'comment1': 'NOTE: Use {name}[n] to refer to uₙ, u[n+1] for uₙ₊₁...', 'comment1': 'Note: Use {name}[n] to refer to {name}ₙ, {name}[n+1] for {name}ₙ₊₁...',
'markedValues': new Dictionary('string', 'int', /^.+$/, /^(\d+)$/, '{name}[', '] = '), 'markedValues': new P.Dictionary('string', 'int', /^.+$/, /^(\d+)$/, '{name}[', '] = '),
}} }}
constructor(name = null, visible = true, color = null, labelContent = 'name + value', constructor(name = null, visible = true, color = null, labelContent = 'name + value',

56
qml/js/parameters.js Normal file
View file

@ -0,0 +1,56 @@
/**
* Logarithm Graph Creator - Create graphs with logarithm scales.
* Copyright (C) 2020 Ad5001
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
class Enum {
constructor(...values) {
this.type = 'Enum'
this.values = values
}
}
class ObjectType {
constructor(objType) {
this.type = 'ObjectType'
this.objType = objType
}
}
class List {
constructor(type, format = /^.+$/, label = '', forbidAdding = false) {
// type can be string, int and double.
this.type = 'List'
this.valueType = type
this.format = format
this.label = label
this.forbidAdding = forbidAdding
}
}
class Dictionary {
constructor(type, keyType = 'string', format = /^.+$/, keyFormat = /^.+$/, preKeyLabel = '', postKeyLabel = ': ', forbidAdding = false) {
// type & keyType can be string, int and double.
this.type = 'Dict'
this.valueType = type
this.keyType = keyType
this.format = format
this.keyFormat = keyFormat
this.preKeyLabel = preKeyLabel
this.postKeyLabel = postKeyLabel
this.forbidAdding = forbidAdding
}
}