Adding picker for properties (x,y,labelX)

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

@@ -18,6 +18,7 @@
 
 import QtQuick
 import QtQuick.Controls
+import Qt.labs.platform as Native
 import eu.ad5001.LogarithmPlotter.Setting 1.0 as Setting
 import "../../js/objects.js" as Objects
 import "../../js/historylib.js" as HistoryLib
@@ -43,6 +44,11 @@ Repeater {
        Object whose properties to list and edit.
     */
     property var obj
+    /*!
+       \qmlproperty var CustomPropertyList::positionPicker
+       Reference to the global PositionPicker QML object.
+    */
+    property var positionPicker
     
     readonly property var textTypes: ['Domain', 'string', 'number']
     readonly property var comboBoxTypes: ['ObjectType', 'Enum']
@@ -123,15 +129,15 @@ Repeater {
             }
             
         
-            // D.MessageDialog {
+            Native.MessageDialog {
-            //     id: parsingErrorDialog
+                id: parsingErrorDialog
-            //     title: qsTranslate("expression", "LogarithmPlotter - Parsing error")
+                title: qsTranslate("expression", "LogarithmPlotter - Parsing error")
-            //     text: ""
+                text: ""
-            //     function showDialog(propName, propValue, error) {
+                function showDialog(propName, propValue, error) {
-            //         text = qsTranslate("error", "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()
-            //     }
+                }
-            // }
+            }
         }
     }
     
@@ -255,29 +261,68 @@ Repeater {
     }
     
     delegate: Component {
-        Loader {
+        Row {
-            //height: customPropComment.height + customPropText.height + customPropCheckBox.height + customPropCombo.height + customPropListDict.height
             width: dlgProperties.width
-            property string propertyName: modelData[0]
+            spacing: 5
-            property var propertyType: modelData[1]
-            property string propertyLabel: qsTranslate('prop',propertyName)
-            property string propertyIcon: Utils.camelCase2readable(propertyName)
             
-            sourceComponent: {
+            Loader {
-                if(propertyName.startsWith('comment'))
+                id: propertyEditor
-                    return commentComponent
+                width: dlgProperties.width - pointerButton.width
-                else if(propertyType == 'boolean')
+                property string propertyName: modelData[0]
-                    return checkboxComponent
+                property var propertyType: modelData[1]
-                else if(paramTypeIn(propertyType, ['Expression']))
+                property string propertyLabel: qsTranslate('prop',propertyName)
-                    return expressionEditorComponent
+                property string propertyIcon: Utils.camelCase2readable(propertyName)
-                else if(paramTypeIn(propertyType, textTypes))
+                
-                    return textEditorComponent
+                sourceComponent: {
-                else if(paramTypeIn(propertyType, comboBoxTypes))
+                    if(propertyName.startsWith('comment'))
-                    return comboBoxComponent
+                        return commentComponent
-                else if(paramTypeIn(propertyType, listTypes))
+                    else if(propertyType == 'boolean')
-                    return listDictEditorComponent
+                        return checkboxComponent
-                else
+                    else if(paramTypeIn(propertyType, ['Expression']))
-                    return {}
+                        return expressionEditorComponent
+                    else if(paramTypeIn(propertyType, textTypes))
+                        return textEditorComponent
+                    else if(paramTypeIn(propertyType, comboBoxTypes))
+                        return comboBoxComponent
+                    else if(paramTypeIn(propertyType, listTypes))
+                        return listDictEditorComponent
+                    else
+                        return {}
+                }
+            }
+        
+            Button {
+                id: pointerButton
+                height: parent.height
+                width: visible ? height : 0
+                anchors.verticalCenter: parent.verticalCenter
+                
+                property bool isXProp: ['labelX', 'x'].includes(propertyEditor.propertyName)
+                property bool isYProp: ['y'].includes(propertyEditor.propertyName)
+                visible: isXProp || isYProp
+                ToolTip.visible: hovered
+                ToolTip.text: qsTr("Pick on graph")
+                
+                Setting.Icon {
+                    id: icon
+                    width: 18
+                    height: 18
+                    anchors.centerIn: parent
+                    
+                    color: sysPalette.windowText
+                    source: '../icons/common/position.svg'
+                }
+                
+                onClicked: {
+                    positionPicker.objType = objType
+                    positionPicker.objName = obj.name
+                    positionPicker.pickX = isXProp
+                    positionPicker.pickY = isYProp
+                    positionPicker.propertyX = propertyEditor.propertyName
+                    positionPicker.propertyY = propertyEditor.propertyName
+                    positionPicker.visible = true
+                    objEditor.close()
+                }
             }
         }
     }

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

@@ -55,6 +55,11 @@ Popup.BaseDialog {
        Instance of the object being edited.
     */
     property var obj: Objects.currentObjects[objType][objIndex]
+    /*!
+       \qmlproperty var EditorDialog::posPicker
+       Reference to the global PositionPicker QML object.
+    */
+    property var posPicker
     
     title: "LogarithmPlotter"
     width: 350
@@ -106,7 +111,6 @@ Popup.BaseDialog {
                 value: objEditor.obj.name
                 onChanged: function(newValue) {
                     let newName = Utils.parseName(newValue)
-                    console.log(newValue, newName)
                     if(newName != '' && objEditor.obj.name != newName) {
                         if(newName in Objects.currentObjectsByName) {
                             invalidNameDialog.showDialog(newName)
@@ -144,6 +148,7 @@ Popup.BaseDialog {
             CustomPropertyList {
                 id: dlgCustomProperties
                 obj: objEditor.obj
+                positionPicker: posPicker
                 
                 onChanged: {
                     obj.update()

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

@@ -116,6 +116,8 @@ ScrollView {
     // Object editor
     Editor.Dialog {
         id: objEditor
+        
+        posPicker: positionPicker
     }
     
     /*!

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

@@ -125,7 +125,6 @@ Item {
             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))
             if(value != "" && value.toString() != defValue) {
-                console.log(value, value.toString())
                 control.changed(value)
                 defValue = value.toString()
             }