easyscience · rozyczko · Mar 28, 2023 · Nov 11, 2022 · Nov 15, 2022 · Nov 15, 2022
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -55,6 +55,12 @@ jobs:
           python -m pip install toml
           python utils.py --update
 
+      - name: Compile and install pyobjc on macos-11
+        if: runner.os == 'macOS'
+        run: |
+          python -m pip install pyobjc-core --no-binary :all:
+          python -m pip install pyobjc-framework-Cocoa --no-binary :all:
+
       # https://docs.github.com/en/actions/reference/environment-variables
       - name: Declare env variables on push and pull_request
         shell: bash
@@ -116,8 +122,13 @@ jobs:
         run: python ${{ env.SCRIPTS_PATH }}/InstallApp.py
 
       - name: Run app in testmode, record screen and quit
+        if: runner.os != 'Windows'
         run: python ${{ env.SCRIPTS_PATH }}/RunApp.py --testmode
 
+      - name: Create bogus tutorial file on Windows
+        if: runner.os == 'Windows'
+        run: echo "Not working currently" > tutorial.mp4
+
       - name: Rename test videos
         run: >
           python ${{ env.SCRIPTS_PATH }}/RenameTestVideos.py
@@ -169,4 +180,4 @@ jobs:
         run: >
           python ${{ env.SCRIPTS_PATH }}/UploadToFtp.py
           ${{ env.BRANCH_NAME }}
