mirror of
https://github.com/saitohirga/WSJT-X.git
synced 2024-12-24 11:40:31 -05:00
Re-configuring WideGraph.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/jtms3@2496 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
parent
ac38b48549
commit
e017ba39d6
@ -198,7 +198,6 @@ MainWindow::MainWindow(QWidget *parent) :
|
||||
m_diskData=false;
|
||||
m_tol=500;
|
||||
g_pWideGraph->setTol(m_tol);
|
||||
g_pWideGraph->setFsample(48000);
|
||||
|
||||
// Create "m_worked", a dictionary of all calls in wsjt.log
|
||||
QFile f("wsjt.log");
|
||||
@ -758,7 +757,7 @@ void MainWindow::on_actionWide_Waterfall_triggered() //Display Waterfalls
|
||||
connect(g_pWideGraph, SIGNAL(f11f12(int)),this,
|
||||
SLOT(bumpDF(int)));
|
||||
}
|
||||
// g_pWideGraph->show();
|
||||
g_pWideGraph->show();
|
||||
}
|
||||
|
||||
void MainWindow::on_actionOpen_triggered() //Open File
|
||||
|
@ -36,11 +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_bForceCenterFreq=settings.value("ForceCenterFreqBool",false).toBool();
|
||||
m_dForceCenterFreq=settings.value("ForceCenterFreqMHz",144.125).toDouble();
|
||||
ui->cbFcenter->setChecked(m_bForceCenterFreq);
|
||||
ui->fCenterLineEdit->setText(QString::number(m_dForceCenterFreq));
|
||||
settings.endGroup();
|
||||
}
|
||||
|
||||
@ -250,65 +245,6 @@ void WideGraph::setPalette(QString palette)
|
||||
{
|
||||
ui->widePlot->setPalette(palette);
|
||||
}
|
||||
void WideGraph::setFsample(int n)
|
||||
{
|
||||
m_fSample=n;
|
||||
ui->widePlot->setFsample(n);
|
||||
}
|
||||
|
||||
void WideGraph::setMode65(int n)
|
||||
{
|
||||
m_mode65=n;
|
||||
ui->widePlot->setMode65(n);
|
||||
}
|
||||
|
||||
void WideGraph::on_cbFcenter_stateChanged(int n)
|
||||
{
|
||||
m_bForceCenterFreq = (n!=0);
|
||||
if(m_bForceCenterFreq) {
|
||||
ui->fCenterLineEdit->setEnabled(true);
|
||||
ui->pbSetRxHardware->setEnabled(true);
|
||||
} else {
|
||||
ui->fCenterLineEdit->setDisabled(true);
|
||||
ui->pbSetRxHardware->setDisabled(true);
|
||||
}
|
||||
}
|
||||
|
||||
void WideGraph::on_fCenterLineEdit_editingFinished()
|
||||
{
|
||||
m_dForceCenterFreq=ui->fCenterLineEdit->text().toDouble();
|
||||
}
|
||||
|
||||
void WideGraph::on_pbSetRxHardware_clicked()
|
||||
{/*
|
||||
#ifdef WIN32
|
||||
int iret=set570(m_mult570*(1.0+0.000001*m_cal570)*m_dForceCenterFreq);
|
||||
if(iret != 0) {
|
||||
QMessageBox mb;
|
||||
if(iret==-1) mb.setText("Failed to open Si570.");
|
||||
if(iret==-2) mb.setText("Frequency out of permitted range.");
|
||||
mb.exec();
|
||||
}
|
||||
#endif
|
||||
*/
|
||||
}
|
||||
|
||||
void WideGraph::initIQplus()
|
||||
{
|
||||
/*
|
||||
#ifdef WIN32
|
||||
// int iret=set570(288.0);
|
||||
if(iret != 0) {
|
||||
QMessageBox mb;
|
||||
if(iret==-1) mb.setText("Failed to open Si570.");
|
||||
if(iret==-2) mb.setText("Frequency out of permitted range.");
|
||||
mb.exec();
|
||||
} else {
|
||||
on_pbSetRxHardware_clicked();
|
||||
}
|
||||
#endif
|
||||
*/
|
||||
}
|
||||
|
||||
void WideGraph::on_cbSpec2d_toggled(bool b)
|
||||
{
|
||||
|
@ -32,7 +32,6 @@ public:
|
||||
void setTol(int n);
|
||||
void setFcal(int n);
|
||||
void setPalette(QString palette);
|
||||
void setFsample(int n);
|
||||
void setMode65(int n);
|
||||
double fGreen();
|
||||
|
||||
@ -44,7 +43,6 @@ signals:
|
||||
|
||||
public slots:
|
||||
void wideFreezeDecode(int n);
|
||||
void initIQplus();
|
||||
|
||||
protected:
|
||||
virtual void keyPressEvent( QKeyEvent *e );
|
||||
@ -56,9 +54,6 @@ 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_pbSetRxHardware_clicked();
|
||||
void on_cbSpec2d_toggled(bool checked);
|
||||
|
||||
private:
|
||||
|
107
widegraph.ui
107
widegraph.ui
@ -6,7 +6,7 @@
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>1178</width>
|
||||
<width>780</width>
|
||||
<height>326</height>
|
||||
</rect>
|
||||
</property>
|
||||
@ -62,72 +62,6 @@
|
||||
</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> kHz</string>
|
||||
</property>
|
||||
<property name="minimum">
|
||||
<number>-24</number>
|
||||
</property>
|
||||
<property name="maximum">
|
||||
<number>24</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">
|
||||
<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="freqSpanSpinBox">
|
||||
<property name="sizePolicy">
|
||||
@ -363,45 +297,6 @@
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QCheckBox" name="cbFcenter">
|
||||
<property name="text">
|
||||
<string>Force Center Freq (MHz)</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLineEdit" name="fCenterLineEdit">
|
||||
<property name="enabled">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>65</width>
|
||||
<height>16777215</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>1296.065</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="pbSetRxHardware">
|
||||
<property name="enabled">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Set Rx Freq</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
</layout>
|
||||
|
Loading…
Reference in New Issue
Block a user