206 migrate sample page to use qt6 and get values from backend proxy

src_qt6/EasyReflectometryApp.pyproject

@@ -35,10 +35,14 @@
         "EasyReflectometryApp/Backends/Mock/Report.qml",
         "EasyReflectometryApp/Backends/Mock/Status.qml",
         "EasyReflectometryApp/Backends/Py/py_backend.py",
+        "EasyReflectometryApp/Backends/Py/home.py",
         "EasyReflectometryApp/Backends/Py/project.py",
+        "EasyReflectometryApp/Backends/Py/sample.py",
+        "EasyReflectometryApp/Backends/Py/analysis.py",
         "EasyReflectometryApp/Backends/Py/report.py",
         "EasyReflectometryApp/Backends/Py/status.py",
         "EasyReflectometryApp/Backends/Py/logic/helpers.py",
-        "EasyReflectometryApp/Backends/Py/logic/project.py"
+        "EasyReflectometryApp/Backends/Py/logic/project.py",
+        "EasyReflectometryApp/Backends/Py/logic/sample.py"
     ]
 }

src_qt6/EasyReflectometryApp.qmlproject

@@ -37,4 +37,6 @@ Project {
         filter: "qmldir;*.ts;*.qrc;*.html"
         recursive: true
     }
+
+    mainUiFile: "EasyReflectometryApp/mail.qml"
 }

src_qt6/EasyReflectometryApp/Backends/Mock/Analysis.qml

@@ -0,0 +1,9 @@
+pragma Singleton
+
+import QtQuick
+
+QtObject {
+
+    readonly property bool isFitFinished: true
+
+}

src_qt6/EasyReflectometryApp/Backends/Mock/Plotting.qml

@@ -0,0 +1,25 @@
+pragma Singleton
+
+import QtQuick
+
+QtObject {
+
+    property double sampleMinX: -1.
+    property double sampleMaxX: 1.
+    property double sampleMinY: -10.
+    property double sampleMaxY: 10.
+    property double sldMinX: -2.
+    property double sldMaxX: 2.
+    property double sldMinY: -20.
+    property double sldMaxY: 20.
+
+    function setQtChartsReflectometrySerieRef(value1, value2, value3) {
+        console.debug(`setQtChartsReflectometrySerieRef ${value1}, ${value2}, ${value3}`)
+    }
+
+    function setQtChartsSldSerieRef(value1, value2, value3) {
+        console.debug(`setQtChartsSldSerieRef ${value1}, ${value2}, ${value3}`)
+    }
+
+
+}

src_qt6/EasyReflectometryApp/Backends/Mock/Sample.qml

