Fixes to config window

spectrumscope.cpp

@@ -1,5 +1,4 @@
 #include "spectrumscope.h"
-
 #include "logcategories.h"
 #include "rigidentities.h"
 
@@ -11,21 +10,18 @@ spectrumScope::spectrumScope(QWidget *parent)
 
     this->setObjectName("Spectrum Scope");
     this->setTitle("Band");
+    this->defaultStyleSheet = this->styleSheet();
+
     queue = cachingQueue::getInstance();
     spectrum = new QCustomPlot();
     mainLayout = new QHBoxLayout(this);
-    layout = new QVBoxLayout(this);
+    layout = new QVBoxLayout();
     mainLayout->addLayout(layout);
     splitter = new QSplitter(this);
     layout->addWidget(splitter);
     splitter->setOrientation(Qt::Vertical);
 
-    configGroup = new QGroupBox(this);
-    configLayout = new QFormLayout(this);
-    configGroup->setLayout(configLayout);
-    mainLayout->addWidget(configGroup);
-
-    controlLayout = new QHBoxLayout();
+    controlLayout = new QHBoxLayout();    
     enableCheckBox = new QCheckBox("Enable");
     enableCheckBox->setTristate(true);
     enableCheckBox->setToolTip("Checked=WF enable, Unchecked=WF disable, Partial=Enable WF but no local display");
@@ -51,13 +47,14 @@ spectrumScope::spectrumScope(QWidget *parent)
 
     controlSpacer = new QSpacerItem(0,0,QSizePolicy::Expanding,QSizePolicy::Fixed);
     midSpacer = new QSpacerItem(0,0,QSizePolicy::Expanding,QSizePolicy::Fixed);
+
     clearPeaksButton = new QPushButton("Clear Peaks");
 
-    configButton = new QPushButton("Conf");
+    configButton = new QPushButton(">");
     configButton->setAccessibleName("Configure Scope");
     configButton->setAccessibleDescription("Change various settings of the current Scope");
     configButton->setToolTip("Configure Scope");
-
+    configButton->setFocusPolicy(Qt::NoFocus);
 
     modeCombo = new QComboBox();
     dataCombo = new QComboBox();
@@ -180,8 +177,22 @@ spectrumScope::spectrumScope(QWidget *parent)
 #endif
 
     // Config Screen
+    rhsLayout = new QVBoxLayout();
+
+    rhsTopSpacer = new QSpacerItem(0,0,QSizePolicy::Fixed,QSizePolicy::Expanding);
+    rhsLayout->addSpacerItem(rhsTopSpacer);
+
+    configGroup = new QGroupBox();
+    rhsLayout->addWidget(configGroup);
+    configLayout = new QFormLayout();
+    configGroup->setLayout(configLayout);
+    mainLayout->addLayout(rhsLayout);
+
+    rhsBottomSpacer = new QSpacerItem(0,0,QSizePolicy::Fixed,QSizePolicy::Expanding);
+    rhsLayout->addSpacerItem(rhsBottomSpacer);
+
     QFont font = configGroup->font();
-    configGroup->setStyleSheet(QString("*{padding: 0px 0px 0px 0px; margin: 0px 0px 0px 0px;}*{font-size: %0px;}").arg(font.pointSize()-1));
+    configGroup->setStyleSheet(QString("QGroupBox{border:1px solid gray;} *{padding: 0px 0px 0px 0px; margin: 0px 0px 0px 0px; font-size: %0px;}").arg(font.pointSize()-1));
     configGroup->setMaximumWidth(240);
     configRef = new QSlider(Qt::Orientation::Horizontal);
     configRef->setRange(-200,200);
@@ -1400,9 +1411,10 @@ void spectrumScope::receivePassband(quint16 pass)
 void spectrumScope::selected(bool en)
 {
     if (en)
-        this->setStyleSheet("QGroupBox { border:2px solid red;}");
+        this->setStyleSheet("QGroupBox { border:1px solid red;}");
     else
-        this->setStyleSheet("QGroupBox { border:2px solid gray;}");
+        this->setStyleSheet(defaultStyleSheet);
+    //this->setStyleSheet("QGroupBox { border:2px solid gray;}");
 }
 
 void spectrumScope::holdPressed(bool en)
@@ -1420,6 +1432,7 @@ void spectrumScope::setHold(bool h)
 void spectrumScope::setSpeed(uchar s)
 {
     this->currentSpeed = s;
+    configSpeed->setCurrentIndex(configSpeed->findData(currentSpeed));
 }
 
 
@@ -1516,6 +1529,11 @@ void spectrumScope::receiveSpots(QList<spotData> spots)
 void spectrumScope::configPressed()
 {
     configGroup->setVisible(!configGroup->isVisible());
+    if (configGroup->isVisible())
+        configButton->setText("<");
+    else
+        configButton->setText(">");
+    configButton->setVisible(true);
 }
 
 
