w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-09-27 23:56:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Reset a number of default parameters so they will be consistent with a

Browse Source 
new version of the User's Guide (which itself is not yet finished).


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3112 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2013-03-26 18:54:15 +00:00
parent 85934040c6
commit e7f8b7e0ca
6 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devsetup.ui
View File

@ -86,7 +86,7 @@
</size> </size>
</property> </property>
<property name="text"> <property name="text">
<string>K1JT</string> <string/>
</property> </property>
</widget> </widget>
</item> </item>
@ -155,7 +155,7 @@
</size> </size>
</property> </property>
<property name="text"> <property name="text">
<string>FN20qi</string> <string/>
</property> </property>
</widget> </widget>
</item> </item>

12
mainwindow.cpp
View File

@ -1,4 +1,4 @@
//---------------------------------------------------------------- MainWindow //--------------------------------------------------------------- MainWindow
#include "mainwindow.h" #include "mainwindow.h"
#include "ui_mainwindow.h" #include "ui_mainwindow.h"
#include "devsetup.h" #include "devsetup.h"
@ -128,7 +128,7 @@ MainWindow::MainWindow(QWidget *parent) :
m_killAll=false; m_killAll=false;
m_widebandDecode=false; m_widebandDecode=false;
m_ntx=1; m_ntx=1;
m_myCall="K1JT"; m_myCall="";
m_myGrid="FN20qi"; m_myGrid="FN20qi";
m_appDir = QApplication::applicationDirPath(); m_appDir = QApplication::applicationDirPath();
m_saveDir="/users/joe/wsjtx/install/save"; m_saveDir="/users/joe/wsjtx/install/save";
@ -231,11 +231,11 @@ MainWindow::MainWindow(QWidget *parent) :
m_monitoring=!m_monitorStartOFF; // Start with Monitoring ON/OFF m_monitoring=!m_monitorStartOFF; // Start with Monitoring ON/OFF
soundInThread.setMonitoring(m_monitoring); soundInThread.setMonitoring(m_monitoring);
m_diskData=false; m_diskData=false;
g_pWideGraph->setTol(m_tol);
static int ntol[] = {1,2,5,10,20,50,100,200,500}; static int ntol[] = {1,2,5,10,20,50,100,200,500};
for (int i=0; i<10; i++) { for (int i=0; i<10; i++) {
if(ntol[i]==m_tol) ui->tolSlider->setValue(i); if(ntol[i]==m_tol) ui->tolSlider->setValue(i);
} }
g_pWideGraph->setTol(m_tol);
// Create "m_worked", a dictionary of all calls in wsjtx.log // Create "m_worked", a dictionary of all calls in wsjtx.log
QFile f("wsjtx.log"); QFile f("wsjtx.log");
@ -419,8 +419,8 @@ void MainWindow::readSettings()
m_saveSynced=ui->actionSave_synced->isChecked(); m_saveSynced=ui->actionSave_synced->isChecked();
m_saveDecoded=ui->actionSave_decoded->isChecked(); m_saveDecoded=ui->actionSave_decoded->isChecked();
m_saveAll=ui->actionSave_all->isChecked(); m_saveAll=ui->actionSave_all->isChecked();
m_ndepth=settings.value("NDepth",0).toInt(); m_ndepth=settings.value("NDepth",2).toInt();
m_tol=settings.value("Tol",5).toInt(); m_tol=settings.value("Tol",500).toInt();
m_inGain=settings.value("InGain",0).toInt(); m_inGain=settings.value("InGain",0).toInt();
ui->inGain->setValue(m_inGain); ui->inGain->setValue(m_inGain);
m_kb8rq=settings.value("KB8RQ",false).toBool(); m_kb8rq=settings.value("KB8RQ",false).toBool();
@ -1164,7 +1164,7 @@ void MainWindow::readFromStdout() //readFromStdout
QString bg="white"; QString bg="white";
if(t.indexOf(" CQ ")>0) bg="#66ff66"; //Light green if(t.indexOf(" CQ ")>0) bg="#66ff66"; //Light green
if(t.indexOf(" "+m_myCall+" ")>0) bg="#ff6666"; //Light red if(m_myCall!="" and t.indexOf(" "+m_myCall+" ")>0) bg="#ff6666"; //Light red
//ui->decodedTextBrowser->setTextBackgroundColor(bg); //ui->decodedTextBrowser->setTextBackgroundColor(bg);
//t=t.mid(0,n-2) + " "; //t=t.mid(0,n-2) + " ";
//ui->decodedTextBrowser->append(t); //ui->decodedTextBrowser->append(t);

7
mainwindow.ui
View File

@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>680</width> <width>680</width>
<height>598</height> <height>475</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@ -559,7 +559,7 @@ p, li { white-space: pre-wrap; }
</size> </size>
</property> </property>
<property name="text"> <property name="text">
<string>Tolerance: 50</string> <string>Tolerance: 500</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
@ -580,6 +580,9 @@ p, li { white-space: pre-wrap; }
<property name="maximum"> <property name="maximum">
<number>8</number> <number>8</number>
</property> </property>
<property name="value">
<number>8</number>
</property>
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>

12
widegraph.cpp
View File

