From 17d9d820421bacc0a3fd0d84359119e92e86bc0a Mon Sep 17 00:00:00 2001
From: Brandon Hewer <brandon.hewer@stfc.ac.uk>
Date: Wed, 18 Jul 2018 18:46:31 +0100
Subject: [PATCH] Apply ClangFormat Changes
Refs #22988
---
.../Indirect/ISISEnergyTransfer.cpp | 5 +--
.../Indirect/ISISEnergyTransfer.ui | 42 ++++++++++++++-----
2 files changed, 34 insertions(+), 13 deletions(-)
diff --git a/qt/scientific_interfaces/Indirect/ISISEnergyTransfer.cpp b/qt/scientific_interfaces/Indirect/ISISEnergyTransfer.cpp
index 6d2d43b6084..679295fc2f5 100644
--- a/qt/scientific_interfaces/Indirect/ISISEnergyTransfer.cpp
+++ b/qt/scientific_interfaces/Indirect/ISISEnergyTransfer.cpp
@@ -34,9 +34,8 @@ std::string createDetectorGroupingString(std::size_t groupSize,
const auto remainder = numberOfDetectors % numberOfGroups;
if (remainder == 0)
return groupingString;
- return groupingString + "," +
- createRangeString(numberOfDetectors - remainder,
- numberOfDetectors - 1);
+ return groupingString + "," + createRangeString(numberOfDetectors - remainder,
+ numberOfDetectors - 1);
}
std::string createDetectorGroupingString(std::size_t numberOfDetectors,
diff --git a/qt/scientific_interfaces/Indirect/ISISEnergyTransfer.ui b/qt/scientific_interfaces/Indirect/ISISEnergyTransfer.ui
index 1585025f023..8fea6d1d7f6 100644
--- a/qt/scientific_interfaces/Indirect/ISISEnergyTransfer.ui
+++ b/qt/scientific_interfaces/Indirect/ISISEnergyTransfer.ui
@@ -289,7 +289,11 @@
</widget>
</item>
<item>
- <widget class="QSpinBox" name="spNumberGroups"/>
+ <widget class="QSpinBox" name="spNumberGroups">
+ <property name="minimum">
+ <number>1</number>
+ </property>
+ </widget>
</item>
<item>
<spacer name="horizontalSpacer_5">
@@ -313,19 +317,19 @@
<property name="enabled">
<bool>true</bool>
</property>
- <property name="toolTip">
- <string>, allows you to specify additional indices. 1,2,4 will keep indices 1, 2 and 4 only.
-: indicates a continuous range of indices. For example, 1:5 is the same as 1,2,3,4,5.
-+ sums two spectra together. 7+9 will produce a single spectra listing the sum of 7 and 9, ignoring any others.
-- sums a range of spectra together. For example, 3-8 is the same as 3+4+5+6+7+8.
- </string>
- </property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
+ <property name="toolTip">
+ <string>, allows you to specify additional indices. 1,2,4 will keep indices 1, 2 and 4 only.
+: indicates a continuous range of indices. For example, 1:5 is the same as 1,2,3,4,5.
++ sums two spectra together. 7+9 will produce a single spectra listing the sum of 7 and 9, ignoring any others.
+- sums a range of spectra together. For example, 3-8 is the same as 3+4+5+6+7+8.
+ </string>
+ </property>
<property name="layoutDirection">
<enum>Qt::LeftToRight</enum>
</property>
@@ -572,7 +576,16 @@
<property name="spacing">
<number>0</number>
</property>
- <property name="margin">
+ <property name="leftMargin">
+ <number>0</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>0</number>
+ </property>
+ <property name="bottomMargin">
<number>0</number>
</property>
<item>
@@ -580,7 +593,16 @@
<property name="spacing">
<number>6</number>
</property>
- <property name="margin">
+ <property name="leftMargin">
+ <number>6</number>
+ </property>
+ <property name="topMargin">
+ <number>6</number>
+ </property>
+ <property name="rightMargin">
+ <number>6</number>
+ </property>
+ <property name="bottomMargin">
<number>6</number>
</property>
<item>
--
GitLab