mirror
/
wfview
kopia lustrzana https://gitlab.com/eliggett/wfview
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Merge branch 'master' of https://gitlab.com/eliggett/wfview

knobtest
Phil Taylor 2022-09-20 18:57:09 +01:00
rodzic ae6f1f2ca3 9ecdd02246
commit eda1f9fcd3
8 zmienionych plików z 162 dodań i 15 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

23
CHANGELOG
Wyświetl plik

@ -1,10 +1,31 @@
# CHANGELOG # CHANGELOG
- 20220920
Added dialog box to the toFixed button where an edge can be selected.
updated to v1.47
- 20220918
Added controls for custom scope edges, hide/show scope controls
depending upon the scope mode the radio reports.
Fixed clear peaks button to work with the plasma underlay.
Make sure both audio system button are disabled when connected to radio and enabled when not.
Remove password from log!
Fix server user handling
updated to v1.46
- 20220918 - 20220918
merged bits from log branch into master merged bits from log branch into master
updated to v.1.45 updated to v1.45
- 20220917 - 20220917

7
WHATSNEW
Wyświetl plik

@ -30,6 +30,13 @@ The following highlights are in this 1.41-release:
moved connect button and added cancel option moved connect button and added cancel option
add enable/disable audioSystemServerCombo add enable/disable audioSystemServerCombo
Fixed bug where the frequency dial skipped extra when crossing zero. Fixed bug where the frequency dial skipped extra when crossing zero.
+ 1.46 Added controls for custom scope edges, hide/show scope controls
depending upon the scope mode the radio reports.
Fixed clear peaks button to work with the plasma underlay.
both audio system button are disabled when connected to radio and enabled when not.
Remove password from log
Fix server user handling
+ 1.47 Added dialog box to the toFixed button where an edge can be selected.
Notes: Notes:

9
aboutbox.cpp
Wyświetl plik

@ -15,9 +15,10 @@ aboutbox::aboutbox(QWidget *parent) :
ui->topText->setText("wfview version " + QString(WFVIEW_VERSION)); ui->topText->setText("wfview version " + QString(WFVIEW_VERSION));
QString head = QString("<html><head></head><body>"); QString head = QString("<html><head></head><body>");
QString copyright = QString("Copyright 2017-2022 Elliott H. Liggett, W6EL. All rights reserved. wfview source code is <a href=\"https://gitlab.com/eliggett/wfview/-/blob/master/LICENSE\">licensed</a> under the GNU GPLv3."); QString copyright = QString("Copyright 2017-2022 Elliott H. Liggett, W6EL. All rights reserved.<br/>wfview source code is <a href=\"https://gitlab.com/eliggett/wfview/-/blob/master/LICENSE\">licensed</a> under the GNU GPLv3.");
QString nacode = QString("<br/><br/>Networking, audio, rigctl server, and much more written by Phil Taylor, M0VSE"); QString nacode = QString("<br/><br/>Networking, audio, rigctl server, and much more written by Phil Taylor, M0VSE");
QString doctest = QString("<br/><br/>Testing, documentation, bug fixes, and development mentorship from<br/>Roeland Jansen, PA3MET, and Jim Nijkamp, PA8E."); QString scm = QString("<br/><br/>Source code and issues managed by Roeland Jansen, PA3MET");
QString doctest = QString("<br/><br/>Testing and development mentorship from Jim Nijkamp, PA8E.");
QString dedication = QString("<br/><br/>This version of wfview is dedicated to the ones we lost."); QString dedication = QString("<br/><br/>This version of wfview is dedicated to the ones we lost.");
@ -35,7 +36,7 @@ aboutbox::aboutbox(QWidget *parent) :
QString support = QString("<br/><br/>For support, please visit <a href=\"https://forum.wfview.org/\">the official wfview support forum</a>."); QString support = QString("<br/><br/>For support, please visit <a href=\"https://forum.wfview.org/\">the official wfview support forum</a>.");
QString gitcodelink = QString("<a href=\"https://gitlab.com/eliggett/wfview/-/tree/%1\" style=\"color: cyan;\">").arg(GITSHORT); QString gitcodelink = QString("<a href=\"https://gitlab.com/eliggett/wfview/-/tree/%1\" style=\"color: cyan;\">").arg(GITSHORT);
QString contact = QString("<br/>email W6EL: kilocharlie8@gmail.com"); QString contact = QString("<br/>email W6EL: kilocharlie8 at gmail.com");
QString buildInfo = QString("<br/><br/>Build " + gitcodelink + QString(GITSHORT) + "</a> on " + QString(__DATE__) + " at " + __TIME__ + " by " + UNAME + "@" + HOST); QString buildInfo = QString("<br/><br/>Build " + gitcodelink + QString(GITSHORT) + "</a> on " + QString(__DATE__) + " at " + __TIME__ + " by " + UNAME + "@" + HOST);
QString end = QString("</body></html>"); QString end = QString("</body></html>");
@ -85,7 +86,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.");
// String it all together: // String it all together:
QString aboutText = head + copyright + "\n" + nacode + "\n" + doctest + dedication + wfviewcommunityack; QString aboutText = head + copyright + "\n" + nacode + "\n" + scm + "\n" + doctest + dedication + wfviewcommunityack;
aboutText.append(website + "\n" + donate + "\n"+ docs + support + contact +"\n"); aboutText.append(website + "\n" + donate + "\n"+ docs + support + contact +"\n");
aboutText.append("\n" + ssCredit + "\n" + rsCredit + "\n"); aboutText.append("\n" + ssCredit + "\n" + rsCredit + "\n");

