Skip to content

Commit

Permalink
Merge pull request #55 from g4ixt/development
Browse files Browse the repository at this point in the history 
v0.10.5 new features and bugfixes
  • Loading branch information
@g4ixt
g4ixt authored Jun 8, 2024
2 parents 886bc2c + 48c0d92 commit 2692972
Show file tree
Hide file tree
Showing 8 changed files with 970 additions and 651 deletions.
44 changes: 44 additions & 0 deletions QtTSAfilebrowse.py
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
# -*- coding: utf-8 -*-

# Form implementation generated from reading ui file 'filebrowse.ui'
#
# 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.


from PyQt5 import QtCore, QtGui, QtWidgets


class Ui_Filebrowse(object):
def setupUi(self, Filebrowse):
Filebrowse.setObjectName("Filebrowse")
Filebrowse.resize(818, 405)
self.listWidget = QtWidgets.QListWidget(Filebrowse)
self.listWidget.setGeometry(QtCore.QRect(10, 20, 301, 311))
self.listWidget.setObjectName("listWidget")
self.download = QtWidgets.QPushButton(Filebrowse)
self.download.setGeometry(QtCore.QRect(10, 350, 80, 26))
self.download.setObjectName("download")
self.picture = QtWidgets.QLabel(Filebrowse)
self.picture.setGeometry(QtCore.QRect(320, 20, 481, 321))
self.picture.setText("")
self.picture.setScaledContents(False)
self.picture.setObjectName("picture")
self.downloadBar = QtWidgets.QProgressBar(Filebrowse)
self.downloadBar.setGeometry(QtCore.QRect(100, 350, 211, 26))
self.downloadBar.setProperty("value", 0)
self.downloadBar.setObjectName("downloadBar")
self.downloadInfo = QtWidgets.QLabel(Filebrowse)
self.downloadInfo.setGeometry(QtCore.QRect(10, 380, 791, 20))
self.downloadInfo.setText("")
self.downloadInfo.setObjectName("downloadInfo")

self.retranslateUi(Filebrowse)
QtCore.QMetaObject.connectSlotsByName(Filebrowse)

