LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/AppMenuBar.qml

@@ -35,7 +35,7 @@ import "js/math/latex.js" as LatexJS
     \sa LogarithmPlotter
 */
 MenuBar {
-    property var settingsMenu: settingsSubMenu
+    property var settings: settingsMenu
     
     Menu {
         title: qsTr("&File")
@@ -124,7 +124,7 @@ MenuBar {
     }
     
     Menu {
-        id: settingsSubMenu
+        id: settingsMenu
         title: qsTr("&Settings")
         Action {
             id: checkForUpdatesMenuSetting

LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/History/History.qml

@@ -18,7 +18,6 @@
 
 import QtQuick 2.12
 import QtQml 2.12
-import QtQuick.Window 2.12
 import "../js/objects.js" as Objects
 import "../js/historylib.js" as HistoryLib
 import "../js/history/common.js" as HistoryCommon
@@ -216,6 +215,5 @@ Item {
     Component.onCompleted: {
         HistoryLib.history = historyObj
         HistoryCommon.themeTextColor = sysPalette.windowText
-        HistoryCommon.imageDepth = Screen.devicePixelRatio
     }
 }

LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ObjectLists/ObjectRow.qml

@@ -19,7 +19,6 @@
 import QtQuick 2.12
 import QtQuick.Dialogs 1.3 as D
 import QtQuick.Controls 2.12
-import QtQuick.Window 2.12
 import eu.ad5001.LogarithmPlotter.Setting 1.0 as Setting
 import "../js/objects.js" as Objects
 import "../js/historylib.js" as HistoryLib
@@ -101,8 +100,8 @@ Item {
             anchors.verticalCenter: parent.verticalCenter
             anchors.left: parent.left
             visible: LatexJS.enabled
-            property double depth: Screen.devicePixelRatio
-            property var ltxInfo: visible ? Latex.render(obj.getLatexString(), depth*(parent.font.pixelSize+2), parent.color).split(",") : ["","0","0"]
+            property double depth: 2
+            property var ltxInfo: visible ? Latex.render(obj.getLatexString(), depth*parent.font.pixelSize+4, parent.color).split(",") : ["","0","0"]
             source: visible ? ltxInfo[0] : ""
             width: parseInt(ltxInfo[1])/depth
             height: parseInt(ltxInfo[2])/depth

LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Popup/GreetScreen.qml

@@ -104,7 +104,7 @@ Popup {
         onClicked: {
             Helper.setSettingBool("check_for_updates", checked)
             // Set in the menu bar
-            appMenu.settingsMenu.children[0].checked = checked
+            appMenu.settings.children[0].checked = checked
         }
     }
     
@@ -117,7 +117,7 @@ Popup {
         text: qsTr('Reset redo stack when a new action is added to history')
         onClicked: {
             Helper.setSettingBool("reset_redo_stack", checked)
-            appMenu.settingsMenu.children[1].checked = checked
+            appMenu.settings.children[1].checked = checked
         }
     }
     
@@ -130,7 +130,7 @@ Popup {
         text: qsTr('Enable LaTeX rendering')
         onClicked: {
             Helper.setSettingBool("enable_latex", checked)
-            appMenu.settingsMenu.children[2].checked = checked
+            appMenu.settings.children[2].checked = checked
         }
     }
     
@@ -143,7 +143,7 @@ Popup {
         text: qsTr('Automatically close parenthesises and brackets in expressions')
         onClicked: {
             Helper.setSettingBool("expression_editor.autoclose", checked)
-            appMenu.settingsMenu.children[3].children[0].checked = checked
+            appMenu.settings.children[3].children[0].checked = checked
         }
     }
     
@@ -156,7 +156,7 @@ Popup {
         text: qsTr('Enable syntax highlighting for expressions')
         onClicked: {
             Helper.setSettingBool("expression_editor.colorize", checked)
-            appMenu.settingsMenu.children[3].children[1].checked = checked
+            appMenu.settings.children[3].children[1].checked = checked
         }
     }
     
@@ -169,7 +169,7 @@ Popup {
         text: qsTr('Enable autocompletion interface in expression editor')
         onClicked: {
             Helper.setSettingBool("autocompletion.enabled", checked)
-            appMenu.settingsMenu.children[3].children[2].checked = checked
+            appMenu.settings.children[3].children[2].checked = checked
         }
     }
     

LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Setting/Icon.qml

@@ -15,8 +15,7 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-import QtQuick 2.12
-import QtQuick.Window 2.12
+import QtQuick 2.7
 import QtGraphicalEffects 1.0
 
 /*!
@@ -49,8 +48,8 @@ Item {
         width: parent.width
         //smooth: true
         visible: false
-        sourceSize.width: width*Screen.devicePixelRatio
-        sourceSize.height: width*Screen.devicePixelRatio
+        sourceSize.width: width*2
+        sourceSize.height: width*2
     }
     ColorOverlay {
         anchors.fill: img

LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/expr-eval.js

@@ -1627,10 +1627,10 @@ function min(array) {
 
 function arrayMap(f, a) {
   if (typeof f !== 'function') {
-    throw new EvalError(qsTranslate('error', 'First argument to map is not a function.'));
+    throw new Error(qsTranslate('error', 'First argument to map is not a function.'));
   }
   if (!Array.isArray(a)) {
-    throw new EvalError(qsTranslate('error', 'Second argument to map is not an array.'));
+    throw new Error(qsTranslate('error', 'Second argument to map is not an array.'));
   }
   return a.map(function (x, i) {
     return f(x, i);
@@ -1639,10 +1639,10 @@ function arrayMap(f, a) {
 
 function arrayFold(f, init, a) {
   if (typeof f !== 'function') {
-    throw new EvalError(qsTranslate('error', 'First argument to fold is not a function.'));
+    throw new Error(qsTranslate('error', 'First argument to fold is not a function.'));
   }
   if (!Array.isArray(a)) {
-    throw new EvalError(qsTranslate('error', 'Second argument to fold is not an array.'));
+    throw new Error(qsTranslate('error', 'Second argument to fold is not an array.'));
   }
   return a.reduce(function (acc, x, i) {
     return f(acc, x, i);
@@ -1651,10 +1651,10 @@ function arrayFold(f, init, a) {
 
 function arrayFilter(f, a) {
   if (typeof f !== 'function') {
-    throw new EvalError(qsTranslate('error', 'First argument to filter is not a function.'));
+    throw new Error(qsTranslate('error', 'First argument to filter is not a function.'));
   }
   if (!Array.isArray(a)) {
-    throw new EvalError(qsTranslate('error', 'Second argument to filter is not an array.'));
+    throw new Error(qsTranslate('error', 'Second argument to filter is not an array.'));
   }
   return a.filter(function (x, i) {
     return f(x, i);
@@ -1773,7 +1773,6 @@ class Parser {
       atan2: Math.atan2,
       'if': condition,
       gamma: gamma,
-      'Γ': gamma,
       roundTo: roundTo,
       map: arrayMap,
       fold: arrayFold,

LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/history/common.js

@@ -98,7 +98,7 @@ class Action {
     renderLatexAsHtml(latexString) {
         if(!Latex.enabled)
             throw new Error("Cannot render an item as LaTeX when LaTeX is disabled.")
-        let latexInfo = Latex.Renderer.render(latexString, imageDepth*(fontSize+2), themeTextColor).split(",")
+        let latexInfo = Latex.Renderer.render(latexString, imageDepth*fontSize+4, themeTextColor).split(",")
         return `<img src="${latexInfo[0]}" width="${parseInt(latexInfo[1])/imageDepth}" height="${parseInt(latexInfo[2])/imageDepth}" style="vertical-align: middle"></img>`
     }
     

LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objs/gainbode.js

@@ -112,7 +112,7 @@ class GainBode extends Common.ExecutableObject {
     
     draw(canvas, ctx) {
         var base = [canvas.x2px(this.om_0.x), canvas.y2px(this.om_0.y)]
-        var dbfn = new MathLib.Expression(`${this.gain.execute()}*(log10(x)-log10(${this.om_0.x}))+${this.om_0.y}`)
+        var dbfn = new MathLib.Expression(`${this.gain.execute()}*(ln(x)-ln(${this.om_0.x}))/ln(10)+${this.om_0.y}`)
         var inDrawDom = new MathLib.EmptySet()
 
         if(this.pass == 'high') {

LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/parsing/polyfill.js

@@ -1,136 +0,0 @@
-/**
- *  LogarithmPlotter - 2D plotter software to make BODE plots, sequences and distribution functions.
- *  Copyright (C) 2022  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/>.
- */
-
-// Contains polyfill math functions used for reference.
-
-.pragma library
-
-function factorial(x) {
-    if (x < 0) // Integrating by less than 0
-        if(isFinite(n))
-            return Infinity
-        else
-            throw new EvalError("Cannot calculate the factorial of -∞.")
-    
-    return gamma(x+1)
-}
-
-let GAMMA_G = 4.7421875
-let GAMMA_P = [
-    0.99999999999999709182,
-    57.156235665862923517, -59.597960355475491248,
-    14.136097974741747174, -0.49191381609762019978,
-    0.33994649984811888699e-4,
-    0.46523628927048575665e-4, -0.98374475304879564677e-4,
-    0.15808870322491248884e-3, -0.21026444172410488319e-3,
-    0.21743961811521264320e-3, -0.16431810653676389022e-3,
-    0.84418223983852743293e-4, -0.26190838401581408670e-4,
-    0.36899182659531622704e-5
-]
-
-function gamma(n) {
-    if(n <= 0) // Integrating by less than 0
-        if(isFinite(n))
-            return Infinity
-        else
-            throw new EvalError("Cannot calculate Γ(-∞).")
-
-    if(n >= 171.35)
-        return Infinity // Would return more than 2^1024 - 1 (aka Number.INT_MAX)
-    
-    if(n === Math.round(n) && isFinite(n)) {
-        // Calculating (n-1)!
-        let res = n - 1
-        
-        for(let i = n - 2; i > 1; i++)
-            res *= i
-
-        if(res === 0)
-            res = 1 // 0! is per definition 1
-
-        return res
-    }
-
-    // Section below adapted function adapted from math.js
-    if(n < 0.5)
-        return Math.PI / (Math.sin(Math.PI * n) * gamma(1 - n))
-
-    if(n > 85.0) { // Extended Stirling Approx
-        let twoN = n * n
-        let threeN = twoN * n
-        let fourN = threeN * n
-        let fiveN = fourN * n
-        return Math.sqrt(2 * Math.PI / n) * Math.pow((n / Math.E), n) *
-        (1 + (1 / (12 * n)) + (1 / (288 * twoN)) - (139 / (51840 * threeN)) -
-        (571 / (2488320 * fourN)) + (163879 / (209018880 * fiveN)) +
-        (5246819 / (75246796800 * fiveN * n)))
-    }
-
-    --n
-    let x = GAMMA_P[0]
-    for (let i = 1 i < GAMMA_P.length ++i) {
-        x += GAMMA_P[i] / (n + i)
-    }
-
-    let t = n + GAMMA_G + 0.5
-    return Math.sqrt(2 * Math.PI) * Math.pow(t, n + 0.5) * Math.exp(-t) * x
-}
-
-function arrayMap(f, arr) {
-    if (typeof f != 'function')
-        throw new EvalError(qsTranslate('error', 'First argument to map is not a function.'))
-    if (!Array.isArray(arr))
-        throw new EvalError(qsTranslate('error', 'Second argument to map is not an array.'))
-    return arr.map(f)
-}
-
-function arrayFold(f, init, arr) {
-    if (typeof f != 'function')
-        throw new EvalError(qsTranslate('error', 'First argument to fold is not a function.'))
-    if (!Array.isArray(arr))
-        throw new EvalError(qsTranslate('error', 'Second argument to fold is not an array.'))
-    return arr.reduce(f, init)
-}
-
-function arrayFilter(f, arr) {
-    if (typeof f != 'function')
-        throw new EvalError(qsTranslate('error', 'First argument to filter is not a function.'))
-    if (!Array.isArray(arr))
-        throw new EvalError(qsTranslate('error', 'Second argument to filter is not an array.'))
-    return arr.filter(f)
-}
-
-function arrayFilter(f, arr) {
-    if (typeof f != 'function')
-        throw new EvalError(qsTranslate('error', 'First argument to filter is not a function.'))
-    if (!Array.isArray(arr))
-        throw new EvalError(qsTranslate('error', 'Second argument to filter is not an array.'))
-    return arr.filter(f)
-}
-
-function arrayJoin(sep, arr) {
-    if (!Array.isArray(arr))
-        throw new Error(qsTranslate('error', 'Second argument to join is not an array.'))
-    return arr.join(sep)
-}
-
-function indexOf(target, s) {
-    if (!(Array.isArray(s) || typeof s === 'string'))
-        throw new Error(qsTranslate('error', 'Second argument to indexOf is not a string or array.'))
-    return s.indexOf(target)
-}

LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/parsing/reference.js

@@ -18,81 +18,54 @@
 
 .pragma library
 
-.import "polyfill.js" as Polyfill
-
-
 const CONSTANTS = {
     "π": Math.PI,
     "pi": Math.PI,
     "inf": Infinity,
     "infinity": Infinity,
     "∞": Infinity,
-    "e": Math.E
+    "e": Infinity
 };
 const CONSTANTS_LIST = Object.keys(CONSTANTS);
 
 const FUNCTIONS = {
-    // The functions commented are the one either not implemented 
-    // in the parser, or not to be used for autocompletion.
-    // Unary operators
-    //'+': Number,
-    //'-': (x) => -x,
-    //'!'
-    // Other operations
-    'length': (s) => Array.isArray(s) ? s.length : String(s).length,
-    // Boolean functions
-    'not': (x) => !x,
-    // Math functions
-    'abs': Math.abs,
-    'acos': Math.acos,
-    'acosh': Math.acosh,
-    'asin': Math.asin,
-    'asinh': Math.asinh,
-    'atan': Math.atan,
-    'atan2': Math.atan2,
-    'atanh': Math.atanh,
-    'cbrt': Math.cbrt,
-    'ceil': Math.ceil,
-    //'clz32': Math.clz32,
-    'cos': Math.cos,
-    'cosh': Math.cosh,
-    'exp': Math.exp,
-    'expm1': Math.expm1,
-    'floor': Math.floor,
-    //'fround': Math.fround,
-    'hypot': Math.hypot,
-    //'imul': Math.imul,
-    'lg': Math.log10,
-    'ln': Math.log,
-    'log': Math.log,
-    'log10': Math.log10,
-    'log1p': Math.log1p,
-    'log2': Math.log2,
-    'max': Math.max,
-    'min': Math.min,
-    'pow': Math.log2,
-    'random': Math.random,
-    'round': Math.round,
-    'sign': Math.sign,
-    'sin': Math.sin,
-    'sinh': Math.sinh,
-    'sqrt': Math.sqrt,
-    'tan': Math.tan,
-    'tanh': Math.tanh,
-    'trunc': Math.trunc,
-    // Functions in expr-eval, ported here.
-    'fac': Polyfill.factorial,
-    'gamma': Polyfill.gamma,
-    'Γ': Polyfill.gamma,
-    'roundTo': (x, exp) => Number(x).toFixed(exp),
-    'map': Polyfill.arrayMap,
-    'fold': Polyfill.arrayFold,
-    'filter': Polyfill.arrayFilter,
-    'indexOf': Polyfill.indexOf,
-    'join': Polyfill.arrayJoin,
-    // Integral & derivative (only here for autocomplete).
-    'integral': () => 0, // TODO: Implement
-    'derivative': () => 0,
+    "abs": Math.abs,
+    "acos": Math.acos,
+    "acosh": Math.acosh,
+    "asin": Math.asin,
+    "asinh": Math.asinh,
+    "atan": Math.atan,
+    "atan2": Math.atan2,
+    "atanh": Math.atanh,
+    "cbrt": Math.cbrt,
+    "ceil": Math.ceil,
+    "clz32": Math.clz32,
+    "cos": Math.cos,
+    "cosh": Math.cosh,
+    "exp": Math.exp,
+    "expm1": Math.expm1,
+    "floor": Math.floor,
+    "fround": Math.fround,
+    "hypot": Math.hypot,
+    "imul": Math.imul,
+    "log": Math.log,
+    "log10": Math.log10,
+    "log1p": Math.log1p,
+    "log2": Math.log2,
+    "max": Math.max,
+    "min": Math.min,
+    "pow": Math.log2,
+    "random": Math.random,
+    "round": Math.round,
+    "sign": Math.sign,
+    "sin": Math.sin,
+    "sinh": Math.sinh,
+    "sqrt": Math.sqrt,
+    "tan": Math.tan,
+    "tanh": Math.tanh,
+    "trunc": Math.trunc,
+    "integral": () => 0, // TODO: Implement
+    "derivative": () => 0,
 }
 const FUNCTIONS_LIST = Object.keys(FUNCTIONS);
 // TODO: Complete