@@ -0,0 +1,267 @@
+pragma Singleton
+
+import QtQuick
+
+QtObject {
+    // MATERIALS
+    property int currentMaterialIndex: -1
+
+    // Getters
+    readonly property var materials: [
+        {
+            'label': 'label 1',
+            'sld': '1.23456',
+            'isld': '-1.23456'
+        },
+        {
+            'label': 'label 2',
+            'sld': '2.34567',
+            'isld': '-2.34567'
+        },
+        {
+            'label': 'label 3',
+            'sld': '3.45678',
+            'isld': '-3.45678'
+        },
+    ]
+    readonly property var materialNames: materials.map(function (item) { return item.label })
+
+    // Setters
+    function setCurrentMaterialIndex(value) {
+        console.debug(`setCurrentMaterialIndex ${value}`)
+    }
+    function setCurrentMaterialName(value) {
+        console.debug(`setCurrentMaterialName ${value}`)
+    }
+    function setCurrentMaterialSld(value) {
+        console.debug(`setCurrentMaterialSld ${value}`)
+    }
+    function setCurrentMaterialISld(value) {
+        console.debug(`setCurrentMaterialISld ${value}`)
+    }
+
+
+    // Table functions
+    function removeMaterial(value) {
+        console.debug(`removeMaterial ${value}`)
+    }
+    function addNewMaterial() {
+        console.debug(`addNewMaterial`)
+    }
+    function duplicateSelectedMaterial() {
+        console.debug(`duplicateSelectedMaterial ${currentMaterialIndex}`)
+    }
+    function moveSelectedMaterialUp() {
+        console.debug(`moveSelectedMaterialUp ${currentMaterialIndex}`)
+    }
+    function moveSelectedMaterialDown() {
+        console.debug(`moveSelectedMaterialDown ${currentMaterialIndex}`)
+    }
+    // MODELS
+    property int currentModelIndex: -1
+    property string currentModelName: 'currentModelName'
+
+    // Getters
+    readonly property var models: [
+        {
+            'label': 'label 1',
+            'color': 'red',
+        },
+        {
+            'label': 'label 2',
+            'color': 'green'
+        },
+        {
+            'label': 'label 3',
+            'color': 'blue'
+        },
+    ]
+
+    // Setters
+    function setCurrentModelIndex(value){
+        console.debug(`setCurrentModelIndex ${value}`)
+    }
+    function setCurrentModelName(value) {
+        console.debug(`setCurrentModelName ${value}`)
+    }
+
+    // Table functions
+    function removeModel(value) {
+        console.debug(`removeModel ${value}`)
+    }
+    function addNewModel() {
+        console.debug(`addNewModel`)
+    }
+    function duplicateSelectedModel() {
+        console.debug(`duplicateSelectedModel ${currentModelIndex}`)
+    }
+    function moveSelectedModelUp() {
+        console.debug(`moveSelectedModelUp ${currentModelIndex}`)
+    }
+    function moveSelectedModelDown() {
+        console.debug(`moveSelectedModelDown ${currentModelIndex}`)
+    }
+
+    // ASSEMBLIES
+    property int currentAssemblyIndex: -1
+    property bool constrainAPM: false
+    property bool conformalRoughness: false
+    property int repeatedLayerReptitions: 1
+
+    property string currentAssemblyName: 'currentAssemblyName'
+    property string currentAssemblyType: 'Surfactant Layer'
+
+
+    // Getters
+    readonly property var assemblies: [
+        {
+            'label': 'label 1',
+            'type': 'Multi-layer'
+        },
+        {
+            'label': 'label 2',
+            'type': 'Multi-layer'
+        },
+        {
+            'label': 'label 3',
+            'type': 'Repeating Multi-layer'
+
+        },
+        {
+            'label': 'label 4',
+            'type': 'Surfactant Layer'
+        },
+    ]
+
+    // Setters
+    function setCurrentAssemblyName(value) {
+        console.debug(`setCurrentAssemblyName ${value}`)
+    }
+    function setCurrentAssemblyType(value) {
+        console.debug(`setCurrentAssemblyType ${value}`)
+    }
+    function setCurrentAssemblyIndex(value) {
+        currentAssemblyType = assemblies[value].type
+        console.debug(`setCurrentAssemblyIndex ${value}`)
+    }
+
+    // Table functions
+    function removeAssembly(value) {
+        console.debug(`removeAssembly ${value}`)
+    }
+    function addNewAssembly() {
+        console.debug(`addNewAssembly`)
+    }
+    function duplicateSelectedAssembly() {
+        console.debug(`duplicateSelectedAssembly ${currentAssemblyIndex}`)
+    }
+    function moveSelectedAssemblyUp() {
+        console.debug(`moveSelectedAssemblyUp ${currentAssemblyIndex}`)
+    }
+    function moveSelectedAssemblyDown() {
+        console.debug(`moveSelectedAssemblyDown ${currentAssemblyIndex}`)
+    }
+
+    // Assembly specific
+    property int currentAssemblyRepeatedLayerReptitions: 3
+
+    function setCurrentAssemblyRepeatedLayerReptitions(value) {
+        console.debug(`setCurrentAssemblyRepeatedLayerReptitions ${value}`)
+    }
+
+    function setCurrentAssemblyConstrainAPM(value) {
+        console.debug(`setCurrentAssemblyConstrainAPM ${value}`)
+    }
+
+    function setCurrentAssemblyConformalRoughness(value) {
+        console.debug(`setCurrentAssemblyConformalRoughness ${value}`)
+    }
+
+    // LAYERS
+    property int currentLayerIndex: -1
+
+    property string currentLayerName: 'currentLayerName'
+
+    // Getters
+    readonly property var layers: [
+        {
+            'formula': 'formula 1',
+            'material': 'label 1',
+            'solvent': 'label 1',
+            'thickness': '1',
+            'thickness_enabled': 'True',
+            'roughness': '1',
+            'roughness_enabled': 'True',
+            'solvation': '1',
+            'apm': '1',
+            'apm_enabled': 'True',
+        },
+        {
+            'formula': 'formula 2',
+            'material': 'label 2',
+            'solvent': 'label 2',
+            'thickness': ' 2',
+            'thickness_enabled': 'False',
+            'roughness': '2',
+            'roughness_enabled': 'False',
+            'solvation': '2',
+            'apm': '2',
+            'apm_enabled': 'False',
+        },
+        {
+            'formula': 'formula 3',
+            'material': 'label 3',
+            'solvent': 'label 3',
+            'thickness': '3',
+            'thickness_enabled': 'False',
+            'roughness': '3',
+            'roughness_enabled': 'False',
+            'solvation': '3',
+            'apm': '3',
+            'apm_enabled': 'False',
+        },
+    ]
+
+    // Setters
+    function setCurrentLayerIndex(value){
+        console.debug(`setCurrentLayerIndex ${value}`)
+    }
+    function setCurrentLayerFormula(value) {
+        console.debug(`setCurrentLayerFormula ${value}`)
+    }
+    function setCurrentLayerMaterial(value) {
+        console.debug(`setCurrentLayerMaterialIndex ${value}`)
+    }
+    function setCurrentLayerSolvent(value) {
+        console.debug(`setCurrentLayerSolvent ${value}`)
+    }
+    function setCurrentLayerThickness(value) {
+        console.debug(`setCurrentLayerThickness ${value}`)
+    }
+    function setCurrentLayerRoughness(value) {
+        console.debug(`setCurrentLayerRoughness ${value}`)
+    }
+    function setCurrentLayerAPM(value) {
+        console.debug(`setCurrentLayerAPM ${value}`)
+    }
+    function setCurrentLayerSolvation(value) {
+        console.debug(`setCurrentLayerSolvation ${value}`)
+    }
+
+    // Table functions
+    function removeLayer(value) {
+        console.debug(`removeLayer ${value}`)
+    }
+    function addNewLayer() {
+        console.debug(`addNewLayer`)
+    }
+    function duplicateSelectedLayer() {
+        console.debug(`duplicateSelectedLayer ${currentLayerIndex}`)
+    }
+    function moveSelectedLayerUp() {
+        console.debug(`moveSelectedLayerUp ${currentLayerIndex}`)
+    }
+    function moveSelectedLayerDown() {
+        console.debug(`moveSelectedLayerDown ${currentLayerIndex}`)
+    }
+}

