Merge branch 'development'

QtTSApreferences.py

@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'preferences.ui'
 #
-# Created by: PyQt5 UI code generator 5.15.7
+# Created by: PyQt5 UI code generator 5.15.10
 #
 # WARNING: Any manual changes made to this file will be lost when pyuic5 is
 # run again.  Do not edit this file unless you know what you are doing.
@@ -27,29 +27,34 @@ def setupUi(self, Preferences):
         self.autoPoints.setSizePolicy(sizePolicy)
         self.autoPoints.setObjectName("autoPoints")
         self.minPoints = QtWidgets.QSpinBox(self.autoPoints)
-        self.minPoints.setGeometry(QtCore.QRect(160, 60, 90, 27))
+        self.minPoints.setGeometry(QtCore.QRect(130, 70, 61, 27))
         self.minPoints.setButtonSymbols(QtWidgets.QAbstractSpinBox.NoButtons)
         self.minPoints.setMinimum(25)
         self.minPoints.setMaximum(450)
         self.minPoints.setProperty("value", 450)
         self.minPoints.setObjectName("minPoints")
         self.maxPoints = QtWidgets.QSpinBox(self.autoPoints)
-        self.maxPoints.setGeometry(QtCore.QRect(160, 90, 90, 27))
+        self.maxPoints.setGeometry(QtCore.QRect(130, 110, 61, 27))
         self.maxPoints.setButtonSymbols(QtWidgets.QAbstractSpinBox.NoButtons)
         self.maxPoints.setMinimum(25)
         self.maxPoints.setMaximum(100000)
         self.maxPoints.setProperty("value", 30000)
         self.maxPoints.setObjectName("maxPoints")
         self.label_3 = QtWidgets.QLabel(self.autoPoints)
-        self.label_3.setGeometry(QtCore.QRect(30, 60, 111, 24))
+        self.label_3.setGeometry(QtCore.QRect(10, 70, 111, 24))
         self.label_3.setObjectName("label_3")
         self.label_4 = QtWidgets.QLabel(self.autoPoints)
-        self.label_4.setGeometry(QtCore.QRect(30, 90, 111, 24))
+        self.label_4.setGeometry(QtCore.QRect(10, 110, 111, 24))
         self.label_4.setObjectName("label_4")
-        self.bestPoints = QtWidgets.QCheckBox(self.autoPoints)
-        self.bestPoints.setGeometry(QtCore.QRect(10, 30, 161, 24))
-        self.bestPoints.setLayoutDirection(QtCore.Qt.LeftToRight)
-        self.bestPoints.setObjectName("bestPoints")
+        self.rbw_x = QtWidgets.QSpinBox(self.autoPoints)
+        self.rbw_x.setGeometry(QtCore.QRect(130, 30, 61, 27))
+        self.rbw_x.setMinimum(2)
+        self.rbw_x.setMaximum(10)
+        self.rbw_x.setProperty("value", 3)
+        self.rbw_x.setObjectName("rbw_x")
+        self.label = QtWidgets.QLabel(self.autoPoints)
+        self.label.setGeometry(QtCore.QRect(10, 35, 111, 18))
+        self.label.setObjectName("label")
         self.gridLayout.addWidget(self.autoPoints, 1, 1, 1, 1)
         self.signalLines = QtWidgets.QGroupBox(Preferences)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Expanding)
@@ -121,7 +126,7 @@ def retranslateUi(self, Preferences):
         self.autoPoints.setTitle(_translate("Preferences", "Auto Points"))
         self.label_3.setText(_translate("Preferences", "Auto min points"))
         self.label_4.setText(_translate("Preferences", "Auto max points"))
-        self.bestPoints.setText(_translate("Preferences", "Best Power Accuracy"))
+        self.label.setText(_translate("Preferences", "Points per RBW"))
         self.signalLines.setTitle(_translate("Preferences", "Signal level reminder lines  "))
         self.neg25Line.setText(_translate("Preferences", "-25dBm  (best accuracy)"))
         self.zeroLine.setText(_translate("Preferences", " 0dBm    (attenuator on Auto)"))