w4kek
/
WSJT-X
mirror of https://github.com/saitohirga/WSJT-X.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Code cleanup... remove unused variables, etc. 

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2617 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2012-09-29 18:11:44 +00:00
parent e08e441048
commit f77af814e8
6 changed files with 15 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mainwindow.cpp
View File

@ -331,7 +331,7 @@ void MainWindow::dataSink(int k)
lab4->setText(t);
ui->xThermo->setValue((double)px); //Update the thermometer
if(m_monitoring || m_diskData) {
g_pWideGraph->dataSink2(s,nkhz,ihsym,m_diskData,lstrong);
g_pWideGraph->dataSink2(s,ihsym,m_diskData,lstrong);
}
//Average over specified number of spectra

17
plotter.cpp
View File

@ -15,7 +15,6 @@ CPlotter::CPlotter(QWidget *parent) : //CPlotter Constructor
setAttribute(Qt::WA_OpaquePaintEvent, false);
setAttribute(Qt::WA_NoSystemBackground, true);
m_CenterFreq = 1500;
m_StartFreq = 1000;
m_nSpan=1000; //Units: Hz
m_fSpan=(float)m_nSpan;
@ -63,7 +62,6 @@ void CPlotter::resizeEvent(QResizeEvent* ) //resizeEvent()
m_ScalePixmap.fill(Qt::white);
m_LowerScalePixmap.fill(Qt::yellow);
}
SetCenterFreq(-1);
DrawOverlay();
}
@ -250,7 +248,6 @@ void CPlotter::DrawOverlay() //DrawOverlay()
}
}
QPen pen0(Qt::green, 3); //Mark Cal Freq with green tick
painter0.setPen(pen0);
x = m_xClick;
@ -342,15 +339,6 @@ int CPlotter::getPlotGain() //getPlotGain()
return m_plotGain;
}
void CPlotter::SetCenterFreq(int f) //setCenterFreq()
{
}
qint64 CPlotter::centerFreq() //centerFreq()
{
return m_CenterFreq;
}
void CPlotter::SetStartFreq(quint64 f) //SetStartFreq()
{
m_StartFreq=f;
@ -401,11 +389,6 @@ void CPlotter::setFcal(int n) //setFcal()
m_fCal=n;
}
void CPlotter::setNkhz(int n) //setNkhz()
{
m_nkhz=n;
}
int CPlotter::fQSO() {return m_fQSO;} //get fQSO
int CPlotter::DF() {return m_DF;} // get DF

7
plotter.h
View File

@ -42,8 +42,6 @@ public:
int getPlotZero();
void setPlotGain(int plotGain);
int getPlotGain();
void SetCenterFreq(int f);
qint64 centerFreq();
void SetStartFreq(quint64 f);
qint64 startFreq();
int plotWidth();
@ -55,14 +53,12 @@ public:
int binsPerPixel();
void setFQSO(int n, bool bf);
void setFcal(int n);
void setNkhz(int n);
void DrawOverlay();
int fQSO();
int DF();
int autoZero();
void setPalette(QString palette);
void setFsample(int n);
void set2Dspec(bool b);
void setNsps(int n);
double fGreen();
@ -92,8 +88,6 @@ private:
QString m_HDivText[483];
bool m_Running;
bool m_paintEventBusy;
bool m_2Dspec;
double m_CenterFreq;
double m_fGreen;
double m_fftBinWidth;
qint64 m_StartFreq;
@ -107,7 +101,6 @@ private:
qint32 m_hist2[256];
qint32 m_z1;
qint32 m_z2;
qint32 m_nkhz;
qint32 m_fSample;
qint32 m_i0;
qint32 m_xClick;

32
widegraph.cpp
View File

