From a852a1232f888f8758747385b1a962990e5365e3 Mon Sep 17 00:00:00 2001 From: Ad5001 Date: Thu, 1 Jul 2021 19:45:11 +0200 Subject: [PATCH] Adding manifest.in for building, changing Boolean to boolean, CursorX to XCursor --- LogarithmPlotter/qml/LogGraphCanvas.qml | 4 ++-- LogarithmPlotter/qml/ObjectLists.qml | 2 +- LogarithmPlotter/qml/js/objects.js | 21 +++++++++++---------- MANIFEST.in | 2 ++ 4 files changed, 16 insertions(+), 13 deletions(-) create mode 100644 MANIFEST.in diff --git a/LogarithmPlotter/qml/LogGraphCanvas.qml b/LogarithmPlotter/qml/LogGraphCanvas.qml index 8e14eae..4ee891c 100644 --- a/LogarithmPlotter/qml/LogGraphCanvas.qml +++ b/LogarithmPlotter/qml/LogGraphCanvas.qml @@ -188,14 +188,14 @@ Canvas { 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) { if(logscalex) { var logxmin = Math.log(xmin) return (Math.log(x)-logxmin)*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. function y2px(y) { return (ymax-y)*yzoom diff --git a/LogarithmPlotter/qml/ObjectLists.qml b/LogarithmPlotter/qml/ObjectLists.qml index e9ddc90..00a57ae 100644 --- a/LogarithmPlotter/qml/ObjectLists.qml +++ b/LogarithmPlotter/qml/ObjectLists.qml @@ -296,7 +296,7 @@ ListView { CheckBox { id: customPropCheckBox - visible: modelData[1] == 'Boolean' + visible: modelData[1] == 'boolean' height: visible ? 20 : 0 width: parent.width text: parent.label diff --git a/LogarithmPlotter/qml/js/objects.js b/LogarithmPlotter/qml/js/objects.js index 1175273..dd069ca 100644 --- a/LogarithmPlotter/qml/js/objects.js +++ b/LogarithmPlotter/qml/js/objects.js @@ -210,8 +210,8 @@ class Function extends ExecutableObject { 'displayMode': new P.Enum('application', 'function'), 'labelX': 'number', 'comment2': 'The following parameters are used when the definition domain is a non-continuous set. (Ex: ℕ, ℤ, sets like {0;3}...)', - 'drawPoints': 'Boolean', - 'drawDashedLines': 'Boolean' + 'drawPoints': 'boolean', + 'drawDashedLines': 'boolean' }} constructor(name = null, visible = true, color = null, labelContent = 'name + value', @@ -360,7 +360,7 @@ class GainBode extends ExecutableObject { 'gain': 'Expression', 'labelPosition': new P.Enum('above', 'below', 'left', 'right', 'above-left', 'above-right', 'below-left', 'below-right'), 'labelX': 'number', - 'omGraduation': 'Boolean' + 'omGraduation': 'boolean' }} constructor(name = null, visible = true, color = null, labelContent = 'name + value', @@ -481,6 +481,7 @@ class GainBode extends ExecutableObject { } update() { + super.update() if(currentObjects['Somme gains Bode'] != undefined) { currentObjects['Somme gains Bode'][0].recalculateCache() } else { @@ -892,7 +893,7 @@ class SommePhasesBode extends ExecutableObject { } -class CursorX extends DrawableObject { +class XCursor extends DrawableObject { static type(){return 'X Cursor'} static typeMultiple(){return 'X Cursors'} static properties() { @@ -900,7 +901,7 @@ class CursorX extends DrawableObject { 'x': 'Expression', 'targetElement': new P.ObjectType('ExecutableObject'), 'labelPosition': new P.Enum('left', 'right'), - 'approximate': 'Boolean', + 'approximate': 'boolean', 'rounding': 'number', 'displayStyle': new P.Enum( '— — — — — — —', @@ -1027,8 +1028,8 @@ class Sequence extends ExecutableObject { static type(){return 'Sequence'} static typeMultiple(){return 'Sequences'} static properties() {return { - 'drawPoints': 'Boolean', - 'drawDashedLines': 'Boolean', + 'drawPoints': 'boolean', + 'drawDashedLines': 'boolean', 'defaultExpression': new P.Dictionary('string', 'int', /^.+$/, /^\d+$/, '{name}[n+', '] = ', true), 'comment1': 'Note: Use {name}[n] to refer to {name}ₙ, {name}[n+1] for {name}ₙ₊₁...', 'baseValues': new P.Dictionary('string', 'int', /^.+$/, /^\d+$/, '{name}[', '] = '), @@ -1142,8 +1143,8 @@ class RepartitionFunction extends ExecutableObject { static type(){return 'Repartition'} static typeMultiple(){return 'Repartitions'} static properties() {return { - 'beginIncluded': 'Boolean', - 'drawLineEnds': 'Boolean', + 'beginIncluded': 'boolean', + 'drawLineEnds': 'boolean', 'comment1': 'Note: Specify the properties for each potential result.', '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'), @@ -1363,7 +1364,7 @@ const types = { 'Somme gains Bode': SommeGainsBode, 'Phase Bode': PhaseBode, 'Somme phases Bode': SommePhasesBode, - 'X Cursor': CursorX, + 'X Cursor': XCursor, 'Sequence': Sequence, 'Repartition': RepartitionFunction } diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 0000000..e68c444 --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1,2 @@ + +recursive-include LogarithmPlotter/qml *.qml *.js *.qdoc qmldir *.svg