-          ${{ secrets.APP_REPO_FTP_PASSWORD }}
+          ${{ secrets.APP_REPO_FTP_PASSWORD }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,15 @@
+# Version 0.8.5-beta (28 Mar 2023)
+
+### Changes
+
+- GSASII calculation engine has been removed.
+- Overall application performance has been significantly improved.
+
+### Bug Fixes
+
+- Summary report export widget is now properly enabled for custom projects.
+- Undo/redo functionality has been fixed.
+
 # Version 0.8.4-beta (28 Jul 2022)
 
 ### New Features

diff --git a/RELEASE.md b/RELEASE.md
@@ -0,0 +1,9 @@
+### Changes
+
+- GSASII calculation engine has been removed.
+- Overall application performance has been significantly improved.
+
+### Bug Fixes
+
+- Summary report export widget is now properly enabled for custom projects.
+- Undo/redo functionality has been fixed.
diff --git a/easyDiffractionApp/Gui/Components/AnalysisConstraints.qml b/easyDiffractionApp/Gui/Components/AnalysisConstraints.qml
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2022 easyDiffraction contributors <support@easydiffraction.org>
+// SPDX-FileCopyrightText: 2023 easyDiffraction contributors <support@easydiffraction.org>
 // SPDX-License-Identifier: BSD-3-Clause
 // © 2021-2022 Contributors to the easyDiffraction project <https://github.com/easyScience/easyDiffractionApp>
 
@@ -29,7 +29,7 @@ EaComponents.TableView  {
         //xml: ExGlobals.Constants.proxy.constraintsListAsXml
         xml: ExGlobals.Constants.proxy.fitting.constraintsAsXml
 
-        query: "/root/item"
+        query: "/data/data"
 
         XmlRole { name: "number"; query: "number/number()" }
         XmlRole { name: "dependentName"; query: "dependentName/string()" }

diff --git a/easyDiffractionApp/Gui/Components/AnalysisDataChartBokeh.qml b/easyDiffractionApp/Gui/Components/AnalysisDataChartBokeh.qml
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2022 easyDiffraction contributors <support@easydiffraction.org>
+// SPDX-FileCopyrightText: 2023 easyDiffraction contributors <support@easydiffraction.org>
 // SPDX-License-Identifier: BSD-3-Clause
 // © 2021-2022 Contributors to the easyDiffraction project <https://github.com/easyScience/easyDiffractionApp>
 

diff --git a/easyDiffractionApp/Gui/Components/AnalysisDataChartQtCharts.qml b/easyDiffractionApp/Gui/Components/AnalysisDataChartQtCharts.qml
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2022 easyDiffraction contributors <support@easydiffraction.org>
+// SPDX-FileCopyrightText: 2023 easyDiffraction contributors <support@easydiffraction.org>
 // SPDX-License-Identifier: BSD-3-Clause
 // © 2021-2022 Contributors to the easyDiffraction project <https://github.com/easyScience/easyDiffractionApp>
 

diff --git a/easyDiffractionApp/Gui/Components/AnalysisFitables.qml b/easyDiffractionApp/Gui/Components/AnalysisFitables.qml
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2022 easyDiffraction contributors <support@easydiffraction.org>
+// SPDX-FileCopyrightText: 2023 easyDiffraction contributors <support@easydiffraction.org>
 // SPDX-License-Identifier: BSD-3-Clause
 // © 2021-2022 Contributors to the easyDiffraction project <https://github.com/easyScience/easyDiffractionApp>
 
@@ -27,7 +27,7 @@ EaComponents.TableView {
         //xml: ExGlobals.Constants.proxy.fitablesListAsXml
         xml: ExGlobals.Constants.proxy.parameters.parametersAsXml
 
-        query: "/root/item"
+        query: "/data/item"
 
         XmlRole { name: "id"; query: "id/string()" }
         XmlRole { name: "number"; query: "number/number()" }

diff --git a/easyDiffractionApp/Gui/Components/ApplicationWindow.qml b/easyDiffractionApp/Gui/Components/ApplicationWindow.qml
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2022 easyDiffraction contributors <support@easydiffraction.org>
+// SPDX-FileCopyrightText: 2023 easyDiffraction contributors <support@easydiffraction.org>
 // SPDX-License-Identifier: BSD-3-Clause
 // © 2021-2022 Contributors to the easyDiffraction project <https://github.com/easyScience/easyDiffractionApp>
 
@@ -156,7 +156,10 @@ EaComponents.ApplicationWindow {
             fontIcon: "clipboard-list"
             text: qsTr("Summary")
             ToolTip.text: qsTr("Summary of the work done")
-            Component.onCompleted: ExGlobals.Variables.summaryTabButton = summaryTabButton
+            onClicked: {
+                ExGlobals.Constants.proxy.project.requestReport()
+            }
+            Component.onCompleted: ExGlobals.Variables.summaryTabButton = this
         }
 
     ]
@@ -355,7 +358,7 @@ EaComponents.ApplicationWindow {
 
         model: XmlListModel {
             xml: ExGlobals.Constants.proxy.project.statusModelAsXml
-            query: "/root/item"
+            query: "/data"
 
             XmlRole { name: "label"; query: "label/string()" }
             XmlRole { name: "value"; query: "value/string()" }

diff --git a/easyDiffractionApp/Gui/Components/CloseDialog.qml b/easyDiffractionApp/Gui/Components/CloseDialog.qml
@@ -3,7 +3,7 @@ import QtQuick.Controls 2.14
 
 import easyApp.Gui.Elements 1.0 as EaElements
 
-// SPDX-FileCopyrightText: 2022 easyDiffraction contributors <support@easydiffraction.org>
+// SPDX-FileCopyrightText: 2023 easyDiffraction contributors <support@easydiffraction.org>
 // SPDX-License-Identifier: BSD-3-Clause
 // © 2021-2022 Contributors to the easyDiffraction project <https://github.com/easyScience/easyDiffractionApp>
 

diff --git a/easyDiffractionApp/Gui/Components/ExperimentAssociatedPhases.qml b/easyDiffractionApp/Gui/Components/ExperimentAssociatedPhases.qml
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2022 easyDiffraction contributors <support@easydiffraction.org>
+// SPDX-FileCopyrightText: 2023 easyDiffraction contributors <support@easydiffraction.org>
 // SPDX-License-Identifier: BSD-3-Clause
 // © 2021-2022 Contributors to the easyDiffraction project <https://github.com/easyScience/easyDiffractionApp>
 
@@ -23,11 +23,11 @@ EaComponents.TableView {
 
     model: XmlListModel {
         xml: ExGlobals.Constants.proxy.phase.phasesAsXml
-        query: "/root/item"
+        query: "/data/item"
 
         XmlRole { name: "label"; query: "name/string()" }
         XmlRole { name: "scale"; query: "scale/value/number()" }
-        XmlRole { name: "scaleId"; query: "scale/key[4]/string()" }
+        XmlRole { name: "scaleId"; query: "scale/__id/string()" }
 
     }
 

diff --git a/easyDiffractionApp/Gui/Components/ExperimentBackground.qml b/easyDiffractionApp/Gui/Components/ExperimentBackground.qml
@@ -18,15 +18,14 @@ EaComponents.TableView {
 
     model: XmlListModel {
         xml: ExGlobals.Constants.proxy.backgroundProxy.asXml
-        query: "/root/item"
+        query: "/data/data"
 
         XmlRole { name: "x"; query: "x/value/number()" }
         XmlRole { name: "y"; query: "y/value/number()" }
 
         XmlRole { name: "pointName"; query: "name/string()" }
-
-        XmlRole { name: "xId"; query: "x/key[4]/string()" }
-        XmlRole { name: "yId"; query: "y/key[4]/string()" }
+        XmlRole { name: "xId"; query: "x/__id/string()" }
+        XmlRole { name: "yId"; query: "y/__id/string()" }
     }
 
     // Table rows

diff --git a/easyDiffractionApp/Gui/Components/ExperimentDataChartBokeh.qml b/easyDiffractionApp/Gui/Components/ExperimentDataChartBokeh.qml
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2022 easyDiffraction contributors <support@easydiffraction.org>
+// SPDX-FileCopyrightText: 2023 easyDiffraction contributors <support@easydiffraction.org>
 // SPDX-License-Identifier: BSD-3-Clause
 // © 2021-2022 Contributors to the easyDiffraction project <https://github.com/easyScience/easyDiffractionApp>
 

diff --git a/easyDiffractionApp/Gui/Components/ExperimentDataChartQtCharts.qml b/easyDiffractionApp/Gui/Components/ExperimentDataChartQtCharts.qml
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2022 easyDiffraction contributors <support@easydiffraction.org>
+// SPDX-FileCopyrightText: 2023 easyDiffraction contributors <support@easydiffraction.org>
 // SPDX-License-Identifier: BSD-3-Clause
 // © 2021-2022 Contributors to the easyDiffraction project <https://github.com/easyScience/easyDiffractionApp>
 

diff --git a/easyDiffractionApp/Gui/Components/ExperimentDataExplorer.qml b/easyDiffractionApp/Gui/Components/ExperimentDataExplorer.qml
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2022 easyDiffraction contributors <support@easydiffraction.org>
+// SPDX-FileCopyrightText: 2023 easyDiffraction contributors <support@easydiffraction.org>
 // SPDX-License-Identifier: BSD-3-Clause
 // © 2021-2022 Contributors to the easyDiffraction project <https://github.com/easyScience/easyDiffractionApp>
 
@@ -23,7 +23,7 @@ EaComponents.TableView {
 
     model: XmlListModel {
         xml: ExGlobals.Constants.proxy.experiment.experimentDataAsXml
-        query: "/root/item"
+        query: "/data"
 
         XmlRole { name: "label"; query: "name/string()" }
     }

diff --git a/easyDiffractionApp/Gui/Components/ExperimentPeakProfileG.qml b/easyDiffractionApp/Gui/Components/ExperimentPeakProfileG.qml
@@ -19,15 +19,16 @@ EaComponents.TableView {
 
     model: XmlListModel {
         xml: ExGlobals.Constants.proxy.instrumentParametersAsXml
-        query: `/root/item`
+        query: `/data/data`
+
 
         XmlRole { name: "u"; query: "resolution_u/value/number()" }
         XmlRole { name: "v"; query: "resolution_v/value/number()" }
         XmlRole { name: "w"; query: "resolution_w/value/number()" }
 
-        XmlRole { name: "uId"; query: "resolution_u/key[4]/string()" }
-        XmlRole { name: "vId"; query: "v_resolution/key[4]/string()" }
-        XmlRole { name: "wId"; query: "resolution_w/key[4]/string()" }
+        XmlRole { name: "uId"; query: "resolution_u/__id/string()" }
+        XmlRole { name: "vId"; query: "v_resolution/__id/string()" }
+        XmlRole { name: "wId"; query: "resolution_w/__id/string()" }
     }
 
     // Table rows

diff --git a/easyDiffractionApp/Gui/Components/ExperimentPeakProfileL.qml b/easyDiffractionApp/Gui/Components/ExperimentPeakProfileL.qml
@@ -19,13 +19,13 @@ EaComponents.TableView {
 
     model: XmlListModel {
         xml: ExGlobals.Constants.proxy.instrumentParametersAsXml
-        query: `/root/item`
+        query: `/data/data`
 
         XmlRole { name: "x"; query: "resolution_x/value/number()" }
         XmlRole { name: "y"; query: "resolution_y/value/number()" }
 
-        XmlRole { name: "xId"; query: "resolution_x/key[4]/string()" }
-        XmlRole { name: "yId"; query: "resolution_y/key[4]/string()" }
+        XmlRole { name: "xId"; query: "resolution_x/__id/string()" }
+        XmlRole { name: "yId"; query: "resolution_y/__id/string()" }
     }
 
     // Table rows

diff --git a/easyDiffractionApp/Gui/Components/ProjectExamples.qml b/easyDiffractionApp/Gui/Components/ProjectExamples.qml
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2022 easyDiffraction contributors <support@easydiffraction.org>
+// SPDX-FileCopyrightText: 2023 easyDiffraction contributors <support@easydiffraction.org>
 // SPDX-License-Identifier: BSD-3-Clause
 // © 2021-2022 Contributors to the easyDiffraction project <https://github.com/easyScience/easyDiffractionApp>
 
@@ -24,7 +24,7 @@ EaComponents.TableView {
 
     model: XmlListModel {
         xml: ExGlobals.Constants.proxy.project.projectExamplesAsXml
-        query: "/root/item"
+        query: "/data/item"
 
         XmlRole { name: "name"; query: "name/string()" }
         XmlRole { name: "description"; query: "description/string()" }

diff --git a/easyDiffractionApp/Gui/Components/ResultsDialog.qml b/easyDiffractionApp/Gui/Components/ResultsDialog.qml
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2022 easyDiffraction contributors <support@easydiffraction.org>
+// SPDX-FileCopyrightText: 2023 easyDiffraction contributors <support@easydiffraction.org>
 // SPDX-License-Identifier: BSD-3-Clause
 // © 2021-2022 Contributors to the easyDiffraction project <https://github.com/easyScience/easyDiffractionApp>
 

diff --git a/easyDiffractionApp/Gui/Components/SampleAdps.qml b/easyDiffractionApp/Gui/Components/SampleAdps.qml
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2022 easyDiffraction contributors <support@easydiffraction.org>
+// SPDX-FileCopyrightText: 2023 easyDiffraction contributors <support@easydiffraction.org>
 // SPDX-License-Identifier: BSD-3-Clause
 // © 2021-2022 Contributors to the easyDiffraction project <https://github.com/easyScience/easyDiffractionApp>
 
@@ -33,7 +33,7 @@ EaComponents.TableView {
         property int phaseIndex: ExGlobals.Constants.proxy.phase.currentPhaseIndex + 1
 
         xml: ExGlobals.Constants.proxy.phase.phasesAsXml
-        query: `/root/item[${phaseIndex}]/atoms/data/item`
+        query: `/data/item/atoms/data`
 
         XmlRole { name: "label"; query: "label/value/string()" }
         XmlRole { name: "adpType"; query: "adp/adp_type/value/string()" }
@@ -45,13 +45,13 @@ EaComponents.TableView {
         XmlRole { name: "adpAni13"; query: "adp_ani_13/number()" }
         XmlRole { name: "adpAni23"; query: "adp_ani_23/number()" }
 
-        XmlRole { name: "adpIsoId"; query: "adp/adp_class/Uiso/key[4]/string()" }
-        XmlRole { name: "adpAni11Id"; query: "adp_ani_11/key[4]/string()" }
-        XmlRole { name: "adpAni22Id"; query: "adp_ani_22/key[4]/string()" }
-        XmlRole { name: "adpAni33Id"; query: "adp_ani_33/key[4]/string()" }
-        XmlRole { name: "adpAni12Id"; query: "adp_ani_12/key[4]/string()" }
-        XmlRole { name: "adpAni13Id"; query: "adp_ani_13/key[4]/string()" }
-        XmlRole { name: "adpAni23Id"; query: "adp_ani_23/key[4]/string()" }
+        XmlRole { name: "adpIsoId"; query: "adp/adp_class/Uiso/__id/string()" }
+        XmlRole { name: "adpAni11Id"; query: "adp_ani_11/__id/string()" }
+        XmlRole { name: "adpAni22Id"; query: "adp_ani_22/__id/string()" }
+        XmlRole { name: "adpAni33Id"; query: "adp_ani_33/__id/string()" }
+        XmlRole { name: "adpAni12Id"; query: "adp_ani_12/__id/string()" }
+        XmlRole { name: "adpAni13Id"; query: "adp_ani_13/__id/string()" }
+        XmlRole { name: "adpAni23Id"; query: "adp_ani_23/__id/string()" }
     }
 
     // Table rows

diff --git a/easyDiffractionApp/Gui/Components/SampleAtoms.qml b/easyDiffractionApp/Gui/Components/SampleAtoms.qml
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2022 easyDiffraction contributors <support@easydiffraction.org>
+// SPDX-FileCopyrightText: 2023 easyDiffraction contributors <support@easydiffraction.org>
 // SPDX-License-Identifier: BSD-3-Clause
 // © 2021-2022 Contributors to the easyDiffraction project <https://github.com/easyScience/easyDiffractionApp>
 
@@ -17,7 +17,7 @@ import Gui.Globals 1.0 as ExGlobals
 EaComponents.TableView { 
     property bool enableDelButton:
         typeof ExGlobals.Constants.proxy.phase.phasesAsObj[ExGlobals.Constants.proxy.phase.currentPhaseIndex] !== 'undefined'
-        && ExGlobals.Constants.proxy.phase.phasesAsObj[ExGlobals.Constants.proxy.phase.currentPhaseIndex].atoms.data.length > 1
+        && ExGlobals.Constants.proxy.phase.phasesAsObj[ExGlobals.Constants.proxy.phase.currentPhaseIndex]['atoms'].length > 1
         ? true
         : false
 
@@ -27,7 +27,7 @@ EaComponents.TableView {
         property int phaseIndex: ExGlobals.Constants.proxy.phase.currentPhaseIndex + 1
 
         xml: ExGlobals.Constants.proxy.phase.phasesAsXml
-        query: `/root/item[${phaseIndex}]/atoms/data/item`
+        query: `/data/item/atoms/data`
 
         XmlRole { name: "label"; query: "label/value/string()" }
         XmlRole { name: "type"; query: "specie/value/string()" }
@@ -36,12 +36,12 @@ EaComponents.TableView {
         XmlRole { name: "z"; query: "fract_z/value/number()" }
         XmlRole { name: "occupancy"; query: "occupancy/value/number()" }
 
-        XmlRole { name: "labelId"; query: "label/key[4]/string()" }
-        XmlRole { name: "typeId"; query: "specie/key[4]/string()" }
-        XmlRole { name: "xId"; query: "fract_x/key[4]/string()" }
-        XmlRole { name: "yId"; query: "fract_y/key[4]/string()" }
-        XmlRole { name: "zId"; query: "fract_z/key[4]/string()" }
-        XmlRole { name: "occupancyId"; query: "occupancy/key[4]/string()" }
+        XmlRole { name: "labelId"; query: "label/__id/string()" }
+        XmlRole { name: "typeId"; query: "specie__id/string()" }
+        XmlRole { name: "xId"; query: "fract_x/__id/string()" }
+        XmlRole { name: "yId"; query: "fract_y/__id/string()" }
+        XmlRole { name: "zId"; query: "fract_z/__id/string()" }
+        XmlRole { name: "occupancyId"; query: "occupancy/__id/string()" }
     }
 
     // Table rows

diff --git a/easyDiffractionApp/Gui/Components/SampleCell.qml b/easyDiffractionApp/Gui/Components/SampleCell.qml
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2022 easyDiffraction contributors <support@easydiffraction.org>
+// SPDX-FileCopyrightText: 2023 easyDiffraction contributors <support@easydiffraction.org>
 // SPDX-License-Identifier: BSD-3-Clause
 // © 2021-2022 Contributors to the easyDiffraction project <https://github.com/easyScience/easyDiffractionApp>
 
@@ -22,28 +22,28 @@ EaComponents.TableView {
         property int phaseIndex: ExGlobals.Constants.proxy.phase.currentPhaseIndex + 1
 
         xml: ExGlobals.Constants.proxy.phase.phasesAsXml
-        query: `/root/item[${phaseIndex}]`
-
-        XmlRole { name: "a"; query: "cell/length_a/value/number()" }
-        XmlRole { name: "b"; query: "cell/length_b/value/number()" }
-        XmlRole { name: "c"; query: "cell/length_c/value/number()" }
-        XmlRole { name: "alpha"; query: "cell/angle_alpha/value/number()" }
-        XmlRole { name: "beta"; query: "cell/angle_beta/value/number()" }
-        XmlRole { name: "gamma"; query: "cell/angle_gamma/value/number()" }
-
-        XmlRole { name: "a_enabled"; query: "cell/length_a/enabled/string()"}
-        XmlRole { name: "b_enabled"; query: "cell/length_b/enabled/string()"}
-        XmlRole { name: "c_enabled"; query: "cell/length_c/enabled/string()"}
-        XmlRole { name: "alpha_enabled"; query: "cell/angle_alpha/enabled/string()" }
-        XmlRole { name: "beta_enabled"; query: "cell/angle_beta/enabled/string()"}
-        XmlRole { name: "gamma_enabled"; query: "cell/angle_gamma/enabled/string()"}
-
-        XmlRole { name: "aId"; query: "cell/length_a/key[4]/string()" }
-        XmlRole { name: "bId"; query: "cell/length_b/key[4]/string()" }
-        XmlRole { name: "cId"; query: "cell/length_c/key[4]/string()" }
-        XmlRole { name: "alphaId"; query: "cell/angle_alpha/key[4]/string()" }
-        XmlRole { name: "betaId"; query: "cell/angle_beta/key[4]/string()" }
-        XmlRole { name: "gammaId"; query: "cell/angle_gamma/key[4]/string()" }
+        query: `/data/item/cell`
+
+        XmlRole { name: "a"; query: "length_a/value/number()" }
+        XmlRole { name: "b"; query: "length_b/value/number()" }
+        XmlRole { name: "c"; query: "length_c/value/number()" }
+        XmlRole { name: "alpha"; query: "angle_alpha/value/number()" }
+        XmlRole { name: "beta"; query: "angle_beta/value/number()" }
+        XmlRole { name: "gamma"; query: "angle_gamma/value/number()" }
+
+        XmlRole { name: "a_enabled"; query: "length_a/enabled/string()"}
+        XmlRole { name: "b_enabled"; query: "length_b/enabled/string()"}
+        XmlRole { name: "c_enabled"; query: "length_c/enabled/string()"}
+        XmlRole { name: "alpha_enabled"; query: "angle_alpha/enabled/string()" }
+        XmlRole { name: "beta_enabled"; query: "angle_beta/enabled/string()"}
+        XmlRole { name: "gamma_enabled"; query: "angle_gamma/enabled/string()"}
+
+        XmlRole { name: "aId"; query: "length_a/__id/string()" }
+        XmlRole { name: "bId"; query: "length_b/__id/string()" }
+        XmlRole { name: "cId"; query: "length_c/__id/string()" }
+        XmlRole { name: "alphaId"; query: "angle_alpha/__id/string()" }
+        XmlRole { name: "betaId"; query: "angle_beta/__id/string()" }
+        XmlRole { name: "gammaId"; query: "angle_gamma/__id/string()" }
     }
 
     // Table rows