Update look of binning selectors in SideBar of RawData

EasyScience · Mar 26, 2024 · d12ef37 · d12ef37
1 parent beec6f5
commit d12ef37
Show file tree

Hide file tree

Showing 3 changed files with 90 additions and 71 deletions.
diff --git a/EasyTextureApp/Gui/Components/Pages/RawData/SideBarBasic/Binning1D.qml b/EasyTextureApp/Gui/Components/Pages/RawData/SideBarBasic/Binning1D.qml
@@ -13,44 +13,51 @@ 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 {
         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
@@ -13,49 +13,55 @@ 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 {
         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
@@ -13,45 +13,51 @@ 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 {
         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°"]
+                    }
+                }
             }
         }
     }