112
wfmain.cpp
Wyświetl plik

@ -2158,6 +2158,7 @@ void wfmain::showHideSpectrum(bool show)
ui->wfLengthSlider->setEnabled(show); ui->wfLengthSlider->setEnabled(show);
ui->wfthemeCombo->setVisible(show); ui->wfthemeCombo->setVisible(show);
ui->toFixedBtn->setVisible(show); ui->toFixedBtn->setVisible(show);
ui->customEdgeBtn->setVisible(show);
ui->clearPeakBtn->setVisible(show); ui->clearPeakBtn->setVisible(show);
// And the labels: // And the labels:
@ -3872,6 +3873,7 @@ void wfmain::receiveSpectrumMode(spectrumMode spectMode)
ui->spectrumModeCombo->blockSignals(false); ui->spectrumModeCombo->blockSignals(false);
} }
} }
setUISpectrumControlsToMode(spectMode);
} }
@ -4053,6 +4055,7 @@ void wfmain::on_clearPeakBtn_clicked()
if(haveRigCaps) if(haveRigCaps)
{ {
spectrumPeaks = QByteArray( (int)spectWidth, '\x01' ); spectrumPeaks = QByteArray( (int)spectWidth, '\x01' );
clearPlasmaBuffer();
} }
return; return;
} }
@ -4196,7 +4199,29 @@ void wfmain::on_fCEbtn_clicked()
void wfmain::on_spectrumModeCombo_currentIndexChanged(int index) void wfmain::on_spectrumModeCombo_currentIndexChanged(int index)
{ {
emit setScopeMode(static_cast<spectrumMode>(ui->spectrumModeCombo->itemData(index).toInt())); spectrumMode smode = static_cast<spectrumMode>(ui->spectrumModeCombo->itemData(index).toInt());
emit setScopeMode(smode);
setUISpectrumControlsToMode(smode);
}
void wfmain::setUISpectrumControlsToMode(spectrumMode smode)
{
if((smode==spectModeCenter) || (smode==spectModeScrollC))
{
ui->specEdgeLabel->hide();
ui->scopeEdgeCombo->hide();
ui->customEdgeBtn->hide();
ui->toFixedBtn->show();
ui->specSpanLabel->show();
ui->scopeBWCombo->show();
} else {
ui->specEdgeLabel->show();
ui->scopeEdgeCombo->show();
ui->customEdgeBtn->show();
ui->toFixedBtn->hide();
ui->specSpanLabel->hide();
ui->scopeBWCombo->hide();
}
} }
void wfmain::on_fEnterBtn_clicked() void wfmain::on_fEnterBtn_clicked()
@ -4890,9 +4915,28 @@ void wfmain::on_vspCombo_currentIndexChanged(int value)
void wfmain::on_toFixedBtn_clicked() void wfmain::on_toFixedBtn_clicked()
{ {
emit setScopeFixedEdge(oldLowerFreq, oldUpperFreq, ui->scopeEdgeCombo->currentIndex()+1); int currentEdge = ui->scopeEdgeCombo->currentIndex();
emit setScopeEdge(ui->scopeEdgeCombo->currentIndex()+1); bool dialogOk = false;
issueDelayedCommand(cmdScopeFixedMode); bool numOk = false;
QStringList edges;
edges << "1" << "2" << "3" << "4";
QString item = QInputDialog::getItem(this, "Select Edge", "Edge to replace:", edges, currentEdge, false, &dialogOk);
if(dialogOk)
{
int edge = QString(item).toInt(&numOk,10);
if(numOk)
{
emit setScopeFixedEdge(oldLowerFreq, oldUpperFreq, edge);
emit setScopeEdge(edge);
ui->scopeEdgeCombo->blockSignals(true);
ui->scopeEdgeCombo->setCurrentIndex(edge-1);
ui->scopeEdgeCombo->blockSignals(false);
issueDelayedCommand(cmdScopeFixedMode);
}
}
} }
@ -6307,6 +6351,18 @@ void wfmain::resizePlasmaBuffer(int newSize)
plasmaMutex.unlock(); plasmaMutex.unlock();
} }
void wfmain::clearPlasmaBuffer()
{
QByteArray empty((int)spectWidth, '\x01');
plasmaMutex.lock();
int pSize = spectrumPlasma.size();
for(int i=0; i < pSize; i++)
{
spectrumPlasma[i] = empty;
}
plasmaMutex.unlock();
}
void wfmain::on_underlayNone_toggled(bool checked) void wfmain::on_underlayNone_toggled(bool checked)
{ {
ui->underlayBufferSlider->setDisabled(checked); ui->underlayBufferSlider->setDisabled(checked);
@ -7110,3 +7166,51 @@ void wfmain::messageHandler(QtMsgType type, const QMessageLogContext& context, c
logStringBuffer.push_front(text); logStringBuffer.push_front(text);
logTextMutex.unlock(); logTextMutex.unlock();
} }
void wfmain::on_customEdgeBtn_clicked()
{
double lowFreq = oldLowerFreq;
double highFreq = oldUpperFreq;
QString freqstring = QString("%1, %2").arg(lowFreq).arg(highFreq);
bool ok;
QString userFreq = QInputDialog::getText(this, "Scope Edges",
"Please enter desired scope edges, in MHz, \
with a comma between the low and high range.",
QLineEdit::Normal, freqstring, &ok);
if(!ok)
return;
QString clean = userFreq.trimmed().replace(" ", "");
QStringList freqs = clean.split(",");
if(freqs.length() == 2)
{
lowFreq = QString(freqs.at(0)).toDouble(&ok);
if(ok)
{
highFreq = QString(freqs.at(1)).toDouble(&ok);
if(ok)
{
qDebug(logGui()) << "setting edge to: " << lowFreq << ", " << highFreq << ", edge num: " << ui->scopeEdgeCombo->currentIndex() + 1;
emit setScopeFixedEdge(lowFreq, highFreq, ui->scopeEdgeCombo->currentIndex() + 1);
return;
}
}
goto errMsg;
} else {
goto errMsg;
}
errMsg:
{
QMessageBox URLmsgBox;
URLmsgBox.setText("Error, could not interpret your input.\
<br/>Please make sure to place a comma between the frequencies.\
<br/>For example: '7.200, 7.300'");
URLmsgBox.exec();
return;
}
}

4
wfmain.h
Wyświetl plik

@ -645,6 +645,8 @@ private slots:
void on_audioSystemServerCombo_currentIndexChanged(int index); void on_audioSystemServerCombo_currentIndexChanged(int index);
void on_customEdgeBtn_clicked();
private: private:
Ui::wfmain *ui; Ui::wfmain *ui;
void closeEvent(QCloseEvent *event); void closeEvent(QCloseEvent *event);
@ -771,6 +773,7 @@ private:
underlay_t underlayMode = underlayNone; underlay_t underlayMode = underlayNone;
QMutex plasmaMutex; QMutex plasmaMutex;
void resizePlasmaBuffer(int newSize); void resizePlasmaBuffer(int newSize);
void clearPlasmaBuffer();
double plotFloor = 0; double plotFloor = 0;
double plotCeiling = 160; double plotCeiling = 160;
@ -785,6 +788,7 @@ private:
bool onFullscreen; bool onFullscreen;
bool freqTextSelected; bool freqTextSelected;
void checkFreqSel(); void checkFreqSel();
void setUISpectrumControlsToMode(spectrumMode smode);
double oldLowerFreq; double oldLowerFreq;
double oldUpperFreq; double oldUpperFreq;

18
wfmain.ui
Wyświetl plik

@ -18,7 +18,7 @@
<item> <item>
<widget class="QTabWidget" name="tabWidget"> <widget class="QTabWidget" name="tabWidget">
<property name="currentIndex"> <property name="currentIndex">
<number>3</number> <number>0</number>
</property> </property>
<widget class="QWidget" name="mainTab"> <widget class="QWidget" name="mainTab">
<attribute name="title"> <attribute name="title">
@ -117,6 +117,16 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QPushButton" name="customEdgeBtn">
<property name="toolTip">
<string>Define a custom (fixed) scope edge</string>
</property>
<property name="text">
<string>Custom Edge</string>
</property>
</widget>
</item>
<item> <item>
<widget class="QPushButton" name="toFixedBtn"> <widget class="QPushButton" name="toFixedBtn">
<property name="toolTip"> <property name="toolTip">
@ -3333,8 +3343,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>194</width> <width>204</width>
<height>563</height> <height>582</height>
</rect> </rect>
</property> </property>
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QGridLayout" name="gridLayout_2">
@ -4826,7 +4836,7 @@
<resources/> <resources/>
<connections/> <connections/>
<buttongroups> <buttongroups>
<buttongroup name="underlayButtonGroup"/>
<buttongroup name="buttonGroup"/> <buttongroup name="buttonGroup"/>
<buttongroup name="underlayButtonGroup"/>
</buttongroups> </buttongroups>
</ui> </ui>

2
wfserver.pro
Wyświetl plik

@ -13,7 +13,7 @@ TEMPLATE = app
CONFIG += console CONFIG += console
DEFINES += WFVIEW_VERSION=\\\"1.45\\\" DEFINES += WFVIEW_VERSION=\\\"1.46\\\"
DEFINES += BUILD_WFSERVER DEFINES += BUILD_WFSERVER

2
wfview.pro
Wyświetl plik

@ -11,7 +11,7 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport
TARGET = wfview TARGET = wfview
TEMPLATE = app TEMPLATE = app
DEFINES += WFVIEW_VERSION=\\\"1.45\\\" DEFINES += WFVIEW_VERSION=\\\"1.46\\\"
DEFINES += BUILD_WFVIEW DEFINES += BUILD_WFVIEW