mirror of https://github.com/saitohirga/WSJT-X.git
Removed freqOffset spinBox.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2611 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor
parent
26261700ee
commit
6469c6d96e
14
plotter.cpp
14
plotter.cpp
|
|
@ -373,13 +373,6 @@ int CPlotter::getPlotGain() //getPlotGain()
|
|||
|
||||
void CPlotter::SetCenterFreq(int f) //setCenterFreq()
|
||||
{
|
||||
/*
|
||||
// f is the integer kHz portion of cfreq, from Linrad packets
|
||||
if(f<0) f=m_nkhz;
|
||||
int ns = (f+m_FreqOffset-0.5*m_fSpan)/5.0 + 0.5;
|
||||
double fs = 5*ns;
|
||||
m_CenterFreq = fs + 0.5*m_fSpan;
|
||||
*/
|
||||
}
|
||||
|
||||
qint64 CPlotter::centerFreq() //centerFreq()
|
||||
|
|
@ -399,13 +392,6 @@ qint64 CPlotter::startFreq() //startFreq()
|
|||
return m_StartFreq;
|
||||
}
|
||||
|
||||
void CPlotter::SetFreqOffset(quint64 f) //SetFreqOffset()
|
||||
{
|
||||
m_FreqOffset=f;
|
||||
DrawOverlay();
|
||||
}
|
||||
|
||||
qint64 CPlotter::freqOffset() {return m_FreqOffset;} //freqOffset()
|
||||
int CPlotter::plotWidth(){return m_WaterfallPixmap.width();}
|
||||
void CPlotter::UpdateOverlay() {DrawOverlay();}
|
||||
void CPlotter::setDataFromDisk(bool b) {m_dataFromDisk=b;}
|
||||
|
|
|
|||
|
|
@ -47,8 +47,6 @@ public:
|
|||
qint64 centerFreq();
|
||||
void SetStartFreq(quint64 f);
|
||||
qint64 startFreq();
|
||||
void SetFreqOffset(quint64 f);
|
||||
qint64 freqOffset();
|
||||
int plotWidth();
|
||||
void setNSpan(int n);
|
||||
void UpdateOverlay();
|
||||
|
|
@ -103,7 +101,6 @@ private:
|
|||
double m_fGreen;
|
||||
qint64 m_StartFreq;
|
||||
qint64 m_ZoomStartFreq;
|
||||
qint64 m_FreqOffset;
|
||||
qint32 m_dBStepSize;
|
||||
qint32 m_FreqUnits;
|
||||
qint32 m_hdivs;
|
||||
|
|
|
|||
|
|
@ -36,7 +36,6 @@ WideGraph::WideGraph(QWidget *parent) :
|
|||
ui->widePlot->setBinsPerPixel(nbpp);
|
||||
m_waterfallAvg = settings.value("WaterfallAvg",10).toInt();
|
||||
ui->waterfallAvgSpinBox->setValue(m_waterfallAvg);
|
||||
ui->freqOffsetSpinBox->setValue(settings.value("FreqOffset",0).toInt());
|
||||
m_dForceCenterFreq=settings.value("ForceCenterFreqMHz",473.000).toDouble();
|
||||
// ui->cbFcenter->setChecked(m_bForceCenterFreq);
|
||||
ui->fCenterLineEdit->setText(QString::number(m_dForceCenterFreq));
|
||||
|
|
@ -63,7 +62,6 @@ void WideGraph::saveSettings()
|
|||
settings.setValue("PlotWidth",ui->widePlot->plotWidth());
|
||||
settings.setValue("FreqSpan",ui->freqSpanSpinBox->value());
|
||||
settings.setValue("WaterfallAvg",ui->waterfallAvgSpinBox->value());
|
||||
settings.setValue("FreqOffset",ui->widePlot->freqOffset());
|
||||
settings.setValue("ForceCenterFreqMHz",m_dForceCenterFreq);
|
||||
settings.endGroup();
|
||||
}
|
||||
|
|
@ -105,7 +103,6 @@ void WideGraph::dataSink2(float s[], int nkhz, int ihsym, int ndiskdata,
|
|||
n=0;
|
||||
|
||||
int w=ui->widePlot->plotWidth();
|
||||
// qint64 sf = nkhz + ui->widePlot->freqOffset() - 0.5*w*nbpp*df/1000.0;
|
||||
// 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;
|
||||
|
|
@ -150,11 +147,6 @@ void WideGraph::dataSink2(float s[], int nkhz, int ihsym, int ndiskdata,
|
|||
}
|
||||
}
|
||||
|
||||
void WideGraph::on_freqOffsetSpinBox_valueChanged(int f)
|
||||
{
|
||||
ui->widePlot->SetFreqOffset(f);
|
||||
}
|
||||
|
||||
void WideGraph::on_freqSpanSpinBox_valueChanged(int n)
|
||||
{
|
||||
ui->widePlot->setNSpan(n);
|
||||
|
|
|
|||
|
|
@ -50,7 +50,6 @@ protected:
|
|||
private slots:
|
||||
void on_waterfallAvgSpinBox_valueChanged(int arg1);
|
||||
void on_freqSpanSpinBox_valueChanged(int arg1);
|
||||
void on_freqOffsetSpinBox_valueChanged(int arg1);
|
||||
void on_zeroSpinBox_valueChanged(int arg1);
|
||||
void on_gainSpinBox_valueChanged(int arg1);
|
||||
void on_autoZeroPushButton_clicked();
|
||||
|
|
|
|||
66
widegraph.ui
66
widegraph.ui
|
|
@ -46,72 +46,6 @@
|
|||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_3">
|
||||
<item>
|
||||
<spacer name="horizontalSpacer_3">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="sizeType">
|
||||
<enum>QSizePolicy::Preferred</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>20</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QSpinBox" name="freqOffsetSpinBox">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>60</width>
|
||||
<height>0</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>60</width>
|
||||
<height>16777215</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="suffix">
|
||||
<string> Hz</string>
|
||||
</property>
|
||||
<property name="minimum">
|
||||
<number>-500</number>
|
||||
</property>
|
||||
<property name="maximum">
|
||||
<number>500</number>
|
||||
</property>
|
||||
<property name="singleStep">
|
||||
<number>1</number>
|
||||
</property>
|
||||
<property name="value">
|
||||
<number>0</number>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLabel" name="f0Label">
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>50</width>
|
||||
<height>0</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Freq Offset</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="horizontalSpacer_4">
|
||||
<property name="orientation">
|
||||
|
|
|
|||
Loading…
Reference in New Issue