@@ -1523,4 +1541,25 @@ void spectrumScope::wfTheme(int num)
 {
     currentTheme = QCPColorGradient::GradientPreset(num);
     colorMap->setGradient(static_cast<QCPColorGradient::GradientPreset>(num));
+    configTheme->setCurrentIndex(configTheme->findData(currentTheme));
 }
+
+void spectrumScope::setPBTInner (double hz) {
+    PBTInner = hz;
+    double pbFreq = ((double)(this->PBTInner) / this->passbandWidth) * 127.0;
+    qint16 newFreq = pbFreq + 128;
+    if (newFreq >= 0 && newFreq <= 255) {
+        configPbtInner->setValue(newFreq);
+    }
+}
+
+void spectrumScope::setPBTOuter (double hz) {
+    PBTOuter = hz;
+    double pbFreq = ((double)(this->PBTOuter) / this->passbandWidth) * 127.0;
+    qint16 newFreq = pbFreq + 128;
+    if (newFreq >= 0 && newFreq <= 255) {
+        configPbtOuter->setValue(newFreq);
+    }
+}
+
+

spectrumscope.h

@@ -48,7 +48,7 @@ public:
     double getCenterFreq () { return passbandCenterFrequency;}
 
     void setPassbandWidth(double hz) { passbandWidth = hz;}
-    double getPassbandWidth() { return passbandWidth;}
+    double getPassbandWidth() { configFilterWidth->setValue(passbandWidth*1E6); return passbandWidth;}
 
     void setIdentity(QString name, bool s) {this->setTitle(name), sub = s;}
     bool getSub() { return sub;}
@@ -64,16 +64,16 @@ public:
     void receivePassband(quint16 pass);
 
     double getPBTInner () { return PBTInner;}
-    void setPBTInner (double hz) { PBTInner = hz;}
+    void setPBTInner (double hz);
 
     double getPBTOuter () { return PBTOuter;}
-    void setPBTOuter (double hz) { PBTOuter = hz;}
+    void setPBTOuter (double hz);
 
     quint16 getStepSize () { return stepSize;}
     void setStepSize (quint16 hz) { stepSize = hz;}
 
-    void setFrequency (freqt f) { freq = f;}
     freqt getFrequency () { return freq;}
+    void setFrequency (freqt f) { freq = f;}
 
     void receiveMode (modeInfo m);
 
@@ -132,6 +132,8 @@ private:
     quint64 roundFrequency(quint64 frequency, unsigned int tsHz);
     quint64 roundFrequency(quint64 frequency, int steps, unsigned int tsHz);
 
+    QString defaultStyleSheet;
+
     QMutex mutex;
     QCustomPlot* spectrum = Q_NULLPTR;
     QCustomPlot* waterfall = Q_NULLPTR;
@@ -139,6 +141,7 @@ private:
     QSplitter* splitter;
     QHBoxLayout* mainLayout;
     QVBoxLayout* layout;
+    QVBoxLayout* rhsLayout;
     QHBoxLayout* controlLayout;
     QCheckBox* enableCheckBox;
     QLabel* scopeModeLabel;
@@ -159,6 +162,9 @@ private:
     QSlider* dummySlider;
 
     // Config screen
+
+    QSpacerItem* rhsTopSpacer;
+    QSpacerItem* rhsBottomSpacer;
     QGroupBox* configGroup;
     QFormLayout* configLayout;
     QSlider* configRef;

tciserver.cpp

@@ -250,7 +250,7 @@ void tciServer::receiveTCIAudio(audioPacket audio){
     pStream->codec = 0u;
     pStream->type = RxAudioStream;
     pStream->crc = 0u;
-    pStream->length = audio.data.size() / sizeof (float);
+    pStream->length = quint32(audio.data.size() / sizeof (float));
 
     memcpy(pStream->data,audio.data.data(),audio.data.size());
 

wfmain.cpp

@@ -4469,11 +4469,6 @@ void wfmain::on_freqDial_valueChanged(int value)
     }
 }
 
-void wfmain::handleBandStackReg(freqt freqGo, char mode, char filter, bool dataOn)
-{
-    // Deprecated
-}
-
 void wfmain::setBand(int band)
 {
     queue->add(priorityImmediate,queueItem(funcBandStackReg,QVariant::fromValue<uchar>(band),false));

wfmain.h

@@ -376,7 +376,6 @@ private slots:
     void receiveFreq(freqt);
 
     void receivePTTstatus(bool pttOn);
-    void handleBandStackReg(freqt f, char mode, char filter, bool dataOn); // freq, mode, (filter,) datamode
     void receiveRITStatus(bool ritEnabled);
     void receiveRITValue(int ritValHz);
     void receiveModInput(rigInput input, unsigned char data);