Initial attempt to load any dataset from file

EasyScience · May 3, 2024 · 6ec4e16 · 6ec4e16
1 parent c648dc3
commit 6ec4e16
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 10 deletions.
diff --git a/EasyTextureApp/Gui/Charts/Plotly1D.qml b/EasyTextureApp/Gui/Charts/Plotly1D.qml
@@ -2,8 +2,10 @@ import QtQuick
 import QtQuick.Controls
 import QtWebEngine
 
+import EasyApp.Gui.Logic as EaLogic
 import EasyApp.Gui.Style as EaStyle
 
+import Gui.Globals as Globals
 
 WebEngineView {
     id: chartView
@@ -23,6 +25,8 @@ WebEngineView {
 
     property bool useWebGL: false
 
+    property string currentRawFile: Globals.Proxies.main.rawData.currentRawFile
+
     width: parent.width
     height: parent.height
 
@@ -32,18 +36,18 @@ WebEngineView {
 
     onLoadSucceededStatusChanged: {
         if (loadSucceededStatus) {
-            toggleUseWebGL()
+            //toggleUseWebGL()
 
-            setChartSizes()
-            setChartColors()
+            //setChartSizes()
+            //setChartColors()
 
-            setXAxisTitle()
-            setYAxisTitle()
+            //setXAxisTitle()
+            //setYAxisTitle()
 
-            emptyData()
-            setXData()
-            setMeasuredYData()
-            setCalculatedYData()
+            //emptyData()
+            //setXData()
+            //setMeasuredYData()
+            //setCalculatedYData()
 
             visible = true
         }
@@ -104,6 +108,13 @@ WebEngineView {
         }
     }
 
+    onCurrentRawFileChanged: {
+        if (loadSucceededStatus) {
+            setData()
+            redrawPlot()
+        }
+    }
+
     // Logic
 
     function setChartSizes() {
@@ -167,7 +178,7 @@ WebEngineView {
     }
 
     function setXData() {
-        //print(`setXData is started: ${xData.length} points`)
+        print(`setXData is started: ${xData.length} points`)
         runJavaScript(`setXData(${JSON.stringify(xData)})`,
                       function(result) { print(result) })
     }
@@ -181,4 +192,18 @@ WebEngineView {
         runJavaScript(`setCalculatedYData(${JSON.stringify(calculatedYData)})`)
     }
 
+    function setData() {
+        const path = EaLogic.Utils.urlToLocalFile(currentRawFile)
+        print(`setData started: ${path}`)
+        runJavaScript(`setData(${JSON.stringify(path)})`,
+                      function(result) { print(result) })
+    }
+
+    function setData_() {
+        print(`setData started: ${currentRawFile}`)
+        runJavaScript('qwe()',
+                      function(result) { print(result) })
+    }
+
+
 }
diff --git a/EasyTextureApp/Gui/Components/Pages/RawData/SideBarBasic/MeasurementsExplorerGroup.qml b/EasyTextureApp/Gui/Components/Pages/RawData/SideBarBasic/MeasurementsExplorerGroup.qml
@@ -131,6 +131,7 @@ Column {
                 "name": getFilename(selectedFile.toString()),
                 "fullpath": selectedFile.toString()
             })
+            Globals.Proxies.main.rawData.currentRawFile = selectedFile.toString()
             Globals.Proxies.main.rawData.isCreated = true //trigger refresh
             //Globals.Proxies.main.rawData.loadData()
         }

diff --git a/EasyTextureApp/Gui/Globals/Proxies.qml b/EasyTextureApp/Gui/Globals/Proxies.qml
@@ -162,6 +162,7 @@ QtObject { // If "Unknown component. (M300) in QtCreator", try: "Tools > QML/JS
             property bool is3DtabSelected: true
 
             property var rawFiles: []
+            property string currentRawFile: ''
             property real twoTheta: 45.5
             property real thetaRingsMinTT: 50.1
 

diff --git a/EasyTextureApp/Gui/Html/RawDataView/Plotly1dRaw.html b/EasyTextureApp/Gui/Html/RawDataView/Plotly1dRaw.html
@@ -223,6 +223,28 @@
     /////////////////////////////////////////
     // Functionality to be accesable from QML
     /////////////////////////////////////////
+
+    function setData(path) {
+        // NEED refactoring the whoal javascript section to have
+        // simple functions for loading data, updating datasets
+
+        let request = new XMLHttpRequest()
+        request.open("GET", path, false)
+        request.send(null)
+        data1D = JSON.parse(request1D.responseText)
+
+        twoTheta1D = Object.values(data1D["two_theta [deg]"])
+        gamma1D = Object.values(data1D["user gamma [deg]"])
+        projCount1D = Object.values(data1D["proj_count"])
+
+        // ... updating datasets ...
+
+        Plotly.redraw('plotDiv')
+
+        return(`setData finished: ${path}`)
+    }
+
+
 /*
     // need to be called before setChartColors to init axis.titlefont
     function setChartSizes(sizes) {