Expression editor!

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

@@ -249,7 +249,11 @@ ApplicationWindow {
             
             // Importing objects
             Objects.currentObjects = {}
-            Objects.currentObjectsByName = {}
+            Object.keys(Objects.currentObjectsByName).forEach(key => {
+                delete Objects.currentObjectsByName[key];
+                // Required to keep the same reference for the copy of the object used in expression variable detection.
+                // Another way would be to change the reference as well, but I feel like the code would be less clean.
+            })
             for(let objType in data['objects']) {
                 if(Object.keys(Objects.types).indexOf(objType) > -1) {
                     Objects.currentObjects[objType] = []

LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/ObjectLists/Editor/CustomPropertyList.qml

@@ -18,10 +18,8 @@
 
 import QtQuick 2.12
 import QtQuick.Controls 2.12
-import QtQuick.Dialogs 1.3 as D
 import eu.ad5001.LogarithmPlotter.Setting 1.0 as Setting
 import "../../js/objects.js" as Objects
-import "../../js/objs/common.js" as ObjectsCommons
 import "../../js/historylib.js" as HistoryLib
 import "../../js/utils.js" as Utils
 import "../../js/mathlib.js" as MathLib
@@ -46,7 +44,7 @@ Repeater {
     */
     property var obj
     
-    readonly property var textTypes: ['Expression', 'Domain', 'string', 'number']
+    readonly property var textTypes: ['Domain', 'string', 'number']
     readonly property var comboBoxTypes: ['ObjectType', 'Enum']
     readonly property var listTypes: ['List', 'Dict']
     
@@ -66,48 +64,43 @@ Repeater {
         }
     }
     
+    Component {
+        id: expressionEditorComponent
+        
+        // Setting for expressions
+        Setting.ExpressionEditor {
+            height: 30
+            label: propertyLabel
+            icon: `settings/custom/${propertyIcon}.svg`
+            defValue: Utils.simplifyExpression(obj[propertyName].toEditableString())
+            self: obj.name
+            onChanged: function(newExpr) {
+                if(obj[propertyName].toString() != newExpr.toString()) {
+                    history.addToHistory(new HistoryLib.EditedProperty(
+                        obj.name, objType, propertyName, 
+                        obj[propertyName], newExpr
+                    ))
+                    obj[propertyName] = newExpr
+                    root.changed()
+                }
+            }
+        }
+    }
+
+    
     Component {
         id: textEditorComponent
         
-        // Setting for text & number settings as well as domains & expressions
+        // Setting for text & number settings as well as domains
         Setting.TextSetting {
             height: 30            
             label: propertyLabel
             icon: `settings/custom/${propertyIcon}.svg`
             isDouble: propertyType == 'number'
-            defValue: {
+            defValue: obj[propertyName] == null ? '' : obj[propertyName].toString()
-                switch(propertyType) {
-                    case 'Expression':
-                        return Utils.simplifyExpression(obj[propertyName].toEditableString())
-                        break
-                    case 'string':
-                        return obj[propertyName]
-                        break
-                    case 'Domain':
-                    case 'number':
-                    default:
-                        return obj[propertyName].toString()
-                }
-            }
             onChanged: function(newValue) {
                 try {
                     var newValueParsed = {
-                        'Expression': () => {
-                            let expr = new MathLib.Expression(newValue)
-                            // Check if the expression is valid, throws error otherwise.
-                            if(!expr.allRequirementsFullfilled()) {
-                                let undefVars = expr.undefinedVariables()
-                                console.log(JSON.stringify(undefVars), undefVars.join(', '))
-                                if(undefVars.length > 1)
-                                    throw new Error(qsTranslate('error', 'No object found with names %1.').arg(undefVars.join(', ')))
-                                else
-                                    throw new Error(qsTranslate('error', 'No object found with name %1.').arg(undefVars.join(', ')))
-                            }
-                            if(expr.requiredObjects().includes(obj.name))
-                                throw new Error(qsTranslate('error', 'Object cannot be dependent on itself.'))
-                                // TODO: Check for recursive dependencies.
-                            return expr
-                        },
                         'Domain': () => MathLib.parseDomain(newValue),
                         'string': () => newValue,
                         'number': () => parseFloat(newValue)
@@ -129,15 +122,15 @@ Repeater {
             }
             
         
-            D.MessageDialog {
+            // D.MessageDialog {
-                id: parsingErrorDialog
+            //     id: parsingErrorDialog
-                title: qsTr("LogarithmPlotter - Parsing error")
+            //     title: qsTranslate("expression", "LogarithmPlotter - Parsing error")
-                text: ""
+            //     text: ""
-                function showDialog(propName, propValue, error) {
+            //     function showDialog(propName, propValue, error) {
-                    text = qsTr("Error while parsing expression for property %1:\n%2\n\nEvaluated expression: %3").arg(propName).arg(error).arg(propValue)
+            //         text = qsTranslate("error", "Error while parsing expression for property %1:\n%2\n\nEvaluated expression: %3").arg(propName).arg(error).arg(propValue)
-                    open()
+            //         open()
-                }
+            //     }
-            }
+            // }
         }
     }
     
@@ -150,7 +143,12 @@ Repeater {
             text: propertyLabel
             //icon: `settings/custom/${propertyIcon}.svg`
             
-            checked: obj[propertyName]
+            checked: {
+                //if(obj[propertyName] == null) {
+                //    return false
+                //}
+                return obj[propertyName]
+            }
             onClicked: {
                 history.addToHistory(new HistoryLib.EditedProperty(
                     obj.name, objType, propertyName, 
@@ -269,6 +267,8 @@ Repeater {
                     return commentComponent
                 else if(propertyType == 'boolean')
                     return checkboxComponent
+                else if(propertyType == 'Expression')
+                    return expressionEditorComponent
                 else if(paramTypeIn(propertyType, textTypes))
                     return textEditorComponent
                 else if(paramTypeIn(propertyType, comboBoxTypes))

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

@@ -96,7 +96,7 @@ ScrollView {
                 posPicker: positionPicker
                 
                 onChanged: {
-                    //obj = Objects.currentObjects[objType][index]
+                    obj = Objects.currentObjects[objType][index]
                     objectListList.update()
                 }
                 

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

@@ -169,10 +169,7 @@ Item {
         ToolTip.text: qsTr("Delete %1 %2").arg(obj.constructor.displayType()).arg(obj.name)
         
         onClicked: {
-            history.addToHistory(new HistoryLib.DeleteObject(
+            deleteRecursively(obj)
-                obj.name, obj.type, obj.export()
-            ))
-            Objects.deleteObject(obj.name)
             changed()
         }
     }
@@ -207,4 +204,18 @@ Item {
             changed()
         }
     }
+    
+    /*!
+        \qmlmethod void ObjectRow::deleteRecursively(var object)
+        Deletes an object and it's dependencies recursively.
+    */
+    function deleteRecursively(object) {
+        for(let toRemove of object.requiredBy)
+            deleteRecursively(toRemove)
+        object.requiredBy = []
+        history.addToHistory(new HistoryLib.DeleteObject(
+            object.name, object.type, object.export()
+        ))
+        Objects.deleteObject(object.name)
+    }
 }

LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Popup/InsertCharacter.qml

@@ -0,0 +1,72 @@
+/**
+ *  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/>.
+ */
+
+import QtQuick.Controls 2.12
+import QtQuick 2.12 
+
+/*!
+    \qmltype InsertCharacter
+    \inqmlmodule eu.ad5001.LogarithmPlotter.Setting
+    \brief Popup to insert special character.
+            
+    \sa TextSetting, ExpressionEditor
+*/
+Popup {
+    id: insertPopup
+    
+    signal selected(string character)
+    
+    width: 280
+    height: insertGrid.insertChars.length/insertGrid.columns*(width/insertGrid.columns)
+    modal: true
+    closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutsideParent
+    
+    Grid {
+        id: insertGrid
+        width: parent.width
+        columns: 7
+        
+        property var insertChars: [
+            "α","β","γ","δ","ε","ζ","η",
+            "π","θ","κ","λ","μ","ξ","ρ",
+            "ς","σ","τ","φ","χ","ψ","ω",
+            "Γ","Δ","Θ","Λ","Ξ","Π","Σ",
+            "Φ","Ψ","Ω","ₐ","ₑ","ₒ","ₓ",
+            "ₕ","ₖ","ₗ","ₘ","ₙ","ₚ","ₛ",
+            "ₜ","¹","²","³","⁴","⁵","⁶",
+            "⁷","⁸","⁹","⁰","₁","₂","₃",
+            "₄","₅","₆","₇","₈","₉","₀"
+        ]
+        Repeater {
+            model: parent.insertChars.length
+            
+            Button {
+                id: insertBtn
+                width: insertGrid.width/insertGrid.columns
+                height: width
+                text: insertGrid.insertChars[modelData]
+                flat: text == " "
+                font.pixelSize: 18
+                
+                onClicked: {
+                    selected(text)
+                }
+            }
+        }
+    }
+}

LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Popup/qmldir

@@ -6,3 +6,4 @@ FileDialog 1.0 FileDialog.qml
 GreetScreen 1.0 GreetScreen.qml
 Changelog 1.0 Changelog.qml
 ThanksTo 1.0 ThanksTo.qml
+InsertCharacter 1.0 InsertCharacter.qml

LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Setting/ExpressionEditor.qml

@@ -0,0 +1,214 @@
+/**
+ *  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/>.
+ */
+
+import QtQuick.Controls 2.12
+import QtQuick 2.12
+import QtQuick.Dialogs 1.3 as D
+import eu.ad5001.LogarithmPlotter.Popup 1.0 as Popup
+import "../js/mathlib.js" as MathLib
+
+
+/*!
+    \qmltype ExpressionEditor
+    \inqmlmodule eu.ad5001.LogarithmPlotter.Setting
+    \brief Setting to edit strings and numbers.
+            
+    \sa EditorDialog, Settings, Icon
+*/
+Item {
+    id: control
+    height: 30
+    
+    /*!
+        \qmlsignal ExpressionEditor::changed(var newValue)
+        
+        Emitted when the value of the expression has been changed.
+        The corresponding handler is \c onChanged.
+    */
+    signal changed(var newValue)
+    
+    /*!
+       \qmlproperty string ExpressionEditor::defValue
+       Default editable expression value of the editor.
+    */
+    property string defValue
+    /*!
+       \qmlproperty string ExpressionEditor::value
+       Value of the editor.
+    */
+    property alias value: editor.text
+    /*!
+       \qmlproperty string ExpressionEditor::self
+       Object or context of the expression to be edited.
+       Used to prevent circular dependency.
+    */
+    property string self: ""
+    /*!
+       \qmlproperty string ExpressionEditor::placeholderText
+       Value of the editor.
+    */
+    property alias placeholderText: editor.placeholderText
+    /*!
+       \qmlproperty string ExpressionEditor::label
+       Label of the editor.
+    */
+    property string label
+    /*!
+       \qmlproperty string ExpressionEditor::icon
+       Icon path of the editor.
+    */
+    property string icon: ""
+    
+    /*!
+       \qmlproperty string ExpressionEditor::openAndCloseMatches
+       Characters that when pressed, should be immediately followed up by their closing character.
+    */
+    readonly property var openAndCloseMatches: {
+        "(": ")",
+        "[": "]",
+        "'": "'",
+        '"': '"'
+    }
+    
+    Icon {
+        id: iconLabel
+        anchors.top: parent.top
+        anchors.topMargin: icon == "" ? 0 : 3
+        source: control.visible && icon != "" ? "../icons/" + control.icon : ""
+        width: height
+        height: icon == "" || !visible ? 0 : 24
+        color: sysPalette.windowText
+    }
+    
+    Label {
+        id: labelItem
+        anchors.left: iconLabel.right
+        anchors.leftMargin: icon == "" ? 0 : 5
+        height: parent.height
+        anchors.top: parent.top
+        verticalAlignment: TextInput.AlignVCenter
+        //color: sysPalette.windowText
+        text: visible ? qsTranslate("control", "%1: ").arg(control.label) : ""
+        visible: control.label != ""
+    }
+    
+    D.MessageDialog {
+        id: parsingErrorDialog
+        title: qsTranslate("expression", "LogarithmPlotter - Parsing error")
+        text: ""
+        function showDialog(propName, propValue, error) {
+            text = qsTranslate("expression", "Error while parsing expression for property %1:\n%2\n\nEvaluated expression: %3").arg(propName).arg(error).arg(propValue)
+            open()
+        }
+    }
+    
+    TextField {
+        id: editor
+        anchors.top: parent.top
+        anchors.left: labelItem.right
+        anchors.leftMargin: 5
+        width: control.width - (labelItem.visible ? labelItem.width + 5 : 0) - iconLabel.width - 5
+        height: parent.height
+        verticalAlignment: TextInput.AlignVCenter
+        horizontalAlignment: control.label == "" ? TextInput.AlignLeft : TextInput.AlignHCenter
+        text: control.defValue
+        color: sysPalette.windowText
+        focus: true
+        selectByMouse: true
+        
+        Keys.priority: Keys.BeforeItem // Required for knowing which key the user presses.
+        
+        onEditingFinished: {
+            if(insertButton.focus || insertPopup.focus) return
+            let value = text
+            if(value != "" && value.toString() != defValue) {
+                let expr = parse(value)
+                if(expr != null) {
+                    control.changed(expr)
+                    defValue = expr.toEditableString()
+                }
+            }
+        }
+        
+        Keys.onPressed: function(event) {
+            if(event.text in openAndCloseMatches) {
+                let start = selectionStart
+                insert(selectionStart, event.text)
+                insert(selectionEnd, openAndCloseMatches[event.text])
+                cursorPosition = start+1
+                event.accepted = true
+            }
+        }
+    }
+    
+    Button {
+        id: insertButton
+        text: "α"
+        anchors.right: parent.right
+        anchors.rightMargin: 5
+        anchors.verticalCenter: parent.verticalCenter
+        width: 20
+        height: width
+        onClicked: {
+            insertPopup.open()
+            insertPopup.focus = true
+        }
+    }
+    
+    Popup.InsertCharacter {
+        id: insertPopup
+        
+        x: Math.round((parent.width - width) / 2)
+        y: Math.round((parent.height - height) / 2)
+        
+        onSelected: function(c) {
+            editor.insert(editor.cursorPosition, c)
+            insertPopup.close()
+            editor.focus = true
+        }
+    }
+    
+    /*!
+        \qmlmethod var ExpressionEditor::parse(string newExpression)
+        Parses the \c newExpression as an expression, checks for errors, shows them if any.
+        Returns the parsed expression if possible, null otherwise..
+    */
+    function parse(newExpression) {
+        let expr = null
+        try {
+            expr = new MathLib.Expression(value.toString())
+            // Check if the expression is valid, throws error otherwise.
+            if(!expr.allRequirementsFullfilled()) {
+                let undefVars = expr.undefinedVariables()
+                console.log(JSON.stringify(undefVars), undefVars.join(', '))
+                if(undefVars.length > 1)
+                    throw new Error(qsTranslate('error', 'No object found with names %1.').arg(undefVars.join(', ')))
+                else
+                    throw new Error(qsTranslate('error', 'No object found with name %1.').arg(undefVars.join(', ')))
+            }
+            if(expr.requiredObjects().includes(control.self))
+                throw new Error(qsTranslate('error', 'Object cannot be dependent on itself.'))
+                // TODO: Check for recursive dependencies.                    
+        } catch(e) {
+            // Error in expression
+            parsingErrorDialog.showDialog(propertyName, newExpression, e.message)
+        }
+        return expr
+    }
+}
+

LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Setting/TextSetting.qml

@@ -18,6 +18,7 @@
 
 import QtQuick.Controls 2.12
 import QtQuick 2.12 
+import eu.ad5001.LogarithmPlotter.Popup 1.0 as Popup
 
 /*!
     \qmltype TextSetting
@@ -119,6 +120,7 @@ Item {
         text: control.defValue
         selectByMouse: true
         onEditingFinished: {
+            if(insertButton.focus || insertPopup.focus) return
             var value = text
             if(control.isInt) value = Math.max(control.min,parseInt(value).toString()=="NaN"?control.min:parseInt(value))
             if(control.isDouble) value = Math.max(control.min,parseFloat(value).toString()=="NaN"?control.min:parseFloat(value))
@@ -130,6 +132,7 @@ Item {
     }
     
     Button {
+        id: insertButton
         text: "α"
         anchors.right: parent.right
         anchors.rightMargin: 5
@@ -137,53 +140,22 @@ Item {
         width: 20
         height: width
         visible: !isInt && !isDouble
-        onClicked: insertPopup.open()
+        onClicked: {
+            insertPopup.open()
+            insertPopup.focus = true
+        }
     }
     
-    Popup {
+    Popup.InsertCharacter {
         id: insertPopup
+        
         x: Math.round((parent.width - width) / 2)
         y: Math.round((parent.height - height) / 2)
-        width: 280
-        height: insertGrid.insertChars.length/insertGrid.columns*(width/insertGrid.columns)
-        modal: true
-        focus: true
-        closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutsideParent
         
-        Grid {
+        onSelected: function(c) {
-            id: insertGrid
+            input.insert(input.cursorPosition, c)
-            width: parent.width
-            columns: 7
-            
-            property var insertChars: [
-                "α","β","γ","δ","ε","ζ","η",
-                "π","θ","κ","λ","μ","ξ","ρ",
-                "ς","σ","τ","φ","χ","ψ","ω",
-                "Γ","Δ","Θ","Λ","Ξ","Π","Σ",
-                "Φ","Ψ","Ω","ₐ","ₑ","ₒ","ₓ",
-                "ₕ","ₖ","ₗ","ₘ","ₙ","ₚ","ₛ",
-                "ₜ","¹","²","³","⁴","⁵","⁶",
-                "⁷","⁸","⁹","⁰","₁","₂","₃",
-                "₄","₅","₆","₇","₈","₉","₀"
-            ]
-            Repeater {
-                model: parent.insertChars.length
-                
-                Button {
-                    id: insertBtn
-                    width: insertGrid.width/insertGrid.columns
-                    height: width
-                    text: insertGrid.insertChars[modelData]
-                    flat: text == " "
-                    font.pixelSize: 18
-                    
-                    onClicked: {
-                        input.insert(input.cursorPosition, insertGrid.insertChars[modelData])
             insertPopup.close()
             input.focus = true
         }
     }
 }
-        }
-    }
-}

LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Setting/qmldir

@@ -4,4 +4,4 @@ ComboBoxSetting 1.0 ComboBoxSetting.qml
 Icon 1.0 Icon.qml
 ListSetting 1.0 ListSetting.qml
 TextSetting 1.0 TextSetting.qml
-
+ExpressionEditor 1.0 ExpressionEditor.qml

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

@@ -1836,9 +1836,9 @@ var optionNameMap = {
   'not': 'logical',
   '?': 'conditional',
   ':': 'conditional',
-  '=': 'assignment',
+  //'=': 'assignment', // Disable assignment
   '[': 'array',
-  '()=': 'fndef'
+  //'()=': 'fndef' // Diable function definition
 };
 
 function getOptionName(op) {

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

@@ -45,6 +45,7 @@ class CreateNewObject extends C.Action {
     
     redo() {
         Objects.createNewRegisteredObject(this.targetType, this.targetProperties)
+        Objects.currentObjectsByName[this.targetName].update()
     }
     
     export() {

LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/objects.js

@@ -46,9 +46,9 @@ function deleteObject(objName) {
      * @param {string} objName - Current name of the object.
      */
     let obj = currentObjectsByName[objName]
-    delete currentObjectsByName[objName]
     currentObjects[obj.type].splice(currentObjects[obj.type].indexOf(obj),1)
     obj.delete()
+    delete currentObjectsByName[objName]
 }
 
 function getObjectsName(objType) {

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

@@ -200,7 +200,7 @@ class DrawableObject {
             if(properties[property] == 'Expression' && this[property] != null) {
                 // Expressions with dependencies
                 for(let objName of this[property].requiredObjects()) {
-                    if(objName in C.currentObjectsByName) {
+                    if(objName in C.currentObjectsByName && !this.requires.includes(C.currentObjectsByName[objName])) {
                         this.requires.push(C.currentObjectsByName[objName])
                         C.currentObjectsByName[objName].requiredBy.push(this)
                     }
@@ -224,7 +224,7 @@ class DrawableObject {
      * Callback method when the object is about to get deleted.
      */
     delete() {
-        for(let toRemove of this.requiredBy) {
+        for(let toRemove of this.requiredBy) { // Normally, there should be none here, but better leave nothing just in case.
             Objects.deleteObject(toRemove.name)
         }
     }

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

@@ -45,7 +45,7 @@ class Text extends Common.DrawableObject  {
                 x = 1, y = 0, labelPosition = 'center', text = 'New text', disableLatex = false) {
         if(name == null) name = Common.getNewName('t')
         super(name, visible, color, labelContent)
-        this.type = 'Point'
+        this.type = 'Text'
         if(typeof x == 'number' || typeof x == 'string') x = new MathLib.Expression(x.toString())
         this.x = x
         if(typeof y == 'number' || typeof y == 'string') y = new MathLib.Expression(y.toString())