diff --git a/doc/common/links.adoc b/doc/common/links.adoc index 3507d72c0..d02877109 100644 --- a/doc/common/links.adoc +++ b/doc/common/links.adoc @@ -97,7 +97,7 @@ d). Edit lines as needed. Keeping them in alphabetic order help see dupes. :wsjt_svn: http://sourceforge.net/p/wsjt/wsjt/HEAD/tree/[here] :wspr_code: http://physics.princeton.edu/pulsar/K1JT/WSPRcode.exe[WSPRcode.exe] :wspr_svn: http://sourceforge.net/p/wsjt/wsjt/HEAD/tree/branches/wspr/[here] -:kvasd_installer: http://sourceforge.net/projects/wsjt/files/kvasd-installer/kvasd-installer-1.12.14/kvasd-installer-1.12.14.tar.gz/download[Link KVASD-Installer] +:kvasd_installer: http://sourceforge.net/projects/wsjt/files/kvasd-installer/kvasd-installer-1.12.14/kvasd-installer-1.12.14.tar.gz/download[kvasd-installer] // MAIL-TO links :alex_efros: mailto:powerman@powerman.name[Alex Efros] diff --git a/doc/user_guide/install-linux.adoc b/doc/user_guide/install-linux.adoc index 90c4f0320..d631f4b8d 100644 --- a/doc/user_guide/install-linux.adoc +++ b/doc/user_guide/install-linux.adoc @@ -1,101 +1,79 @@ // Status=review -* For Debian, Ubuntu, and other Debian-based systems: -** 32-bit: {debian32} +Debian, Ubuntu, and other Debian-based systems: + +* 32-bit: {debian32} - To install: +sudo dpkg -i wsjtx_{VERSION}_i386.deb+ - Uninstall: +sudo dpkg -P wsjtx+ -** 64-bit: {debian64} +* 64-bit: {debian64} - To install: +sudo dpkg -i wsjtx_{VERSION}_amd64.deb+ - Uninstall: +sudo dpkg -P wsjtx+ -** You may also need to execute the following commands in a terminal: + +You may also need to execute the following commands in a terminal: sudo apt-get install libqt5multimedia5-plugins libqt5serialport5 sudo apt-get install libfftw3-single3 -* For Ubuntu 15.04 and similar systems: +For Ubuntu 15.04 and similar systems, the above and also - sudo apt-get install libqt5multimedia5-plugins libqt5serialport5 - sudo apt-get install libfftw3-single3 libqt5opengl5 + sudo apt-get install libqt5opengl5 -* For Fedora, Red Hat, and other rpm-based systems: -** 32-bit: {fedora32} +Fedora, Red Hat, and other rpm-based systems: + +* 32-bit: {fedora32} - To install: +sudo rpm -i wsjtx-{VERSION}-i686.rpm+ - Uninstall: +sudo rpm -e wsjtx+ -** 64-bit: {fedora64} +* 64-bit: {fedora64} - To install: +sudo rpm -i wsjtx-{VERSION}-x86_64.rpm+ - Uninstall: +sudo rpm -e wsjtx+ -** You may also need to execute the following commands in a terminal: + +You may also need to execute the following commands in a terminal: sudo yum install fftw-libs-single qt5-qtmultimedia qt5-qtserialport .KVASD Installation -All Linux users should install a companion program called +kvasd+, -the Koetter-Vardy algebraic soft-decision Reed Solomon decoder. To -facilitate the installation, several packages are available which -are distribution dependent. -The following distributions can install the +kvasd+ Decoder using the PPA -method: +All Linux users must install a companion program called +kvasd+, an +implementation of the the Koetter-Vardy algebraic soft-decision +decoder for the Reed Solomon (63,12) code. Users of Ubuntu and other +Debian-based sysyems can install +kvasd+ by executing the following +commands in a terminal: -[horizontal] -*Ubuntu*:: 14.04, 14.10, 15.04 -*Mint*:: 17.1 (Uses Ubuntu 14.04 repositories) + sudo add-apt-repository ppa:ki7mt/kvasd-installer + sudo apt-get update + sudo apt-get install kvasd-installer + kvasd-installer -.KVASD Installer via PPA -Any Ubuntu based distribution that uses the Ubuntu repository versions listed -above should be able to install via the PPA method. Installing via the PPA -will resolve all required dependencies, no additional package installations -should be required. +The final screen of the installer should include the line -* Open a terminal, Ctrl{plus}Alt{plus}T -* sudo add-apt-repository ppa:ki7mt/kvasd-installer -* Accept the PGP Key -* sudo apt-get update -* sudo apt-get install kvasd-installer -* Proceed to <> + KVASD version 1.12 -- Decode test *** PASSED *** -.KVASD Installer via Source Code -In addition to most of the later Ubuntu releases, reports of successful installation -and operation of the +kvasd+ binary have been reported on various mailing lists: +which should also be displayed if the command -[horizontal] -*Debian*:: 7.x (Wheezy), 8.0 (Jessie) -*Fedora*:: 20 (Heisenbug), 21 (Twenty One) -*Raspbian*:: ARMv7 - Wheezy base, dist-upgrade to Jessie + kvasd -v -While each distribution varies, the following list serves as the minimum package -guide for both the +KVASD Installer+ package itself, and proper use of the -+kvasd+ binary. +is executed after installation is complete. -* Bash -* Awk -* Autoconf -* Subversion -* Dialog -* libgfortran +You can install +kvasd+ on most Linux systems (including ARM-based +systems) by downloading, unpacking, and executing the simple tools +packaged in the +kvasd-installer+ script. Your system will need the +following standard tools already installed: -At the time of this writing, the KVASD Installer version is 1.12.14. Ensure -the packages list above are installed, then perform the following steps. + autoconf awk bash dialog libgfortran svn -* Download the tarball: {kvasd_installer} -* Remove any previous installation of KVASD Installer -* mkdir -p ~/Projects -* Copy kvasd-installer-1.12.14.tar.gz to ~/Projects -* cd ~/Projects -* tar -xf kvasd-installer-1.12.14.tar.gz -* cd ./kvasd-installer-1.12.14 -* ./autogen.sh -* sudo make install -* Proceed to <> +Download the {kvasd_installer} tarfile to a conveniant directory, then +execute the following commands in a terminal there: + + tar xzf kvasd-installer-1.12.14.tar.gz + cd kvasd-installer-1.12.14 + ./autogen.sh + sudo make install + kvasd-installer + +As described above, the final screen of the installer should include +the line + + KVASD version 1.12 -- Decode test *** PASSED *** -[[RUN_KVASD_INSTALLER]] -.Run KVASD Installer -Installing the decoder is straight forward, simply run the installer, and -select your desired option. -* In a terminal, type..: kvasd-installer -* From the main menu, select Option 1, Install decoder -* Follow the prompts, accepting the EULA ( End User License Agreement ) -* If successful, the KVASD version, passed message and LDD info will be displayed -* Exit KVASD Installer diff --git a/doc/user_guide/install-mac.adoc b/doc/user_guide/install-mac.adoc index 94a2687ab..7230f8529 100644 --- a/doc/user_guide/install-mac.adoc +++ b/doc/user_guide/install-mac.adoc @@ -1,16 +1,25 @@ // These instructions are up-to-date for WSJT-X v1.4 -* OS X 10.7 and later: {osx} +*OS X 10.7* and later: Download the file {osx} to your desktop, +double-click on it and consult its +ReadMe+ file for important +installation notes. -* After downloading it to your desktop, double-click on the dmg file -and consult its +ReadMe+ file for important installation notes. - -* If you have already installed a previous version, you can retain it by +If you have already installed a previous version, you can retain it by changing its name in the *Applications* folder (say, from _WSJT-X_ to _WSJT-X_previous_). You can then proceed to the installation phase. -* Remember to use the Mac's *Audio MIDI Setup* utility to configure -your sound card for 48000 Hz, two-channel, 16-bit format. +In a command-line terminal, execute the command + + kvasd-installer + +and follow its instructions. The final screen should include the line + + KVASD version 1.12 -- Decode test *** PASSED *** + +Take note also of the following: + +* Use the Mac's *Audio MIDI Setup* utility to configure your sound +card for 48000 Hz, two-channel, 16-bit format. * Use *System Preferences* to select an external time source to keep your system clock synchronized to UTC. diff --git a/mainwindow.cpp b/mainwindow.cpp index 4559b2a9c..974de54a6 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -4311,7 +4311,7 @@ void MainWindow::bandHopping() if(isun==2) s=m_sunsetBands; if(isun==3) s=m_nightBands; - Frequency f0; + Frequency f0=0; iband=-1; for(i=0; irowCount (); ++row) { - // lookup the underlying source model index from the filtered - // model index + // Lookup the underlying source model index from the filtered model index auto const& source_index = frequencies->mapToSource (frequencies->index (row, FrequencyList::frequency_column)); // and use it to directly access the list of frequencies that the // FrequencyList model wraps (we could also use the model data()