@ -36,9 +36,8 @@ WideGraph::WideGraph(QWidget *parent) :
ui->widePlot->setBinsPerPixel(nbpp);
m_waterfallAvg = settings.value("WaterfallAvg",10).toInt();
ui->waterfallAvgSpinBox->setValue(m_waterfallAvg);
m_dForceCenterFreq=settings.value("ForceCenterFreqMHz",473.000).toDouble();
// ui->cbFcenter->setChecked(m_bForceCenterFreq);
ui->fCenterLineEdit->setText(QString::number(m_dForceCenterFreq));
m_dialFreq=settings.value("DialFreqMHz",473.000).toDouble();
ui->fDialLineEdit->setText(QString::number(m_dialFreq));
settings.endGroup();
}
@ -62,11 +61,11 @@ void WideGraph::saveSettings()
settings.setValue("PlotWidth",ui->widePlot->plotWidth());
settings.setValue("FreqSpan",ui->freqSpanSpinBox->value());
settings.setValue("WaterfallAvg",ui->waterfallAvgSpinBox->value());
settings.setValue("ForceCenterFreqMHz",m_dForceCenterFreq);
settings.setValue("DialFreqMHz",m_dialFreq);
settings.endGroup();
}
void WideGraph::dataSink2(float s[], int nkhz, int ihsym, int ndiskdata,
void WideGraph::dataSink2(float s[], int ihsym, int ndiskdata,
uchar lstrong[])
{
static float splot[NSMAX];
@ -79,15 +78,8 @@ void WideGraph::dataSink2(float s[], int nkhz, int ihsym, int ndiskdata,
static int ntr0=0;
df = 12000.0/m_nsps;
if(nkhz != nkhz0) {
ui->widePlot->setNkhz(nkhz); //Why do we need both?
ui->widePlot->SetCenterFreq(nkhz); //Why do we need both?
ui->widePlot->setFQSO(nkhz,true);
nkhz0 = nkhz;
}
//Average spectra over specified number, m_waterfallAvg
// qDebug() << "C" << ihsym << NSMAX << df << nbpp;
if (n==0) {
for (int i=0; i<NSMAX; i++)
splot[i]=s[i];
@ -103,29 +95,25 @@ void WideGraph::dataSink2(float s[], int nkhz, int ihsym, int ndiskdata,
n=0;
int w=ui->widePlot->plotWidth();
// if(sf != ui->widePlot->startFreq()) ui->widePlot->SetStartFreq(sf);
// int i0=16384.0+(ui->widePlot->startFreq()-nkhz+1.27046+0.001*m_fCal) *
// 1000.0/df + 0.5;
int i0=0; //###
// nbpp=1; //###
int i=i0;
for (int j=0; j<2048; j++) {
/*
smax=0;
for (int k=0; k<nbpp; k++) {
if(splot[i]>smax) smax=splot[i];
i++;
}
swide[j]=smax;
/*
*/
float sum=0;
for (int k=0; k<nbpp; k++) {
i++;
sum += splot[i];
}
swide[j]=sum;
*/
if(lstrong[1 + i/32]!=0) swide[j]=-smax; //Tag strong signals
}
@ -249,9 +237,9 @@ void WideGraph::setPalette(QString palette)
ui->widePlot->setPalette(palette);
}
void WideGraph::on_fCenterLineEdit_editingFinished()
void WideGraph::on_fDialLineEdit_editingFinished()
{
m_dForceCenterFreq=ui->fCenterLineEdit->text().toDouble();
m_dialFreq=ui->fDialLineEdit->text().toDouble();
}
void WideGraph::initIQplus()

7
widegraph.h
View File

@ -14,9 +14,9 @@ public:
explicit WideGraph(QWidget *parent = 0);
~WideGraph();
double m_dForceCenterFreq;
double m_dialFreq;
void dataSink2(float s[], int nkhz, int ihsym, int ndiskdata,
void dataSink2(float s[], int ihsym, int ndiskdata,
uchar lstrong[]);
int QSOfreq();
int nSpan();
@ -52,8 +52,7 @@ private slots:
void on_zeroSpinBox_valueChanged(int arg1);
void on_gainSpinBox_valueChanged(int arg1);
void on_autoZeroPushButton_clicked();
// void on_cbFcenter_stateChanged(int arg1);
void on_fCenterLineEdit_editingFinished();
void on_fDialLineEdit_editingFinished();
private:
qint32 m_waterfallAvg;

2
widegraph.ui
View File

@ -282,7 +282,7 @@
</widget>
</item>
<item>
<widget class="QLineEdit" name="fCenterLineEdit">
<widget class="QLineEdit" name="fDialLineEdit">
<property name="enabled">
<bool>true</bool>
</property>