Adding manifest.in for building, changing Boolean to boolean, CursorX to XCursor
This commit is contained in:
parent
c61dc1379d
commit
a852a1232f
4 changed files with 16 additions and 13 deletions
|
@ -188,14 +188,14 @@ Canvas {
|
||||||
return {'width': twidth, 'height': theight}
|
return {'width': twidth, 'height': theight}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Converts x coordinate to it's relative position on the
|
// Converts x coordinate to it's relative position on the canvas
|
||||||
function x2px(x) {
|
function x2px(x) {
|
||||||
if(logscalex) {
|
if(logscalex) {
|
||||||
var logxmin = Math.log(xmin)
|
var logxmin = Math.log(xmin)
|
||||||
return (Math.log(x)-logxmin)*xzoom
|
return (Math.log(x)-logxmin)*xzoom
|
||||||
} else return (x - xmin)*xzoom
|
} else return (x - xmin)*xzoom
|
||||||
}
|
}
|
||||||
// Converts y coordinate to it's relative position on the
|
// Converts y coordinate to it's relative position on the canvas
|
||||||
// Y is NOT ln based.
|
// Y is NOT ln based.
|
||||||
function y2px(y) {
|
function y2px(y) {
|
||||||
return (ymax-y)*yzoom
|
return (ymax-y)*yzoom
|
||||||
|
|
|
@ -296,7 +296,7 @@ ListView {
|
||||||
|
|
||||||
CheckBox {
|
CheckBox {
|
||||||
id: customPropCheckBox
|
id: customPropCheckBox
|
||||||
visible: modelData[1] == 'Boolean'
|
visible: modelData[1] == 'boolean'
|
||||||
height: visible ? 20 : 0
|
height: visible ? 20 : 0
|
||||||
width: parent.width
|
width: parent.width
|
||||||
text: parent.label
|
text: parent.label
|
||||||
|
|
|
@ -210,8 +210,8 @@ class Function extends ExecutableObject {
|
||||||
'displayMode': new P.Enum('application', 'function'),
|
'displayMode': new P.Enum('application', 'function'),
|
||||||
'labelX': 'number',
|
'labelX': 'number',
|
||||||
'comment2': 'The following parameters are used when the definition domain is a non-continuous set. (Ex: ℕ, ℤ, sets like {0;3}...)',
|
'comment2': 'The following parameters are used when the definition domain is a non-continuous set. (Ex: ℕ, ℤ, sets like {0;3}...)',
|
||||||
'drawPoints': 'Boolean',
|
'drawPoints': 'boolean',
|
||||||
'drawDashedLines': 'Boolean'
|
'drawDashedLines': 'boolean'
|
||||||
}}
|
}}
|
||||||
|
|
||||||
constructor(name = null, visible = true, color = null, labelContent = 'name + value',
|
constructor(name = null, visible = true, color = null, labelContent = 'name + value',
|
||||||
|
@ -360,7 +360,7 @@ class GainBode extends ExecutableObject {
|
||||||
'gain': 'Expression',
|
'gain': 'Expression',
|
||||||
'labelPosition': new P.Enum('above', 'below', 'left', 'right', 'above-left', 'above-right', 'below-left', 'below-right'),
|
'labelPosition': new P.Enum('above', 'below', 'left', 'right', 'above-left', 'above-right', 'below-left', 'below-right'),
|
||||||
'labelX': 'number',
|
'labelX': 'number',
|
||||||
'omGraduation': 'Boolean'
|
'omGraduation': 'boolean'
|
||||||
}}
|
}}
|
||||||
|
|
||||||
constructor(name = null, visible = true, color = null, labelContent = 'name + value',
|
constructor(name = null, visible = true, color = null, labelContent = 'name + value',
|
||||||
|
@ -481,6 +481,7 @@ class GainBode extends ExecutableObject {
|
||||||
}
|
}
|
||||||
|
|
||||||
update() {
|
update() {
|
||||||
|
super.update()
|
||||||
if(currentObjects['Somme gains Bode'] != undefined) {
|
if(currentObjects['Somme gains Bode'] != undefined) {
|
||||||
currentObjects['Somme gains Bode'][0].recalculateCache()
|
currentObjects['Somme gains Bode'][0].recalculateCache()
|
||||||
} else {
|
} else {
|
||||||
|
@ -892,7 +893,7 @@ class SommePhasesBode extends ExecutableObject {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
class CursorX extends DrawableObject {
|
class XCursor extends DrawableObject {
|
||||||
static type(){return 'X Cursor'}
|
static type(){return 'X Cursor'}
|
||||||
static typeMultiple(){return 'X Cursors'}
|
static typeMultiple(){return 'X Cursors'}
|
||||||
static properties() {
|
static properties() {
|
||||||
|
@ -900,7 +901,7 @@ class CursorX extends DrawableObject {
|
||||||
'x': 'Expression',
|
'x': 'Expression',
|
||||||
'targetElement': new P.ObjectType('ExecutableObject'),
|
'targetElement': new P.ObjectType('ExecutableObject'),
|
||||||
'labelPosition': new P.Enum('left', 'right'),
|
'labelPosition': new P.Enum('left', 'right'),
|
||||||
'approximate': 'Boolean',
|
'approximate': 'boolean',
|
||||||
'rounding': 'number',
|
'rounding': 'number',
|
||||||
'displayStyle': new P.Enum(
|
'displayStyle': new P.Enum(
|
||||||
'— — — — — — —',
|
'— — — — — — —',
|
||||||
|
@ -1027,8 +1028,8 @@ 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 {
|
||||||
'drawPoints': 'Boolean',
|
'drawPoints': 'boolean',
|
||||||
'drawDashedLines': 'Boolean',
|
'drawDashedLines': 'boolean',
|
||||||
'defaultExpression': new P.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 {name}ₙ, {name}[n+1] for {name}ₙ₊₁...',
|
'comment1': 'Note: Use {name}[n] to refer to {name}ₙ, {name}[n+1] for {name}ₙ₊₁...',
|
||||||
'baseValues': new P.Dictionary('string', 'int', /^.+$/, /^\d+$/, '{name}[', '] = '),
|
'baseValues': new P.Dictionary('string', 'int', /^.+$/, /^\d+$/, '{name}[', '] = '),
|
||||||
|
@ -1142,8 +1143,8 @@ class RepartitionFunction extends ExecutableObject {
|
||||||
static type(){return 'Repartition'}
|
static type(){return 'Repartition'}
|
||||||
static typeMultiple(){return 'Repartitions'}
|
static typeMultiple(){return 'Repartitions'}
|
||||||
static properties() {return {
|
static properties() {return {
|
||||||
'beginIncluded': 'Boolean',
|
'beginIncluded': 'boolean',
|
||||||
'drawLineEnds': 'Boolean',
|
'drawLineEnds': 'boolean',
|
||||||
'comment1': 'Note: Specify the properties for each potential result.',
|
'comment1': 'Note: Specify the properties for each potential result.',
|
||||||
'probabilities': new P.Dictionary('string', 'float', /^-?[\d.,]+$/, /^-?[\d\.,]+$/, 'P({name} = ', ') = '),
|
'probabilities': new P.Dictionary('string', 'float', /^-?[\d.,]+$/, /^-?[\d\.,]+$/, 'P({name} = ', ') = '),
|
||||||
'labelPosition': new P.Enum('above', 'below', 'left', 'right', 'above-left', 'above-right', 'below-left', 'below-right'),
|
'labelPosition': new P.Enum('above', 'below', 'left', 'right', 'above-left', 'above-right', 'below-left', 'below-right'),
|
||||||
|
@ -1363,7 +1364,7 @@ const types = {
|
||||||
'Somme gains Bode': SommeGainsBode,
|
'Somme gains Bode': SommeGainsBode,
|
||||||
'Phase Bode': PhaseBode,
|
'Phase Bode': PhaseBode,
|
||||||
'Somme phases Bode': SommePhasesBode,
|
'Somme phases Bode': SommePhasesBode,
|
||||||
'X Cursor': CursorX,
|
'X Cursor': XCursor,
|
||||||
'Sequence': Sequence,
|
'Sequence': Sequence,
|
||||||
'Repartition': RepartitionFunction
|
'Repartition': RepartitionFunction
|
||||||
}
|
}
|
||||||
|
|
2
MANIFEST.in
Normal file
2
MANIFEST.in
Normal file
|
@ -0,0 +1,2 @@
|
||||||
|
|
||||||
|
recursive-include LogarithmPlotter/qml *.qml *.js *.qdoc qmldir *.svg
|
Loading…
Reference in a new issue