@ -30,24 +30,22 @@ WideGraph::WideGraph(QWidget *parent) :
ui->widePlot->setPlotGain(settings.value("PlotGain", 0).toInt()); ui->widePlot->setPlotGain(settings.value("PlotGain", 0).toInt());
ui->zeroSpinBox->setValue(ui->widePlot->getPlotZero()); ui->zeroSpinBox->setValue(ui->widePlot->getPlotZero());
ui->gainSpinBox->setValue(ui->widePlot->getPlotGain()); ui->gainSpinBox->setValue(ui->widePlot->getPlotGain());
int n = settings.value("FreqSpan",1).toInt(); int n = settings.value("FreqSpan",2).toInt();
int w = settings.value("PlotWidth",1000).toInt(); int w = settings.value("PlotWidth",1000).toInt();
ui->widePlot->m_w=w; ui->widePlot->m_w=w;
ui->freqSpanSpinBox->setValue(n); ui->freqSpanSpinBox->setValue(n);
ui->widePlot->setNSpan(n); ui->widePlot->setNSpan(n);
// int nbpp = n * 32768.0/(w*96.0) + 0.5;
ui->widePlot->setBinsPerPixel(1);
m_waterfallAvg = settings.value("WaterfallAvg",5).toInt(); m_waterfallAvg = settings.value("WaterfallAvg",5).toInt();
ui->waterfallAvgSpinBox->setValue(m_waterfallAvg); ui->waterfallAvgSpinBox->setValue(m_waterfallAvg);
ui->widePlot->m_bCurrent=settings.value("Current",true).toBool(); ui->widePlot->m_bCurrent=settings.value("Current",false).toBool();
ui->widePlot->m_bCumulative=settings.value("Cumulative",false).toBool(); ui->widePlot->m_bCumulative=settings.value("Cumulative",false).toBool();
ui->widePlot->m_bJT9Sync=settings.value("JT9Sync",false).toBool(); ui->widePlot->m_bJT9Sync=settings.value("JT9Sync",true).toBool();
if(ui->widePlot->m_bCurrent) ui->spec2dComboBox->setCurrentIndex(0); if(ui->widePlot->m_bCurrent) ui->spec2dComboBox->setCurrentIndex(0);
if(ui->widePlot->m_bCumulative) ui->spec2dComboBox->setCurrentIndex(1); if(ui->widePlot->m_bCumulative) ui->spec2dComboBox->setCurrentIndex(1);
if(ui->widePlot->m_bJT9Sync) ui->spec2dComboBox->setCurrentIndex(2); if(ui->widePlot->m_bJT9Sync) ui->spec2dComboBox->setCurrentIndex(2);
int nbpp=settings.value("BinsPerPixel",1).toInt(); int nbpp=settings.value("BinsPerPixel",2).toInt();
ui->widePlot->setBinsPerPixel(nbpp); ui->widePlot->setBinsPerPixel(nbpp);
m_qsoFreq=settings.value("QSOfreq",1010).toInt(); m_qsoFreq=settings.value("QSOfreq",1500).toInt();
ui->widePlot->setFQSO(m_qsoFreq,true); ui->widePlot->setFQSO(m_qsoFreq,true);
settings.endGroup(); settings.endGroup();
} }

2
widegraph.ui
View File

@ -101,7 +101,7 @@
<number>1</number> <number>1</number>
</property> </property>
<property name="value"> <property name="value">
<number>1</number> <number>2</number>
</property> </property>
</widget> </widget>
</item> </item>

4
wsjtx.iss
View File

@ -1,6 +1,6 @@
[Setup] [Setup]
AppName=wsjtx AppName=wsjtx
AppVerName=wsjtx Version 0.8 r3110 AppVerName=wsjtx Version 0.8 r3111
AppCopyright=Copyright (C) 2001-2013 by Joe Taylor, K1JT AppCopyright=Copyright (C) 2001-2013 by Joe Taylor, K1JT
DefaultDirName=c:\wsjtx DefaultDirName=c:\wsjtx
DefaultGroupName=wsjtx DefaultGroupName=wsjtx
@ -15,7 +15,7 @@ Source: "c:\Users\joe\wsjt\wsjtx_install\blue.dat"; DestDir: "{app}";
Source: "c:\Users\joe\wsjt\wsjtx_install\CALL3.TXT"; DestDir: "{app}"; Source: "c:\Users\joe\wsjt\wsjtx_install\CALL3.TXT"; DestDir: "{app}";
Source: "c:\Users\joe\wsjt\wsjtx\WSJT-X_Users_Guide.pdf"; DestDir: "{app}"; Source: "c:\Users\joe\wsjt\wsjtx\WSJT-X_Users_Guide.pdf"; DestDir: "{app}";
Source: "c:\Users\joe\wsjt\QtSupport\*.dll"; DestDir: "{app}"; Flags: onlyifdoesntexist Source: "c:\Users\joe\wsjt\QtSupport\*.dll"; DestDir: "{app}"; Flags: onlyifdoesntexist
Source: "c:\Users\joe\wsjt\wsjtx_install\save\Samples\000000_0000.wav"; DestDir: "{app}\save\Samples"; Source: "c:\Users\joe\wsjt\wsjtx_install\save\Samples\130228_2158.wav"; DestDir: "{app}\save\Samples";
[Icons] [Icons]
Name: "{group}\wsjtx"; Filename: "{app}\wsjtx.exe"; WorkingDir: {app}; IconFilename: {app}\wsjt.ico Name: "{group}\wsjtx"; Filename: "{app}\wsjtx.exe"; WorkingDir: {app}; IconFilename: {app}\wsjt.ico