diff --git a/EasyTextureApp/Gui/Components/Pages/RawData/SideBarBasic/Binning1D.qml b/EasyTextureApp/Gui/Components/Pages/RawData/SideBarBasic/Binning1D.qml index 6f172a0..2550c93 100644 --- a/EasyTextureApp/Gui/Components/Pages/RawData/SideBarBasic/Binning1D.qml +++ b/EasyTextureApp/Gui/Components/Pages/RawData/SideBarBasic/Binning1D.qml @@ -13,9 +13,9 @@ import Gui.Globals as Globals Grid { - rows: 2 + rows: 1 columnSpacing: EaStyle.Sizes.fontPixelSize - rowSpacing: EaStyle.Sizes.fontPixelSize * 0.5 + //rowSpacing: EaStyle.Sizes.fontPixelSize * 0.5 // Location Row { @@ -23,34 +23,41 @@ Grid { columns: 2 columnSpacing: EaStyle.Sizes.fontPixelSize + Column { + width: 1/2 * EaStyle.Sizes.sideBarContentWidth - EaElements.Label { - enabled: true - text: qsTr("2θ bin size, deg") - } + Row { + spacing: EaStyle.Sizes.fontPixelSize + + EaElements.Label { + enabled: true + text: qsTr("2θ bin size") + } - ComboBox { - //values for two_theta_bin_width_1D - currentIndex: 2 - model: ["0.1°", "0.25°", "0.5°", "0.75°", "1°", "2°", "5°", "10°"] + ComboBox { + //values for two_theta_bin_width_1D + currentIndex: 2 + model: ["0.1°", "0.25°", "0.5°", "0.75°", "1°", "2°", "5°", "10°"] + } + } } - } - } - Row { - Grid { - columns: 2 - columnSpacing: 23//EaStyle.Sizes.fontPixelSize + Column { + width: 1/2 * EaStyle.Sizes.sideBarContentWidth + Row { + spacing: EaStyle.Sizes.fontPixelSize - EaElements.Label { - enabled: true - text: qsTr("γ bin size, deg") - } + EaElements.Label { + enabled: true + text: qsTr("γ bin size") + } - ComboBox { - //values for gamma_bin_width_1D - model: ["1°", "2°", "5°", "10°"] + ComboBox { + //values for gamma_bin_width_1D + model: ["1°", "2°", "5°", "10°"] + } + } } } } diff --git a/EasyTextureApp/Gui/Components/Pages/RawData/SideBarBasic/Binning2D.qml b/EasyTextureApp/Gui/Components/Pages/RawData/SideBarBasic/Binning2D.qml index bd61786..2f5b228 100644 --- a/EasyTextureApp/Gui/Components/Pages/RawData/SideBarBasic/Binning2D.qml +++ b/EasyTextureApp/Gui/Components/Pages/RawData/SideBarBasic/Binning2D.qml @@ -13,9 +13,9 @@ import Gui.Globals as Globals Grid { - rows: 2 + rows: 1 columnSpacing: EaStyle.Sizes.fontPixelSize - rowSpacing: EaStyle.Sizes.fontPixelSize * 0.5 + //rowSpacing: EaStyle.Sizes.fontPixelSize * 0.5 // Location Row { @@ -23,39 +23,45 @@ Grid { columns: 2 columnSpacing: EaStyle.Sizes.fontPixelSize + Column { + width: 1/2 * EaStyle.Sizes.sideBarContentWidth - EaElements.Label { - enabled: true - text: qsTr("2θ bin size, deg") - } + Row { + spacing: EaStyle.Sizes.fontPixelSize + + EaElements.Label { + enabled: true + text: qsTr("2θ bin size") + } - ComboBox { - //values for two_theta_bin_width_2D - currentIndex: 2 - model: ["0.1°", "0.25°", "0.5°", "0.75°", "1°", "2°", "5°", "10°"] + ComboBox { + //values for two_theta_bin_width_2D + currentIndex: 2 + model: ["0.1°", "0.25°", "0.5°", "0.75°", "1°", "2°", "5°", "10°"] + } + } } - } - } - Row { - Grid { - columns: 2 - columnSpacing: 23 //EaStyle.Sizes.fontPixelSize + Column { + width: 1/2 * EaStyle.Sizes.sideBarContentWidth + Row { + spacing: EaStyle.Sizes.fontPixelSize - EaElements.Label { - enabled: true - text: qsTr("γ bin size, deg") - } + EaElements.Label { + enabled: true + text: qsTr("γ bin size") + } - ComboBox { - //values for gamma_bin_width_2D - model: ["1°", "2°", "5°", "10°"] + ComboBox { + //values for gamma_bin_width_2D + model: ["1°", "2°", "5°", "10°"] + } + } } } } - // Select File dialog FileDialog { id: measurementFileDialog diff --git a/EasyTextureApp/Gui/Components/Pages/RawData/SideBarBasic/Binning3D.qml b/EasyTextureApp/Gui/Components/Pages/RawData/SideBarBasic/Binning3D.qml index 26e0e15..57ed249 100644 --- a/EasyTextureApp/Gui/Components/Pages/RawData/SideBarBasic/Binning3D.qml +++ b/EasyTextureApp/Gui/Components/Pages/RawData/SideBarBasic/Binning3D.qml @@ -13,9 +13,9 @@ import Gui.Globals as Globals Grid { - rows: 2 + rows: 1 columnSpacing: EaStyle.Sizes.fontPixelSize - rowSpacing: EaStyle.Sizes.fontPixelSize * 0.5 + //rowSpacing: EaStyle.Sizes.fontPixelSize * 0.5 // Location Row { @@ -23,35 +23,41 @@ Grid { columns: 2 columnSpacing: EaStyle.Sizes.fontPixelSize + Column { + width: 1/2 * EaStyle.Sizes.sideBarContentWidth - EaElements.Label { - enabled: true - text: qsTr("2θ bin size, deg") - } + Row { + spacing: EaStyle.Sizes.fontPixelSize + + EaElements.Label { + enabled: true + text: qsTr("2θ bin size") + } - ComboBox { - //values for two_theta_bin_width_3D - currentIndex: 2 - model: ["0.1°", "0.25°", "0.5°", "0.75°", "1°", "2°", "5°", "10°"] + ComboBox { + //values for two_theta_bin_width_3D + currentIndex: 2 + model: ["0.1°", "0.25°", "0.5°", "0.75°", "1°", "2°", "5°", "10°"] + } + } } - } - } - Row { - Grid { - columns: 2 - columnSpacing: 23//EaStyle.Sizes.fontPixelSize + Column { + width: 1/2 * EaStyle.Sizes.sideBarContentWidth + Row { + spacing: EaStyle.Sizes.fontPixelSize - EaElements.Label { - enabled: true - text: qsTr("γ bin size, deg") - } + EaElements.Label { + enabled: true + text: qsTr("γ bin size") + } - ComboBox { - //values for gamma_bin_width_3D - model: ["1°", "2°", "5°", "10°"] - onClipChanged: {console.log('HI3')} + ComboBox { + //values for gamma_bin_width_3D + model: ["1°", "2°", "5°", "10°"] + } + } } } }