def retranslateUi(self, Filebrowse):
_translate = QtCore.QCoreApplication.translate
Filebrowse.setWindowTitle(_translate("Filebrowse", "File List"))
self.download.setText(_translate("Filebrowse", "Save"))
206 changes: 105 additions & 101 deletions QtTSApreferences.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
class Ui_Preferences(object):
def setupUi(self, Preferences):
Preferences.setObjectName("Preferences")
Preferences.resize(800, 600)
Preferences.resize(817, 600)
self.layoutWidget = QtWidgets.QWidget(Preferences)
self.layoutWidget.setGeometry(QtCore.QRect(10, 10, 411, 572))
self.layoutWidget.setObjectName("layoutWidget")
Expand Down Expand Up @@ -94,130 +94,132 @@ def setupUi(self, Preferences):
self.importButton.setObjectName("importButton")
self.gridLayout.addWidget(self.importButton, 4, 0, 1, 1)
self.layoutWidget1 = QtWidgets.QWidget(Preferences)
self.layoutWidget1.setGeometry(QtCore.QRect(440, 10, 356, 571))
self.layoutWidget1.setGeometry(QtCore.QRect(440, 10, 361, 571))
self.layoutWidget1.setObjectName("layoutWidget1")
self.gridLayout_2 = QtWidgets.QGridLayout(self.layoutWidget1)
self.gridLayout_2.setContentsMargins(0, 0, 0, 0)
self.gridLayout_2.setObjectName("gridLayout_2")
self.zeroLine = QtWidgets.QCheckBox(self.layoutWidget1)
self.zeroLine.setChecked(False)
self.zeroLine.setObjectName("zeroLine")
self.gridLayout_2.addWidget(self.zeroLine, 2, 1, 1, 1)
self.label = QtWidgets.QLabel(self.layoutWidget1)
self.label.setObjectName("label")
self.gridLayout_2.addWidget(self.label, 7, 0, 1, 1)
self.minPoints = QtWidgets.QSpinBox(self.layoutWidget1)
self.minPoints.setButtonSymbols(QtWidgets.QAbstractSpinBox.NoButtons)
self.minPoints.setMinimum(25)
self.minPoints.setMaximum(450)
self.minPoints.setProperty("value", 450)
self.minPoints.setObjectName("minPoints")
self.gridLayout_2.addWidget(self.minPoints, 8, 1, 1, 1)
self.label_14 = QtWidgets.QLabel(self.layoutWidget1)
self.label_13 = QtWidgets.QLabel(self.layoutWidget1)
font = QtGui.QFont()
font.setBold(True)
font.setWeight(75)
self.label_14.setFont(font)
self.label_14.setObjectName("label_14")
self.gridLayout_2.addWidget(self.label_14, 10, 0, 1, 2)
self.peakThreshold = QtWidgets.QSpinBox(self.layoutWidget1)
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Fixed)
sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0)
sizePolicy.setHeightForWidth(self.peakThreshold.sizePolicy().hasHeightForWidth())
self.peakThreshold.setSizePolicy(sizePolicy)
self.peakThreshold.setMaximumSize(QtCore.QSize(83, 16777215))
font = QtGui.QFont()
font.setPointSize(9)
self.peakThreshold.setFont(font)
self.peakThreshold.setPrefix("")
self.peakThreshold.setMinimum(-120)
self.peakThreshold.setMaximum(-20)
self.peakThreshold.setProperty("value", -90)
self.peakThreshold.setObjectName("peakThreshold")
self.gridLayout_2.addWidget(self.peakThreshold, 5, 1, 1, 1)
spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
self.gridLayout_2.addItem(spacerItem, 16, 0, 1, 1)
self.freqLO = QtWidgets.QDoubleSpinBox(self.layoutWidget1)
self.freqLO.setDecimals(6)
self.freqLO.setMinimum(0.0)
self.freqLO.setMaximum(100000.0)
self.freqLO.setProperty("value", 0.0)
self.freqLO.setObjectName("freqLO")
self.gridLayout_2.addWidget(self.freqLO, 12, 1, 1, 1)
self.label_13.setFont(font)
self.label_13.setObjectName("label_13")
self.gridLayout_2.addWidget(self.label_13, 11, 0, 1, 1)
self.rbw_x = QtWidgets.QSpinBox(self.layoutWidget1)
self.rbw_x.setMinimum(2)
self.rbw_x.setMaximum(10)
self.rbw_x.setProperty("value", 3)
self.rbw_x.setObjectName("rbw_x")
self.gridLayout_2.addWidget(self.rbw_x, 7, 1, 1, 1)
self.label_4 = QtWidgets.QLabel(self.layoutWidget1)
self.label_4.setObjectName("label_4")
self.gridLayout_2.addWidget(self.label_4, 9, 0, 1, 1)
self.label_8 = QtWidgets.QLabel(self.layoutWidget1)
self.gridLayout_2.addWidget(self.rbw_x, 5, 1, 1, 1)
self.syncTime = QtWidgets.QCheckBox(self.layoutWidget1)
self.syncTime.setObjectName("syncTime")
self.gridLayout_2.addWidget(self.syncTime, 13, 1, 1, 1)
self.plus6Line = QtWidgets.QCheckBox(self.layoutWidget1)
self.plus6Line.setChecked(False)
self.plus6Line.setObjectName("plus6Line")
self.gridLayout_2.addWidget(self.plus6Line, 1, 1, 1, 1)
self.label = QtWidgets.QLabel(self.layoutWidget1)
self.label.setObjectName("label")
self.gridLayout_2.addWidget(self.label, 5, 0, 1, 1)
self.label_14 = QtWidgets.QLabel(self.layoutWidget1)
font = QtGui.QFont()
font.setBold(True)
font.setWeight(75)
self.label_8.setFont(font)
self.label_8.setObjectName("label_8")
self.gridLayout_2.addWidget(self.label_8, 6, 0, 1, 1)
self.label_14.setFont(font)
self.label_14.setObjectName("label_14")
self.gridLayout_2.addWidget(self.label_14, 8, 0, 1, 2)
self.label_11 = QtWidgets.QLabel(self.layoutWidget1)
self.label_11.setObjectName("label_11")
self.gridLayout_2.addWidget(self.label_11, 1, 0, 1, 1)
self.maxPoints = QtWidgets.QSpinBox(self.layoutWidget1)
self.maxPoints.setButtonSymbols(QtWidgets.QAbstractSpinBox.NoButtons)
self.maxPoints.setMinimum(25)
self.maxPoints.setMaximum(100000)
self.maxPoints.setProperty("value", 30000)
self.maxPoints.setObjectName("maxPoints")
self.gridLayout_2.addWidget(self.maxPoints, 7, 1, 1, 1)
self.label_6 = QtWidgets.QLabel(self.layoutWidget1)
font = QtGui.QFont()
font.setBold(True)
font.setWeight(75)
self.label_6.setFont(font)
self.label_6.setObjectName("label_6")
self.gridLayout_2.addWidget(self.label_6, 0, 0, 1, 2)
self.label_10 = QtWidgets.QLabel(self.layoutWidget1)
self.label_10.setObjectName("label_10")
self.gridLayout_2.addWidget(self.label_10, 2, 0, 1, 1)
self.neg25Line = QtWidgets.QCheckBox(self.layoutWidget1)
self.neg25Line.setChecked(False)
self.neg25Line.setObjectName("neg25Line")
self.gridLayout_2.addWidget(self.neg25Line, 3, 1, 1, 1)
self.label_11 = QtWidgets.QLabel(self.layoutWidget1)
self.label_11.setObjectName("label_11")
self.gridLayout_2.addWidget(self.label_11, 1, 0, 1, 1)
self.label_2 = QtWidgets.QLabel(self.layoutWidget1)
self.label_2.setObjectName("label_2")
self.gridLayout_2.addWidget(self.label_2, 12, 0, 1, 1)
self.label_4 = QtWidgets.QLabel(self.layoutWidget1)
self.label_4.setObjectName("label_4")
self.gridLayout_2.addWidget(self.label_4, 7, 0, 1, 1)
self.highLO = QtWidgets.QCheckBox(self.layoutWidget1)
self.highLO.setObjectName("highLO")
self.gridLayout_2.addWidget(self.highLO, 9, 1, 1, 1)
self.label_9 = QtWidgets.QLabel(self.layoutWidget1)
self.label_9.setObjectName("label_9")
self.gridLayout_2.addWidget(self.label_9, 3, 0, 1, 1)
self.label_15 = QtWidgets.QLabel(self.layoutWidget1)
self.label_15.setObjectName("label_15")
self.gridLayout_2.addWidget(self.label_15, 11, 0, 1, 1)
self.plus6Line = QtWidgets.QCheckBox(self.layoutWidget1)
self.plus6Line.setChecked(False)
self.plus6Line.setObjectName("plus6Line")
self.gridLayout_2.addWidget(self.plus6Line, 1, 1, 1, 1)
self.label_13 = QtWidgets.QLabel(self.layoutWidget1)
self.label_13.setText("")
self.label_13.setObjectName("label_13")
self.gridLayout_2.addWidget(self.label_13, 13, 0, 1, 1)
self.label_2 = QtWidgets.QLabel(self.layoutWidget1)
self.label_2.setObjectName("label_2")
self.gridLayout_2.addWidget(self.label_2, 5, 0, 1, 1)
self.label_10 = QtWidgets.QLabel(self.layoutWidget1)
self.label_10.setObjectName("label_10")
self.gridLayout_2.addWidget(self.label_10, 2, 0, 1, 1)
self.maxPoints = QtWidgets.QSpinBox(self.layoutWidget1)
self.maxPoints.setButtonSymbols(QtWidgets.QAbstractSpinBox.NoButtons)
self.maxPoints.setMinimum(25)
self.maxPoints.setMaximum(100000)
self.maxPoints.setProperty("value", 30000)
self.maxPoints.setObjectName("maxPoints")
self.gridLayout_2.addWidget(self.maxPoints, 9, 1, 1, 1)
self.label_7 = QtWidgets.QLabel(self.layoutWidget1)
font = QtGui.QFont()
font.setBold(True)
font.setWeight(75)
self.label_7.setFont(font)
self.label_7.setObjectName("label_7")
self.gridLayout_2.addWidget(self.label_7, 4, 0, 1, 1)
self.gridLayout_2.addWidget(self.label_15, 9, 0, 1, 1)
self.zeroLine = QtWidgets.QCheckBox(self.layoutWidget1)
self.zeroLine.setChecked(False)
self.zeroLine.setObjectName("zeroLine")
self.gridLayout_2.addWidget(self.zeroLine, 2, 1, 1, 1)
self.label_3 = QtWidgets.QLabel(self.layoutWidget1)
self.label_3.setObjectName("label_3")
self.gridLayout_2.addWidget(self.label_3, 8, 0, 1, 1)
self.gridLayout_2.addWidget(self.label_3, 6, 0, 1, 1)
self.label_16 = QtWidgets.QLabel(self.layoutWidget1)
self.label_16.setObjectName("label_16")
self.gridLayout_2.addWidget(self.label_16, 12, 0, 1, 1)
self.highLO = QtWidgets.QCheckBox(self.layoutWidget1)
self.highLO.setObjectName("highLO")
self.gridLayout_2.addWidget(self.highLO, 11, 1, 1, 1)
self.gridLayout_2.addWidget(self.label_16, 10, 0, 1, 1)
self.peakThreshold = QtWidgets.QSpinBox(self.layoutWidget1)
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Fixed)
sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0)
sizePolicy.setHeightForWidth(self.peakThreshold.sizePolicy().hasHeightForWidth())
self.peakThreshold.setSizePolicy(sizePolicy)
self.peakThreshold.setMaximumSize(QtCore.QSize(83, 16777215))
font = QtGui.QFont()
font.setPointSize(9)
self.peakThreshold.setFont(font)
self.peakThreshold.setPrefix("")
self.peakThreshold.setMinimum(-120)
self.peakThreshold.setMaximum(-20)
self.peakThreshold.setProperty("value", -90)
self.peakThreshold.setObjectName("peakThreshold")
self.gridLayout_2.addWidget(self.peakThreshold, 12, 1, 1, 1)
self.label_8 = QtWidgets.QLabel(self.layoutWidget1)
font = QtGui.QFont()
font.setBold(True)
font.setWeight(75)
self.label_8.setFont(font)
self.label_8.setObjectName("label_8")
self.gridLayout_2.addWidget(self.label_8, 4, 0, 1, 1)
self.minPoints = QtWidgets.QSpinBox(self.layoutWidget1)
self.minPoints.setButtonSymbols(QtWidgets.QAbstractSpinBox.NoButtons)
self.minPoints.setMinimum(25)
self.minPoints.setMaximum(450)
self.minPoints.setProperty("value", 450)
self.minPoints.setObjectName("minPoints")
self.gridLayout_2.addWidget(self.minPoints, 6, 1, 1, 1)
self.freqLO = QtWidgets.QDoubleSpinBox(self.layoutWidget1)
self.freqLO.setDecimals(6)
self.freqLO.setMinimum(0.0)
self.freqLO.setMaximum(100000.0)
self.freqLO.setProperty("value", 0.0)
self.freqLO.setObjectName("freqLO")
self.gridLayout_2.addWidget(self.freqLO, 10, 1, 1, 1)
spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
self.gridLayout_2.addItem(spacerItem, 14, 0, 1, 1)
self.label_17 = QtWidgets.QLabel(self.layoutWidget1)
self.label_17.setObjectName("label_17")
self.gridLayout_2.addWidget(self.label_17, 13, 0, 1, 1)

