kopia lustrzana https://gitlab.com/eliggett/wfview
Fixed mode select bug. Added some preliminary hooks for changing the
theme to dark.merge-requests/1/merge
rodzic
4d86ab11cc
commit
24c8ec5a09
|
@ -20,7 +20,6 @@ commHandler::commHandler()
|
||||||
openPort();
|
openPort();
|
||||||
|
|
||||||
connect(port, SIGNAL(readyRead()), this, SLOT(receiveDataIn()));
|
connect(port, SIGNAL(readyRead()), this, SLOT(receiveDataIn()));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
commHandler::~commHandler()
|
commHandler::~commHandler()
|
||||||
|
|
|
@ -106,7 +106,7 @@ void rigCommander::setScopeSpan(char span)
|
||||||
// See ICD, page 165, "19-12".
|
// See ICD, page 165, "19-12".
|
||||||
// 2.5k = 0
|
// 2.5k = 0
|
||||||
// 5k = 2, etc.
|
// 5k = 2, etc.
|
||||||
if((span <1 ) || (span >7))
|
if((span <0 ) || (span >7))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
QByteArray payload;
|
QByteArray payload;
|
||||||
|
@ -172,7 +172,7 @@ void rigCommander::setFrequency(double freq)
|
||||||
cmdPayload.append(freqPayload);
|
cmdPayload.append(freqPayload);
|
||||||
cmdPayload.prepend('\x00');
|
cmdPayload.prepend('\x00');
|
||||||
|
|
||||||
printHex(cmdPayload, false, true);
|
//printHex(cmdPayload, false, true);
|
||||||
prepDataAndSend(cmdPayload);
|
prepDataAndSend(cmdPayload);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
23
wfmain.cpp
23
wfmain.cpp
|
@ -8,8 +8,17 @@ wfmain::wfmain(QWidget *parent) :
|
||||||
ui(new Ui::wfmain)
|
ui(new Ui::wfmain)
|
||||||
{
|
{
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
|
theParent = parent;
|
||||||
plot = ui->plot; // rename it waterfall.
|
plot = ui->plot; // rename it waterfall.
|
||||||
wf = ui->waterfall;
|
wf = ui->waterfall;
|
||||||
|
tracer = new QCPItemTracer(plot);
|
||||||
|
//tracer->setGraphKey(5.5);
|
||||||
|
tracer->setInterpolating(true);
|
||||||
|
tracer->setStyle(QCPItemTracer::tsPlus);
|
||||||
|
|
||||||
|
tracer->setPen(QPen(Qt::green));
|
||||||
|
tracer->setBrush(Qt::green);
|
||||||
|
tracer->setSize(7);
|
||||||
|
|
||||||
spectWidth = 475; // fixed for now
|
spectWidth = 475; // fixed for now
|
||||||
wfLength = 160; // fixed for now
|
wfLength = 160; // fixed for now
|
||||||
|
@ -37,6 +46,8 @@ wfmain::wfmain(QWidget *parent) :
|
||||||
edges << "1" << "2" << "3"; // yep
|
edges << "1" << "2" << "3"; // yep
|
||||||
ui->scopeEdgeCombo->insertItems(0,edges);
|
ui->scopeEdgeCombo->insertItems(0,edges);
|
||||||
|
|
||||||
|
ui->splitter->setHandleWidth(5);
|
||||||
|
|
||||||
// comm = new commHandler();
|
// comm = new commHandler();
|
||||||
rig = new rigCommander();
|
rig = new rigCommander();
|
||||||
rigThread = new QThread(this);
|
rigThread = new QThread(this);
|
||||||
|
@ -72,6 +83,7 @@ wfmain::wfmain(QWidget *parent) :
|
||||||
ui->plot->addGraph(); // primary
|
ui->plot->addGraph(); // primary
|
||||||
ui->plot->addGraph(0, 0); // secondary, peaks, same axis as first?
|
ui->plot->addGraph(0, 0); // secondary, peaks, same axis as first?
|
||||||
ui->waterfall->addGraph();
|
ui->waterfall->addGraph();
|
||||||
|
tracer->setGraph(plot->graph(0));
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -105,6 +117,7 @@ wfmain::wfmain(QWidget *parent) :
|
||||||
delayedCommand->setSingleShot(true);
|
delayedCommand->setSingleShot(true);
|
||||||
connect(delayedCommand, SIGNAL(timeout()), this, SLOT(runDelayedCommand()));
|
connect(delayedCommand, SIGNAL(timeout()), this, SLOT(runDelayedCommand()));
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
wfmain::~wfmain()
|
wfmain::~wfmain()
|
||||||
|
@ -113,6 +126,11 @@ wfmain::~wfmain()
|
||||||
delete ui;
|
delete ui;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void wfmain::setDarkTheme(bool dark)
|
||||||
|
{
|
||||||
|
//theParent->setStyle();
|
||||||
|
}
|
||||||
|
|
||||||
void wfmain::runDelayedCommand()
|
void wfmain::runDelayedCommand()
|
||||||
{
|
{
|
||||||
// switch case on enum
|
// switch case on enum
|
||||||
|
@ -133,6 +151,7 @@ void wfmain::receiveFreq(double freqMhz)
|
||||||
{
|
{
|
||||||
//qDebug() << "Frequency: " << freqMhz;
|
//qDebug() << "Frequency: " << freqMhz;
|
||||||
ui->freqLabel->setText(QString("%1").arg(freqMhz, 0, 'f'));
|
ui->freqLabel->setText(QString("%1").arg(freqMhz, 0, 'f'));
|
||||||
|
this->freqMhz = freqMhz;
|
||||||
}
|
}
|
||||||
|
|
||||||
void wfmain::receiveSpectrumData(QByteArray spectrum, double startFreq, double endFreq)
|
void wfmain::receiveSpectrumData(QByteArray spectrum, double startFreq, double endFreq)
|
||||||
|
@ -186,6 +205,10 @@ void wfmain::receiveSpectrumData(QByteArray spectrum, double startFreq, double e
|
||||||
|
|
||||||
//ui->qcp->addGraph();
|
//ui->qcp->addGraph();
|
||||||
plot->graph(0)->setData(x,y);
|
plot->graph(0)->setData(x,y);
|
||||||
|
if((freqMhz < endFreq) && (freqMhz > startFreq))
|
||||||
|
{
|
||||||
|
tracer->setGraphKey(freqMhz);
|
||||||
|
}
|
||||||
if(drawPeaks)
|
if(drawPeaks)
|
||||||
{
|
{
|
||||||
plot->graph(1)->setData(x,y2); // peaks
|
plot->graph(1)->setData(x,y2); // peaks
|
||||||
|
|
5
wfmain.h
5
wfmain.h
|
@ -98,7 +98,11 @@ private:
|
||||||
Ui::wfmain *ui;
|
Ui::wfmain *ui;
|
||||||
QCustomPlot *plot; // line plot
|
QCustomPlot *plot; // line plot
|
||||||
QCustomPlot *wf; // waterfall image
|
QCustomPlot *wf; // waterfall image
|
||||||
|
QCPItemTracer * tracer; // marker of current frequency
|
||||||
//commHandler *comm;
|
//commHandler *comm;
|
||||||
|
void setDarkTheme(bool dark);
|
||||||
|
QWidget * theParent;
|
||||||
|
|
||||||
rigCommander * rig;
|
rigCommander * rig;
|
||||||
QThread * rigThread;
|
QThread * rigThread;
|
||||||
QCPColorMap * colorMap;
|
QCPColorMap * colorMap;
|
||||||
|
@ -127,6 +131,7 @@ private:
|
||||||
|
|
||||||
double oldLowerFreq;
|
double oldLowerFreq;
|
||||||
double oldUpperFreq;
|
double oldUpperFreq;
|
||||||
|
double freqMhz;
|
||||||
enum cmds {cmdGetFreq, cmdGetMode, cmdGetDataMode};
|
enum cmds {cmdGetFreq, cmdGetMode, cmdGetDataMode};
|
||||||
cmds cmdOut;
|
cmds cmdOut;
|
||||||
|
|
||||||
|
|
15
wfmain.ui
15
wfmain.ui
|
@ -18,7 +18,7 @@
|
||||||
<item>
|
<item>
|
||||||
<widget class="QTabWidget" name="tabWidget">
|
<widget class="QTabWidget" name="tabWidget">
|
||||||
<property name="currentIndex">
|
<property name="currentIndex">
|
||||||
<number>2</number>
|
<number>0</number>
|
||||||
</property>
|
</property>
|
||||||
<widget class="QWidget" name="mainTab">
|
<widget class="QWidget" name="mainTab">
|
||||||
<attribute name="title">
|
<attribute name="title">
|
||||||
|
@ -916,6 +916,19 @@
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
<item>
|
||||||
|
<spacer name="horizontalSpacer_4">
|
||||||
|
<property name="orientation">
|
||||||
|
<enum>Qt::Horizontal</enum>
|
||||||
|
</property>
|
||||||
|
<property name="sizeHint" stdset="0">
|
||||||
|
<size>
|
||||||
|
<width>40</width>
|
||||||
|
<height>20</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
</spacer>
|
||||||
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
|
|
Ładowanie…
Reference in New Issue