src_qt6/EasyReflectometryApp/Backends/Mock/qmldir

@@ -1,6 +1,9 @@
 module MockLogic
 
+singleton Analysis Analysis.qml
 singleton Home Home.qml
 singleton Project Project.qml
 singleton Report Report.qml
+singleton Sample Sample.qml
 singleton Status Status.qml
+singleton Plotting Plotting.qml

src_qt6/EasyReflectometryApp/Backends/MockBackend.qml

@@ -6,11 +6,13 @@ import Backends.Mock as Backend
 
 QtObject {
 
+    property var analysis: Backend.Analysis
     property var home: Backend.Home
     property var project: Backend.Project
-    property var status: Backend.Status
     property var report: Backend.Report
-
+    property var sample: Backend.Sample
+    property var status: Backend.Status
+    property var plotting: Backend.Plotting
 }
 
 

src_qt6/EasyReflectometryApp/Backends/Py/__init__.py

@@ -1,3 +1,3 @@
 from .py_backend import PyBackend
 
-__all__ = ['PyBackend']
+__all__ = [PyBackend]

src_qt6/EasyReflectometryApp/Backends/Py/analysis.py

@@ -0,0 +1,23 @@
+from PySide6.QtCore import QObject
+from PySide6.QtCore import Signal
+from PySide6.QtCore import Slot
+from PySide6.QtCore import Property
+
+from easyreflectometry import Project as ProjectLib
+#from .logic.Analysis import Analysis as AnalysisLogic
+
+
+class Analysis(QObject):
+    fitFinishedChanged = Signal()
+
+
+    def __init__(self, project_lib: ProjectLib, parent=None):
+        super().__init__(parent)
+#        self._logic = AnalysisLogic(project_lib)
+
+    # Setters and getters
+
+    @Property(bool, notify=fitFinishedChanged)
+    def isFitFinished(self) -> bool:
+        return True
+