diff --git a/satellitesetup.cpp b/satellitesetup.cpp new file mode 100644 index 0000000..3e14be0 --- /dev/null +++ b/satellitesetup.cpp @@ -0,0 +1,14 @@ +#include "satellitesetup.h" +#include "ui_satellitesetup.h" + +satelliteSetup::satelliteSetup(QWidget *parent) : + QDialog(parent), + ui(new Ui::satelliteSetup) +{ + ui->setupUi(this); +} + +satelliteSetup::~satelliteSetup() +{ + delete ui; +} diff --git a/satellitesetup.h b/satellitesetup.h new file mode 100644 index 0000000..f5699f0 --- /dev/null +++ b/satellitesetup.h @@ -0,0 +1,22 @@ +#ifndef SATELLITESETUP_H +#define SATELLITESETUP_H + +#include + +namespace Ui { +class satelliteSetup; +} + +class satelliteSetup : public QDialog +{ + Q_OBJECT + +public: + explicit satelliteSetup(QWidget *parent = 0); + ~satelliteSetup(); + +private: + Ui::satelliteSetup *ui; +}; + +#endif // SATELLITESETUP_H diff --git a/satellitesetup.ui b/satellitesetup.ui new file mode 100644 index 0000000..ef2e88a --- /dev/null +++ b/satellitesetup.ui @@ -0,0 +1,522 @@ + + + satelliteSetup + + + + 0 + 0 + 563 + 311 + + + + + 0 + 0 + + + + Dialog + + + + + 9 + 9 + 541 + 291 + + + + + QLayout::SetFixedSize + + + 10 + + + 10 + + + 10 + + + 10 + + + + + 0 + + + 0 + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 120 + 0 + + + + Qt::Horizontal + + + + + + + + 75 + true + + + + Satellite Setup: + + + + + + + + 120 + 0 + + + + Qt::Horizontal + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + 0 + + + + + Type: + + + + + + + Linear Inverting + + + + + + + Linear Non-Inverting + + + + + + + FM + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + 0 + + + + + Uplink: + + + + + + + + 0 + 0 + + + + + 30 + 0 + + + + + + + + Downlink: + + + + + + + + 30 + 0 + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + Uplink from: + + + + + + + + 0 + 0 + + + + + 30 + 0 + + + + + + + + To: + + + + + + + + 0 + 0 + + + + + 30 + 0 + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + Downlink from: + + + + + + + + 0 + 0 + + + + + 30 + 0 + + + + + + + + To: + + + + + + + + 0 + 0 + + + + + 30 + 0 + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + Telemetry: + + + + + + + + 0 + 0 + + + + + 30 + 0 + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + 0 + + + + + Additional Spectrum Margin (KHz) + + + + + + + 100 + + + 10 + + + + + + + (added to both sides) + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + 0 + + + + + Set VFOs + + + + + + + Set Spectrum + + + + + + + Add Markers + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + diff --git a/wfmain.cpp b/wfmain.cpp index ec9dfcb..5a91048 100644 --- a/wfmain.cpp +++ b/wfmain.cpp @@ -895,7 +895,7 @@ void wfmain::prepareWf() { // do things spectWidth = rigCaps.spectLenMax; // was fixed at 475 - wfLength = 160; // fixed for now, time-length of waterfall + wfLength = ; // fixed for now, time-length of waterfall // Initialize before use! @@ -1478,7 +1478,7 @@ void wfmain::receiveSpectrumData(QByteArray spectrum, double startFreq, double e { plot->graph(1)->setData(x,y2); // peaks } - plot->yAxis->setRange(0, 160); + plot->yAxis->setRange(0, rigCaps.spectAmpMax+1); plot->xAxis->setRange(startFreq, endFreq); plot->replot(); diff --git a/wfview.pro b/wfview.pro index ff95cfd..c5e86c2 100644 --- a/wfview.pro +++ b/wfview.pro @@ -82,7 +82,8 @@ SOURCES += main.cpp\ udphandler.cpp \ logcategories.cpp \ audiohandler.cpp \ - calibrationwindow.cpp + calibrationwindow.cpp \ + satellitesetup.cpp HEADERS += wfmain.h \ commhandler.h \ @@ -92,11 +93,13 @@ HEADERS += wfmain.h \ udphandler.h \ logcategories.h \ audiohandler.h \ - calibrationwindow.h + calibrationwindow.h \ + satellitesetup.h FORMS += wfmain.ui \ - calibrationwindow.ui + calibrationwindow.ui \ + satellitesetup.ui