w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-19 10:32:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

1. Revision 3513 mistakenly removed needed changes to plotter.cpp.

Browse Source 
They are restored here.
2. Fix a bug that failed to compute correct audio Tx frequency after
program restart, if Split Tx is enabled.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3516 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2013-07-31 20:18:52 +00:00
parent 4ad8294620
commit 0db0574ad3
2 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mainwindow.cpp
View File

@ -643,8 +643,8 @@ void MainWindow::readSettings()
m_fMin=settings.value("fMin",2500).toInt(); m_fMin=settings.value("fMin",2500).toInt();
m_bSplit=settings.value("TxSplit",false).toBool(); m_bSplit=settings.value("TxSplit",false).toBool();
m_bXIT=settings.value("UseXit",false).toBool(); m_bXIT=settings.value("UseXit",false).toBool();
m_plus2kHz=settings.value("Plus2kHz",false).toBool(); m_plus2kHz=settings.value("Plus2kHz",false).toBool();
ui->cbPlus2kHz->setChecked(m_plus2kHz); ui->cbPlus2kHz->setChecked(m_plus2kHz);
settings.endGroup(); settings.endGroup();
if(!ui->actionLinrad->isChecked() and !ui->actionCuteSDR->isChecked()and if(!ui->actionLinrad->isChecked() and !ui->actionCuteSDR->isChecked()and
@ -1861,7 +1861,16 @@ void MainWindow::guiUpdate()
} }
if(m_catEnabled and !m_bRigOpen) { if(m_catEnabled and !m_bRigOpen) {
rigOpen(); rigOpen();
if(m_bSplit or m_bXIT) setXIT(m_txFreq);
if(m_bRigOpen and !m_bSplit) {
int ret=rig->setSplitFreq(MHz(m_dialFreq),RIG_VFO_B);
if(ret!=RIG_OK) {
QString rt;
rt.sprintf("Setting VFO_B failed: %d",ret);
msgBox(rt);
}
}
} }
if(nsec != m_sec0) { //Once per second if(nsec != m_sec0) { //Once per second

33
plotter.cpp
View File

@ -488,28 +488,29 @@ void CPlotter::setPalette(QString palette) //setPalette()
return; return;
} }
FILE* fp=NULL; QFile f;
if(palette=="Blue") fp=fopen("blue.dat","r"); if(palette=="Blue") f.setFileName("blue.dat");
if(palette=="AFMHot") fp=fopen("afmhot.dat","r"); if(palette=="AFMHot") f.setFileName("afmhot.dat");
if(palette=="Gray1") fp=fopen("gray1.dat","r"); if(palette=="Gray1") f.setFileName("gray1.dat");
if(fp==NULL) { if(f.open(QIODevice::ReadOnly)) {
QTextStream in(&f);
int n,r,g,b;
float xr,xg,xb;
for(int i=0; i<256; i++) {
in >> n >> xr >> xg >> xb;
r=255.0*xr + 0.5;
g=255.0*xg + 0.5;
b=255.0*xb + 0.5;
m_ColorTbl[i].setRgb(r,g,b);
}
f.close();
} else {
QMessageBox msgBox0; QMessageBox msgBox0;
QString t="Error: Cannot find requested palette file."; QString t="Error: Cannot find requested palette file.";
msgBox0.setText(t); msgBox0.setText(t);
msgBox0.exec(); msgBox0.exec();
return; return;
} }
int n,r,g,b;
float xr,xg,xb;
for(int i=0; i<256; i++) {
int nn=fscanf(fp,"%d%f%f%f",&n,&xr,&xg,&xb);
r=255.0*xr + 0.5;
g=255.0*xg + 0.5;
b=255.0*xb + 0.5;
m_ColorTbl[i].setRgb(r,g,b);
if(nn==-999999) i++; //Silence compiler warning
}
} }
double CPlotter::fGreen() double CPlotter::fGreen()