From f98af630366c0b5c4f5f019b16273976319f85de Mon Sep 17 00:00:00 2001 From: dominiquef Date: Thu, 11 Sep 2025 08:30:51 -0700 Subject: [PATCH] Change in uijson for alphabetic ordering --- .../uijson/fdem1d_forward.ui.json | 8 +-- .../uijson/fdem1d_inversion.ui.json | 16 ++--- .../uijson/fdem_forward.ui.json | 8 +-- .../uijson/fdem_inversion.ui.json | 16 ++--- .../uijson/magnetic_scalar_forward.ui.json | 20 +++--- .../uijson/magnetic_scalar_inversion.ui.json | 20 +++--- .../uijson/magnetic_vector_forward.ui.json | 20 +++--- .../uijson/magnetic_vector_inversion.ui.json | 20 +++--- .../uijson/magnetotellurics_forward.ui.json | 24 +++---- .../uijson/magnetotellurics_inversion.ui.json | 64 +++++++++---------- .../uijson/tipper_forward.ui.json | 16 ++--- .../uijson/tipper_inversion.ui.json | 32 +++++----- 12 files changed, 132 insertions(+), 132 deletions(-) diff --git a/simpeg_drivers-assets/uijson/fdem1d_forward.ui.json b/simpeg_drivers-assets/uijson/fdem1d_forward.ui.json index f2ed24b2f..edcd545c3 100644 --- a/simpeg_drivers-assets/uijson/fdem1d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/fdem1d_forward.ui.json @@ -19,16 +19,16 @@ ], "value": "" }, - "z_real_channel_bool": { + "z_imag_channel_bool": { "group": "Survey", "main": true, - "label": "Z real component", + "label": "Z imag component", "value": true }, - "z_imag_channel_bool": { + "z_real_channel_bool": { "group": "Survey", "main": true, - "label": "Z imag component", + "label": "Z real component", "value": true }, "u_cell_size": { diff --git a/simpeg_drivers-assets/uijson/fdem1d_inversion.ui.json b/simpeg_drivers-assets/uijson/fdem1d_inversion.ui.json index 2a59ebe71..729ebe7b4 100644 --- a/simpeg_drivers-assets/uijson/fdem1d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/fdem1d_inversion.ui.json @@ -19,7 +19,7 @@ ], "value": "" }, - "z_real_channel": { + "z_imag_channel": { "association": [ "Cell", "Vertex" @@ -28,13 +28,13 @@ "group": "Data", "dataGroupType": "Multi-element", "main": true, - "label": "z-real component (ppm)", + "label": "z-imag component (ppm)", "parent": "data_object", "optional": true, "enabled": true, "value": "" }, - "z_real_uncertainty": { + "z_imag_uncertainty": { "association": [ "Cell", "Vertex" @@ -45,11 +45,11 @@ "main": true, "label": "Uncertainty (ppm)", "parent": "data_object", - "dependency": "z_real_channel", + "dependency": "z_imag_channel", "dependencyType": "enabled", "value": "" }, - "z_imag_channel": { + "z_real_channel": { "association": [ "Cell", "Vertex" @@ -58,13 +58,13 @@ "group": "Data", "dataGroupType": "Multi-element", "main": true, - "label": "z-imag component (ppm)", + "label": "z-real component (ppm)", "parent": "data_object", "optional": true, "enabled": true, "value": "" }, - "z_imag_uncertainty": { + "z_real_uncertainty": { "association": [ "Cell", "Vertex" @@ -75,7 +75,7 @@ "main": true, "label": "Uncertainty (ppm)", "parent": "data_object", - "dependency": "z_imag_channel", + "dependency": "z_real_channel", "dependencyType": "enabled", "value": "" }, diff --git a/simpeg_drivers-assets/uijson/fdem_forward.ui.json b/simpeg_drivers-assets/uijson/fdem_forward.ui.json index c7e919905..c4a4edee0 100644 --- a/simpeg_drivers-assets/uijson/fdem_forward.ui.json +++ b/simpeg_drivers-assets/uijson/fdem_forward.ui.json @@ -19,16 +19,16 @@ ], "value": "" }, - "z_real_channel_bool": { + "z_imag_channel_bool": { "group": "Survey", "main": true, - "label": "Z real component", + "label": "Z imag component", "value": true }, - "z_imag_channel_bool": { + "z_real_channel_bool": { "group": "Survey", "main": true, - "label": "Z imag component", + "label": "Z real component", "value": true }, "mesh": { diff --git a/simpeg_drivers-assets/uijson/fdem_inversion.ui.json b/simpeg_drivers-assets/uijson/fdem_inversion.ui.json index 643f492a5..38ea9a101 100644 --- a/simpeg_drivers-assets/uijson/fdem_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/fdem_inversion.ui.json @@ -19,7 +19,7 @@ ], "value": "" }, - "z_real_channel": { + "z_imag_channel": { "association": [ "Cell", "Vertex" @@ -28,13 +28,13 @@ "group": "Data", "dataGroupType": "Multi-element", "main": true, - "label": "z-real component", + "label": "z-imag component", "parent": "data_object", "optional": true, "enabled": true, "value": "" }, - "z_real_uncertainty": { + "z_imag_uncertainty": { "association": [ "Cell", "Vertex" @@ -45,11 +45,11 @@ "main": true, "label": "Uncertainty", "parent": "data_object", - "dependency": "z_real_channel", + "dependency": "z_imag_channel", "dependencyType": "enabled", "value": "" }, - "z_imag_channel": { + "z_real_channel": { "association": [ "Cell", "Vertex" @@ -58,13 +58,13 @@ "group": "Data", "dataGroupType": "Multi-element", "main": true, - "label": "z-imag component", + "label": "z-real component", "parent": "data_object", "optional": true, "enabled": true, "value": "" }, - "z_imag_uncertainty": { + "z_real_uncertainty": { "association": [ "Cell", "Vertex" @@ -75,7 +75,7 @@ "main": true, "label": "Uncertainty", "parent": "data_object", - "dependency": "z_imag_channel", + "dependency": "z_real_channel", "dependencyType": "enabled", "value": "" }, diff --git a/simpeg_drivers-assets/uijson/magnetic_scalar_forward.ui.json b/simpeg_drivers-assets/uijson/magnetic_scalar_forward.ui.json index c6c63895e..b0e5f2618 100644 --- a/simpeg_drivers-assets/uijson/magnetic_scalar_forward.ui.json +++ b/simpeg_drivers-assets/uijson/magnetic_scalar_forward.ui.json @@ -10,15 +10,15 @@ "inversion_type": "magnetic scalar", "physical_property": "susceptibility", "forward_only": true, - "inducing_field_strength": { - "min": 0.0, - "max": 100000.0, + "inducing_field_declination": { + "min": -180.0, + "max": 180.0, "precision": 2, "lineEdit": false, "main": true, "group": "Inducing field", - "label": "Strength (nT)", - "value": 50000.0 + "label": "Declination (deg)", + "value": 0.0 }, "inducing_field_inclination": { "min": -90.0, @@ -30,15 +30,15 @@ "label": "Inclination (deg)", "value": 90.0 }, - "inducing_field_declination": { - "min": -180.0, - "max": 180.0, + "inducing_field_strength": { + "min": 0.0, + "max": 100000.0, "precision": 2, "lineEdit": false, "main": true, "group": "Inducing field", - "label": "Declination (deg)", - "value": 0.0 + "label": "Strength (nT)", + "value": 50000.0 }, "topography_object": { "main": true, diff --git a/simpeg_drivers-assets/uijson/magnetic_scalar_inversion.ui.json b/simpeg_drivers-assets/uijson/magnetic_scalar_inversion.ui.json index 91415cf07..560988560 100644 --- a/simpeg_drivers-assets/uijson/magnetic_scalar_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/magnetic_scalar_inversion.ui.json @@ -10,15 +10,15 @@ "inversion_type": "magnetic scalar", "physical_property": "susceptibility", "forward_only": false, - "inducing_field_strength": { - "min": 0.0, - "max": 100000.0, + "inducing_field_declination": { + "min": -180.0, + "max": 180.0, "precision": 2, "lineEdit": false, "main": true, "group": "Inducing field", - "label": "Strength (nT)", - "value": 50000.0 + "label": "Declination (deg)", + "value": 0.0 }, "inducing_field_inclination": { "min": -90.0, @@ -30,15 +30,15 @@ "label": "Inclination (deg)", "value": 90.0 }, - "inducing_field_declination": { - "min": -180.0, - "max": 180.0, + "inducing_field_strength": { + "min": 0.0, + "max": 100000.0, "precision": 2, "lineEdit": false, "main": true, "group": "Inducing field", - "label": "Declination (deg)", - "value": 0.0 + "label": "Strength (nT)", + "value": 50000.0 }, "data_object": { "main": true, diff --git a/simpeg_drivers-assets/uijson/magnetic_vector_forward.ui.json b/simpeg_drivers-assets/uijson/magnetic_vector_forward.ui.json index 6f55a07f0..fe4f761e5 100644 --- a/simpeg_drivers-assets/uijson/magnetic_vector_forward.ui.json +++ b/simpeg_drivers-assets/uijson/magnetic_vector_forward.ui.json @@ -10,15 +10,15 @@ "inversion_type": "magnetic vector", "physical_property": "susceptibility", "forward_only": true, - "inducing_field_strength": { - "min": 0.1, - "max": 100000.0, + "inducing_field_declination": { + "min": -180.0, + "max": 180.0, "precision": 2, "lineEdit": false, "main": true, "group": "Inducing field", - "label": "Strength (nT)", - "value": 50000.0 + "label": "Declination (deg)", + "value": 0.0 }, "inducing_field_inclination": { "min": -90.0, @@ -30,15 +30,15 @@ "label": "Inclination (deg)", "value": 90.0 }, - "inducing_field_declination": { - "min": -180.0, - "max": 180.0, + "inducing_field_strength": { + "min": 0.0, + "max": 100000.0, "precision": 2, "lineEdit": false, "main": true, "group": "Inducing field", - "label": "Declination (deg)", - "value": 0.0 + "label": "Strength (nT)", + "value": 50000.0 }, "topography_object": { "main": true, diff --git a/simpeg_drivers-assets/uijson/magnetic_vector_inversion.ui.json b/simpeg_drivers-assets/uijson/magnetic_vector_inversion.ui.json index 17f40f1d8..b7d577ac6 100644 --- a/simpeg_drivers-assets/uijson/magnetic_vector_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/magnetic_vector_inversion.ui.json @@ -10,15 +10,15 @@ "inversion_type": "magnetic vector", "physical_property": "susceptibility", "forward_only": false, - "inducing_field_strength": { - "min": 0.1, - "max": 100000.0, + "inducing_field_declination": { + "min": -180.0, + "max": 180.0, "precision": 2, "lineEdit": false, "main": true, "group": "Inducing field", - "label": "Strength (nT)", - "value": 50000.0 + "label": "Declination (deg)", + "value": 0.0 }, "inducing_field_inclination": { "min": -90.0, @@ -30,15 +30,15 @@ "label": "Inclination (deg)", "value": 90.0 }, - "inducing_field_declination": { - "min": -180.0, - "max": 180.0, + "inducing_field_strength": { + "min": 0.0, + "max": 100000.0, "precision": 2, "lineEdit": false, "main": true, "group": "Inducing field", - "label": "Declination (deg)", - "value": 0.0 + "label": "Strength (nT)", + "value": 50000.0 }, "data_object": { "main": true, diff --git a/simpeg_drivers-assets/uijson/magnetotellurics_forward.ui.json b/simpeg_drivers-assets/uijson/magnetotellurics_forward.ui.json index c7ef76f36..e34d6bbc6 100644 --- a/simpeg_drivers-assets/uijson/magnetotellurics_forward.ui.json +++ b/simpeg_drivers-assets/uijson/magnetotellurics_forward.ui.json @@ -17,22 +17,16 @@ "meshType": "{b99bd6e5-4fe1-45a5-bd2f-75fc31f91b38}", "value": "" }, - "zxx_real_channel_bool": { - "group": "Survey", - "main": true, - "label": "Zxx real", - "value": true - }, "zxx_imag_channel_bool": { "group": "Survey", "main": true, "label": "Zxx imaginary", "value": true }, - "zxy_real_channel_bool": { + "zxx_real_channel_bool": { "group": "Survey", "main": true, - "label": "Zxy real", + "label": "Zxx real", "value": true }, "zxy_imag_channel_bool": { @@ -41,10 +35,10 @@ "label": "Zxy imaginary", "value": true }, - "zyx_real_channel_bool": { + "zxy_real_channel_bool": { "group": "Survey", "main": true, - "label": "Zyx real", + "label": "Zxy real", "value": true }, "zyx_imag_channel_bool": { @@ -53,10 +47,10 @@ "label": "Zyx imaginary", "value": true }, - "zyy_real_channel_bool": { + "zyx_real_channel_bool": { "group": "Survey", "main": true, - "label": "Zyy real", + "label": "Zyx real", "value": true }, "zyy_imag_channel_bool": { @@ -65,6 +59,12 @@ "label": "Zyy imaginary", "value": true }, + "zyy_real_channel_bool": { + "group": "Survey", + "main": true, + "label": "Zyy real", + "value": true + }, "mesh": { "group": "Mesh and models", "main": true, diff --git a/simpeg_drivers-assets/uijson/magnetotellurics_inversion.ui.json b/simpeg_drivers-assets/uijson/magnetotellurics_inversion.ui.json index 478b03e0a..c8c9d56f1 100644 --- a/simpeg_drivers-assets/uijson/magnetotellurics_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/magnetotellurics_inversion.ui.json @@ -17,7 +17,7 @@ "meshType": "{b99bd6e5-4fe1-45a5-bd2f-75fc31f91b38}", "value": "" }, - "zxx_real_channel": { + "zxx_imag_channel": { "association": [ "Cell", "Vertex" @@ -26,13 +26,13 @@ "group": "Data", "dataGroupType": "Multi-element", "main": true, - "label": "Zxx real", + "label": "Zxx imaginary", "parent": "data_object", "optional": true, "enabled": true, "value": "" }, - "zxx_real_uncertainty": { + "zxx_imag_uncertainty": { "association": [ "Cell", "Vertex" @@ -43,11 +43,11 @@ "main": true, "label": "Uncertainty", "parent": "data_object", - "dependency": "zxx_real_channel", + "dependency": "zxx_imag_channel", "dependencyType": "enabled", "value": "" }, - "zxx_imag_channel": { + "zxx_real_channel": { "association": [ "Cell", "Vertex" @@ -56,13 +56,13 @@ "group": "Data", "dataGroupType": "Multi-element", "main": true, - "label": "Zxx imaginary", + "label": "Zxx real", "parent": "data_object", "optional": true, "enabled": true, "value": "" }, - "zxx_imag_uncertainty": { + "zxx_real_uncertainty": { "association": [ "Cell", "Vertex" @@ -73,11 +73,11 @@ "main": true, "label": "Uncertainty", "parent": "data_object", - "dependency": "zxx_imag_channel", + "dependency": "zxx_real_channel", "dependencyType": "enabled", "value": "" }, - "zxy_real_channel": { + "zxy_imag_channel": { "association": [ "Cell", "Vertex" @@ -86,13 +86,13 @@ "group": "Data", "dataGroupType": "Multi-element", "main": true, - "label": "Zxy real", + "label": "Zxy imaginary", "parent": "data_object", "optional": true, "enabled": true, "value": "" }, - "zxy_real_uncertainty": { + "zxy_imag_uncertainty": { "association": [ "Cell", "Vertex" @@ -103,11 +103,11 @@ "main": true, "label": "Uncertainty", "parent": "data_object", - "dependency": "zxy_real_channel", + "dependency": "zxy_imag_channel", "dependencyType": "enabled", "value": "" }, - "zxy_imag_channel": { + "zxy_real_channel": { "association": [ "Cell", "Vertex" @@ -116,13 +116,13 @@ "group": "Data", "dataGroupType": "Multi-element", "main": true, - "label": "Zxy imaginary", + "label": "Zxy real", "parent": "data_object", "optional": true, "enabled": true, "value": "" }, - "zxy_imag_uncertainty": { + "zxy_real_uncertainty": { "association": [ "Cell", "Vertex" @@ -133,11 +133,11 @@ "main": true, "label": "Uncertainty", "parent": "data_object", - "dependency": "zxy_imag_channel", + "dependency": "zxy_real_channel", "dependencyType": "enabled", "value": "" }, - "zyx_real_channel": { + "zyx_imag_channel": { "association": [ "Cell", "Vertex" @@ -146,13 +146,13 @@ "group": "Data", "dataGroupType": "Multi-element", "main": true, - "label": "Zyx real", + "label": "Zyx imaginary", "parent": "data_object", "optional": true, "enabled": true, "value": "" }, - "zyx_real_uncertainty": { + "zyx_imag_uncertainty": { "association": [ "Cell", "Vertex" @@ -163,11 +163,11 @@ "main": true, "label": "Uncertainty", "parent": "data_object", - "dependency": "zyx_real_channel", + "dependency": "zyx_imag_channel", "dependencyType": "enabled", "value": "" }, - "zyx_imag_channel": { + "zyx_real_channel": { "association": [ "Cell", "Vertex" @@ -176,13 +176,13 @@ "group": "Data", "dataGroupType": "Multi-element", "main": true, - "label": "Zyx imaginary", + "label": "Zyx real", "parent": "data_object", "optional": true, "enabled": true, "value": "" }, - "zyx_imag_uncertainty": { + "zyx_real_uncertainty": { "association": [ "Cell", "Vertex" @@ -193,11 +193,11 @@ "main": true, "label": "Uncertainty", "parent": "data_object", - "dependency": "zyx_imag_channel", + "dependency": "zyx_real_channel", "dependencyType": "enabled", "value": "" }, - "zyy_real_channel": { + "zyy_imag_channel": { "association": [ "Cell", "Vertex" @@ -206,13 +206,13 @@ "group": "Data", "dataGroupType": "Multi-element", "main": true, - "label": "Zyy real", + "label": "Zyy imaginary", "parent": "data_object", "optional": true, "enabled": true, "value": "" }, - "zyy_real_uncertainty": { + "zyy_imag_uncertainty": { "association": [ "Cell", "Vertex" @@ -223,11 +223,11 @@ "main": true, "label": "Uncertainty", "parent": "data_object", - "dependency": "zyy_real_channel", + "dependency": "zyy_imag_channel", "dependencyType": "enabled", "value": "" }, - "zyy_imag_channel": { + "zyy_real_channel": { "association": [ "Cell", "Vertex" @@ -236,13 +236,13 @@ "group": "Data", "dataGroupType": "Multi-element", "main": true, - "label": "Zyy imaginary", + "label": "Zyy real", "parent": "data_object", "optional": true, "enabled": true, "value": "" }, - "zyy_imag_uncertainty": { + "zyy_real_uncertainty": { "association": [ "Cell", "Vertex" @@ -253,7 +253,7 @@ "main": true, "label": "Uncertainty", "parent": "data_object", - "dependency": "zyy_imag_channel", + "dependency": "zyy_real_channel", "dependencyType": "enabled", "value": "" }, diff --git a/simpeg_drivers-assets/uijson/tipper_forward.ui.json b/simpeg_drivers-assets/uijson/tipper_forward.ui.json index 825161d04..25036ff1f 100644 --- a/simpeg_drivers-assets/uijson/tipper_forward.ui.json +++ b/simpeg_drivers-assets/uijson/tipper_forward.ui.json @@ -17,22 +17,16 @@ "meshType": "{0b639533-f35b-44d8-92a8-f70ecff3fd26}", "value": "" }, - "txz_real_channel_bool": { - "group": "Survey", - "main": true, - "label": "Txz real", - "value": true - }, "txz_imag_channel_bool": { "group": "Survey", "main": true, "label": "Txz imaginary", "value": true }, - "tyz_real_channel_bool": { + "txz_real_channel_bool": { "group": "Survey", "main": true, - "label": "Tyz real", + "label": "Txz real", "value": true }, "tyz_imag_channel_bool": { @@ -41,6 +35,12 @@ "label": "Tyz imaginary", "value": true }, + "tyz_real_channel_bool": { + "group": "Survey", + "main": true, + "label": "Tyz real", + "value": true + }, "mesh": { "group": "Mesh and models", "main": true, diff --git a/simpeg_drivers-assets/uijson/tipper_inversion.ui.json b/simpeg_drivers-assets/uijson/tipper_inversion.ui.json index d8734335f..5d9c9450a 100644 --- a/simpeg_drivers-assets/uijson/tipper_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/tipper_inversion.ui.json @@ -17,7 +17,7 @@ "meshType": "{0b639533-f35b-44d8-92a8-f70ecff3fd26}", "value": "" }, - "txz_real_channel": { + "txz_imag_channel": { "association": [ "Cell", "Vertex" @@ -26,13 +26,13 @@ "group": "Data", "dataGroupType": "Multi-element", "main": true, - "label": "Txz real", + "label": "Txz imaginary", "parent": "data_object", "optional": true, "enabled": true, "value": "" }, - "txz_real_uncertainty": { + "txz_imag_uncertainty": { "association": [ "Cell", "Vertex" @@ -43,11 +43,11 @@ "main": true, "label": "Uncertainty", "parent": "data_object", - "dependency": "txz_real_channel", + "dependency": "txz_imag_channel", "dependencyType": "enabled", "value": "" }, - "txz_imag_channel": { + "txz_real_channel": { "association": [ "Cell", "Vertex" @@ -56,13 +56,13 @@ "group": "Data", "dataGroupType": "Multi-element", "main": true, - "label": "Txz imaginary", + "label": "Txz real", "parent": "data_object", "optional": true, "enabled": true, "value": "" }, - "txz_imag_uncertainty": { + "txz_real_uncertainty": { "association": [ "Cell", "Vertex" @@ -73,11 +73,11 @@ "main": true, "label": "Uncertainty", "parent": "data_object", - "dependency": "txz_imag_channel", + "dependency": "txz_real_channel", "dependencyType": "enabled", "value": "" }, - "tyz_real_channel": { + "tyz_imag_channel": { "association": [ "Cell", "Vertex" @@ -86,13 +86,13 @@ "group": "Data", "dataGroupType": "Multi-element", "main": true, - "label": "Tyz real", + "label": "Tyz imaginary", "parent": "data_object", "optional": true, "enabled": true, "value": "" }, - "tyz_real_uncertainty": { + "tyz_imag_uncertainty": { "association": [ "Cell", "Vertex" @@ -103,11 +103,11 @@ "main": true, "label": "Uncertainty", "parent": "data_object", - "dependency": "tyz_real_channel", + "dependency": "tyz_imag_channel", "dependencyType": "enabled", "value": "" }, - "tyz_imag_channel": { + "tyz_real_channel": { "association": [ "Cell", "Vertex" @@ -116,13 +116,13 @@ "group": "Data", "dataGroupType": "Multi-element", "main": true, - "label": "Tyz imaginary", + "label": "Tyz real", "parent": "data_object", "optional": true, "enabled": true, "value": "" }, - "tyz_imag_uncertainty": { + "tyz_real_uncertainty": { "association": [ "Cell", "Vertex" @@ -133,7 +133,7 @@ "main": true, "label": "Uncertainty", "parent": "data_object", - "dependency": "tyz_imag_channel", + "dependency": "tyz_real_channel", "dependencyType": "enabled", "value": "" },