Fix the faulty logic in test for "No more files to open".

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7200 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2016-10-19 13:45:59 +00:00
parent 6f5d77d820
commit 8c34a664e7
7 changed files with 56 additions and 53 deletions

View File

@ -10,7 +10,7 @@ cases you can choose *Left*, *Right*, or *Both* stereo channels.
IMPORTANT: If you select the audio output device that is also your
computer's default audio device, be sure to turn off all system sounds
to prevent transmitting them over the air.
to prevent inadvertently transmitting them over the air.
IMPORTANT: Be sure that your audio device is configured to sample at
48000 Hz, 16 bits.
@ -30,5 +30,6 @@ can select another location if desired.
specified directory. The file contains information usable by another
program for automatic tracking of the Sun or Moon, as well as
calculated Doppler shift for the specified EME path. The file is
updated once per second.
updated once per second whenever the <<ASTRODATA,Astronomical Data>>
window is displayed.

View File

@ -30,21 +30,19 @@ and _Slope_ B in the equation
Dial error = A + B*f
where "`Dial error`" and A are in Hz, f is frequency in MHz, and B is
in parts per million (ppm).
Frequency values sent to the radio and received from it will
then be adjusted accordingly so that frequencies displayed by _WSJT-X_
are accurate.
in parts per million (ppm). Frequency values sent to the radio and
received from it will then be adjusted so that frequencies displayed
by _WSJT-X_ are accurate.
_Station Information_: You can save *Band*, *Offset* and *Antenna
Description* information for your station. The antenna information
will be included in reception reports sent to {pskreporter}. By
default the frequency offset for each band is zero. Nonzero offsets
may be added if (for example) a transverter is in use.
may be added if (for example) a <<VHF_SETUP,transverter>> is in use.
- For a simple setup approach you might want to delete any unwanted
bands -- for example, bands where you have no equipment. Then click
on a *Frequency* entry and type *Ctrl+A* to "`select all,`" and
- To simplify things you might want to delete any unwanted bands --
for example, bands where you have no equipment. Then click on a
*Frequency* entry and type *Ctrl+A* to "`select all,`" and
drag-and-drop the entries onto the _Station Information_ table. You
can then add any transverter offsets and antenna details.

View File

@ -59,7 +59,7 @@ the radio's Mode setting.
- _Split Operation_: Significant advantages result from using *Split*
mode (separate VFOs for Rx and Tx) if your radio supports it. If it
does not, _WSJT-X_ can simulate such behavior. Either method will
does not, _WSJT-X_ can emulate such behavior. Either method will
result in a cleaner transmitted signal, by keeping the Tx audio always
in the range 1500 to 2000 Hz so that audio harmonics cannot pass
through the Tx sideband filter. Select *Rig* to use the radio's Split

View File

@ -24,7 +24,7 @@ Graph* (waterfall and 2D spectrum) to display the conventional JT65
and JT9 sub-bands simultaneously on most HF bands. Further details
are provided in the <<TUTORIAL,Basic Operating Tutorial>>. A wider
displayed bandwidth may also be helpful at VHF and above, where JT4,
JT65, and QRA64 signals may be found over much wider ranges of
JT65, and QRA64 signals are found over much wider ranges of
frequencies.
- If you have only a standard SSB filter you wont be able to display
@ -36,7 +36,7 @@ the other mode.
- Of course, you might prefer to concentrate on one mode at a time,
setting your dial frequency to (say) 14.076 for JT65 or 14.078 for
JT9. Present conventions have the nominal JT9 dial frequency 2 kHz
higher than the JT65 dial frequency.
higher than the JT65 dial frequency on most bands.
.Transmitter Audio Level
@ -57,4 +57,5 @@ a good level for audio drive.
* Alternatively, you can make the Tx audio level adjustment using the
digital slider labeled *Pwr* at the right edge of the main window.
* Toggle the *Tune* button once more to stop your test transmission.
* Toggle the *Tune* button once more or click *Halt Tx* to stop your
test transmission.

View File