self.retranslateUi(Preferences)
QtCore.QMetaObject.connectSlotsByName(Preferences)
Expand All @@ -232,22 +234,24 @@ def retranslateUi(self, Preferences):
self.label_12.setText(_translate("Preferences", "Filter on:"))
self.exportButton.setText(_translate("Preferences", "Export"))
self.importButton.setText(_translate("Preferences", "Import"))
self.zeroLine.setText(_translate("Preferences", " 0dBm"))
self.label_13.setText(_translate("Preferences", "Miscellaneous"))
self.syncTime.setText(_translate("Preferences", "Sync to PC"))
self.plus6Line.setText(_translate("Preferences", "+6dBm"))
self.label.setText(_translate("Preferences", "Points / Resolution Bandwidth"))
self.label_14.setText(_translate("Preferences", "External Mixer / LNB"))
self.peakThreshold.setSuffix(_translate("Preferences", "dBm"))
self.freqLO.setSuffix(_translate("Preferences", "MHz"))
self.label_4.setText(_translate("Preferences", "Auto maximum points"))
self.label_8.setText(_translate("Preferences", "Scan Points Settings"))
self.label_11.setText(_translate("Preferences", "Absolute maximum"))
self.label_6.setText(_translate("Preferences", "Signal Level Reminder lines"))
self.label_10.setText(_translate("Preferences", "Max with auto attenuator"))
self.neg25Line.setText(_translate("Preferences", "-25dBm"))
self.label_11.setText(_translate("Preferences", "Absolute maximum"))
self.label_2.setText(_translate("Preferences", "Peak marker detection threshold"))
self.label_4.setText(_translate("Preferences", "Auto maximum points"))
self.highLO.setText(_translate("Preferences", "True"))
self.label_9.setText(_translate("Preferences", "Max for best accuracy"))
self.label_15.setText(_translate("Preferences", "LO above displayed Freq"))
self.plus6Line.setText(_translate("Preferences", "+6dBm"))
self.label_2.setText(_translate("Preferences", "Detection Threshold"))
self.label_10.setText(_translate("Preferences", "Max with auto attenuator"))
self.label_7.setText(_translate("Preferences", "Peak Marker Settings"))
self.zeroLine.setText(_translate("Preferences", " 0dBm"))
self.label_3.setText(_translate("Preferences", "Auto minimum points"))
self.label_16.setText(_translate("Preferences", "LO Frequency"))
self.highLO.setText(_translate("Preferences", "True"))
self.peakThreshold.setSuffix(_translate("Preferences", "dBm"))
self.label_8.setText(_translate("Preferences", "Scan Points Settings"))
self.freqLO.setSuffix(_translate("Preferences", "MHz"))
self.label_17.setText(_translate("Preferences", "Date and Time"))
Binary file modified QtTSAprefs.db
View file
Binary file not shown.
Loading

0 comments on commit 2692972

Please sign in to comment.