Add warning message if VHF features enabled on a lower band. Clean up "Decoded Lines" table in User Guide, and corresponding ISCAT end-of-line characters.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7283 ab8295b8-cf94-4d9e-aec4-7959e3be5d79

doc/user_guide/en/decoded_lines.adoc

@@ -10,27 +10,27 @@ summarized in the following Table:
 [[DECODED_LINES_TABLE]]
 .Notations used on decoded text lines
 [width="50%",cols="h,3*^",frame=topbot,options="header"]
-|=====================================
+|===========================================
 |Mode    |Mode character|Sync character|End of line information
-|JT4     | $            | *, # | fM, dMC
+|JT4     | $            | *, # | f, fN, dNC
 |JT9     | @            |      |
 |JT65    | #            |      |
-|JT65 VHF| #            | *, # | fM, dMC
+|JT65 VHF| #            | *, # | f, fN, dNC
 |QRA64   | :            | *    | R
-|ISCAT   |              | *    | N  L  A  T
-|MSK144  | &            |      | M
-|=====================================
+|ISCAT   |              | *    | M  N  C  T
+|MSK144  | &            |      | N
+|===========================================
 Sync character::
- - Normal sync *
- - Alternate sync #
- 
+ `*` - Normal sync +
+ `#` - Alternate sync
+
 End of line information::
- - Franke-Taylor or Fano algorithm: f
- - Deep search algorithm: d
- - Number of Rx intervals or frames averaged: M
- - Confidence indicator: C
- - QRA64 _a priori_ return code: R
- - Message length (characters): N
- - Lowest confidence (0-10): L
- - Number of frames averaged: A
- - Length of analyzed region (s): T
+ `C` - Confidence indicator [ISCAT and Deep Search; (0-9,*)] +
+ `d` - Deep Search algorithm +
+ `f` - Franke-Taylor or Fano algorithm +
+ `M` - Message length (characters) +
+ `N` - Number of Rx intervals or frames averaged +
+ `R` - QRA64 _a priori_ return code +
+ `T` - Length of analyzed region (s)
+
+

lib/iscat.f90

@@ -158,7 +158,7 @@ subroutine iscat(cdat0,npts0,nh,npct,t2,pick,cfile6,minsync,ntol,   &
            if(isync.ge.1) csync='*'
            if(nlines.le.maxlines-1) nlines = nlines + 1
            write(line(nlines),1020) cfile6,isync,nsig,t2,ndf0,nfdot,csync, &
-                msg(1:28),msglen,nworst,navg,tana,char(0)
+                msg(1:28),msglen,navg,nworst,tana,char(0)
         endif
      enddo
      if(last) exit
@@ -198,8 +198,8 @@ subroutine iscat(cdat0,npts0,nh,npct,t2,pick,cfile6,minsync,ntol,   &
   
   if(nlines.le.maxlines-1) nlines = nlines + 1
   write(line(nlines),1020) cfile6,isync,nsig,t2,ndf0,nfdot,csync,msg(1:28),  &
-       msglen,nworst,navg,tana,char(0)
-1020 format(a6,2i4,f5.1,i5,i4,1x,a1,2x,a28,i4,2i3,f5.1,a1)
+       msglen,navg,nworst,tana,char(0)
+1020 format(a6,2i4,f5.1,i5,i4,1x,a1,2x,a28,i4,i3,2x,i1,f5.1,a1)
 
   return
 end subroutine iscat

mainwindow.cpp

@@ -813,6 +813,7 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
   m_bFastDone=false;
   m_bAltV=false;
   m_bNoMoreFiles=false;
+  m_bVHFwarned=false;
   m_wait=0;
   ui->txrb1->setChecked(true);
 
@@ -2961,6 +2962,12 @@ void MainWindow::guiUpdate()
 
 //Once per second:
   if(nsec != m_sec0) {
+    if(m_freqNominal!=0 and m_freqNominal<50000000 and m_config.enable_VHF_features()) {
+      if(!m_bVHFwarned) vhfWarning();
+    } else {
+      m_bVHFwarned=false;
+    }
+
     if(m_auto and m_mode=="Echo" and m_bEchoTxOK) {
       progressBar.setMaximum(6);
       progressBar.setValue(int(m_s6));
@@ -4212,7 +4219,7 @@ void MainWindow::on_actionISCAT_triggered()
   ui->decodedTextBrowser2->setVisible(false);
   ui->decodedTextLabel2->setVisible(false);
   ui->decodedTextLabel->setText(
-        "  UTC  Sync dB   DT   DF  F1                                   N  L  A   T");
+        "  UTC  Sync dB   DT   DF  F1                                   M  N  C   T ");
   ui->tabWidget->setCurrentIndex(0);
   ui->sbSubmode->setMaximum(1);
   if(m_nSubMode==0) ui->TxFreqSpinBox->setValue(1012);
@@ -4348,6 +4355,7 @@ void MainWindow::switch_mode (Mode mode)
     ui->RxFreqSpinBox->setMaximum(5000);
     ui->RxFreqSpinBox->setSingleStep(1);
   }
+  m_bVHFwarned=false;
 }
 
 void MainWindow::WSPR_config(bool b)
@@ -4555,6 +4563,8 @@ void MainWindow::band_changed (Frequency f)
     m_bandEdited = false;
     psk_Reporter->sendReport();      // Upload any queued spots before changing band
     if (!m_transmitting) monitor (true);
+    float r=m_freqNominal/(f+0.0001);
+    if(r<0.9 or r>1.1) m_bVHFwarned=false;
     m_freqNominal = f;
     m_freqTxNominal = m_freqNominal;
     if (m_astroWidget) m_astroWidget->nominal_frequency (m_freqNominal, m_freqTxNominal);
@@ -4563,6 +4573,13 @@ void MainWindow::band_changed (Frequency f)
   }
 }
 
+void MainWindow::vhfWarning()
+{
+  MessageBox::warning_message (this, tr ("VHF features warning"),
+     "VHF/UHF/Microwave features is enabled on a lower frequency band.");
+  m_bVHFwarned=true;
+}
+
 void MainWindow::enable_DXCC_entity (bool on)
 {
   if (on and !m_mode.startsWith ("WSPR") and m_mode!="Echo") {

mainwindow.h

@@ -511,6 +511,7 @@ private:
   bool m_tx_watchdog;           // true when watchdog triggered
   bool m_block_pwr_tooltip;
   bool m_PwrBandSetOK;
+  bool m_bVHFwarned;
   Frequency m_lastMonitoredFrequency;
   double m_toneSpacing;
   int m_firstDecode;
@@ -579,6 +580,7 @@ private:
   void tx_watchdog (bool triggered);
   int  nWidgets(QString t);
   void displayWidgets(int n);
+  void vhfWarning();
 };
 
 extern int killbyname(const char* progName);