@ -1,3 +1,4 @@
[[VHF_SETUP]]
=== VHF Setup
_WSJT-X_ v1.7 builds on the features for VHF and higher bands first
@ -34,23 +35,23 @@ To activate the VHF-and-up features:
to allow for the EME path delay on received signals.
- If you will use automatic Doppler tracking and your radio accepts
QSY commands while transmitting, check the box *Allow Tx frequency
changes while transmitting*. Transceivers known to permit such changes
include the IC-735, IC-756 Pro II, IC-910-H, FT-817, FT-847, FT-857,
FT-897, TS-590S, TS-590SG, TS-2000 (with Rev 9 firmware upgrade), Flex
1500 and 5000, HPSDR, Anan-10, Anan-100, and KX3. On the *Radio* tab
select *Split Operation* (use either *Rig* or *Fake It*; you may need
to experiment with both options to find one that works best with your
radio).
frequency-setting commands while transmitting, check the box *Allow Tx
frequency changes while transmitting*. Transceivers known to permit
such changes include the IC-735, IC-756 Pro II, IC-910-H, FT-817,
FT-847, FT-857, FT-897, TS-590S, TS-590SG, TS-2000 (with Rev 9
firmware upgrade), Flex 1500 and 5000, HPSDR, Anan-10, Anan-100, and
KX3. On the *Radio* tab select *Split Operation* (use either *Rig* or
*Fake It*; you may need to experiment with both options to find one
that works best with your radio).
- If your radio does not accept commands to change frequency while
transmitting, Doppler tracking will be approximated by making a single
Tx frequency adjustment before transmitting, using a value computed
for the middle of the Tx period.
Tx frequency adjustment before a transmission starts, using a value
computed for the middle of the Tx period.
- The main window will reconfigure itself as necessary to display
controls supporting the features of each mode. For example, in JT4 mode
the central part of the main window might look something like this:
the central part of the main window looks something like this:
image::VHF_controls.png[align="center",alt="VHF Controls"]
@ -87,14 +88,7 @@ Moreover, anyone else using this option will hear both of you
without the need for manual frequency changes. The hypothetical "`man
in the moon`" would copy all of you on the selected nominal frequency.
- In the example depicted above, the moon-based nominal frequency is
100 kHz above the stated band edge, or 10368.100 MHz for the 10 GHz
band. The home station two-way self Doppler shift is +24366 Hz, so the
one-way shift is +12183 Hz. Therefore, the receive frequency is set
to 10,360.112183 Hz. When a transmission is started, the frequency
will be reset to 12183 Hz _below_ the nominal on-the-moon frequency.
=== EME with JT4
=== JT4
- Select *JT4* from the *Mode* menu.
@ -117,13 +111,23 @@ these messages, check the box labeled *Sh* on the main window.
IMPORTANT: Additional hints for using JT4 and Echo mode on the
EME path have been compiled by G3WDG and are available here: {jt4eme}.
=== EME with JT65
=== JT65
TBD ...
In most ways JT65 operation on VHF and higher bands is similar to HF
usage, but a few differences should be noted. Checking the box
*Enable VHF/UHF/Microwave features* on the *Settings -> General* tab
causes several additional user controls to be displayed. The decoder
will respond to special message formats used particularly for EME,
including the OOO signal report and shorthand messages for RO, RRR,
and 73. Typical operation at VHF and UHF involves only a single
signal in the receiver passband, rather than many. It's usually best
then to check the *Single decode* box on the *Settings -> General*
tab.
=== EME with QRA64
=== QRA64
TBD ...
QRA64 is present as an experimental mode in the present alpha release
of _WSJT-X_, Version 1.7. Operation is basically similar to JT65.
=== Meteor Scatter with MSK144

View File

@ -109,14 +109,13 @@ include::transceiver-setup.adoc[]
[[TUTORIAL]]
== Basic Operating Tutorial
<<TUT_MAIN,Sections 6.1>> through <<TUT_EX2,6.4>> cover basic
operation for making two-way QSOs with modes JT9 and JT65 on the HF
bands. <<WSPR,Section 7>> covers WSPR mode, and
<<VHF_AND_UP,Section 8>> covers VHF+ features. If you are a new
user of _WSJT-X_ we suggest that you go through the full HF-oriented
tutorial while at your radio. It should take no more than 20 minutes.
If your main interests are WSPR or VHF+, you may then proceed to
Sections 7 and 8.
<<TUT_MAIN,Sections 6.1>> through <<TUT_EX2,6.4>> introduce the basic
user controls and program behavior of _WSJT-X_. We suggest that new
users should go through the full HF-oriented tutorial, preferably
while at your radio. Details on the standard message structure used
for making two-way QSOs are found in <<MAKE_QSOS,Section 7>>, followed
by sections covering <<WSPR,WSPR mode>> and features for
<<VHF_AND_UP,VHF and above>>.
[[TUT_MAIN]]
=== Main Window Settings

View File

@ -1993,12 +1993,7 @@ void MainWindow::on_actionOpen_next_in_directory_triggered() //Open Next
QFileInfo fi(m_path);
QStringList list;
list= fi.dir().entryList().filter(".wav",Qt::CaseInsensitive);
for (i = 0; i < list.size(); ++i) {
if(i==list.size()-1) {
m_loopall=false;
MessageBox::information_message(this, tr("No more files to open."));
return;
}
for (i = 0; i < list.size()-1; ++i) {
len=list.at(i).length();
if(list.at(i)==m_path.right(len)) {
int n=m_path.length();
@ -2010,6 +2005,10 @@ void MainWindow::on_actionOpen_next_in_directory_triggered() //Open Next
tx_status_label.setText(" " + baseName + " ");
m_diskData=true;
read_wav_file (fname);
if(i==list.size()-2) {
m_loopall=false;
MessageBox::information_message(this, tr("No more files to open."));
}
return;
}
}
@ -4529,7 +4528,8 @@ void MainWindow::band_changed (Frequency f)
m_lastBand.clear ();
m_bandEdited = false;
psk_Reporter->sendReport(); // Upload any queued spots before changing band
if (!m_transmitting) monitor (true);
// Following statement commented out 10/18/2016 by K1JT, to prevent undesired start of Monitor.
// if (!m_transmitting) monitor (true);
m_freqNominal = f;
m_freqTxNominal = m_freqNominal;
if (m_astroWidget) m_astroWidget->nominal_frequency (m_freqNominal, m_freqTxNominal);