mirror of
				https://github.com/saitohirga/WSJT-X.git
				synced 2025-11-03 13:30:52 -05:00 
			
		
		
		
	More work toward implementing GUI features for FST280 and FST280W.
This commit is contained in:
		
							parent
							
								
									725933ddca
								
							
						
					
					
						commit
						4f802cae84
					
				@ -24,7 +24,9 @@ namespace
 | 
			
		||||
    "QRA64",
 | 
			
		||||
    "FreqCal",
 | 
			
		||||
    "FT8",
 | 
			
		||||
    "FT4"
 | 
			
		||||
    "FT4",
 | 
			
		||||
    "FST280",
 | 
			
		||||
    "FST280W"
 | 
			
		||||
  };
 | 
			
		||||
  std::size_t constexpr mode_names_size = sizeof (mode_names) / sizeof (mode_names[0]);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@ -50,6 +50,8 @@ public:
 | 
			
		||||
    FreqCal,
 | 
			
		||||
    FT8,
 | 
			
		||||
    FT4,
 | 
			
		||||
    FST280,
 | 
			
		||||
    FST280W,
 | 
			
		||||
    MODES_END_SENTINAL_AND_COUNT // this must be last
 | 
			
		||||
  };
 | 
			
		||||
  Q_ENUM (Mode)
 | 
			
		||||
 | 
			
		||||
@ -423,6 +423,7 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
 | 
			
		||||
  ui->dxGridEntry->setValidator (new MaidenheadLocatorValidator {this});
 | 
			
		||||
  ui->dxCallEntry->setValidator (new CallsignValidator {this});
 | 
			
		||||
  ui->sbTR->values ({5, 10, 15, 30, 60, 120, 300});
 | 
			
		||||
  ui->sbTR_FST280W->values ({120, 300});
 | 
			
		||||
  ui->decodedTextBrowser->set_configuration (&m_config, true);
 | 
			
		||||
  ui->decodedTextBrowser2->set_configuration (&m_config);
 | 
			
		||||
 | 
			
		||||
@ -5828,6 +5829,9 @@ void MainWindow::on_actionFST280_triggered()
 | 
			
		||||
  displayWidgets(nWidgets("111011000000111100010000000000000"));
 | 
			
		||||
  bool bVHF=m_config.enable_VHF_features();
 | 
			
		||||
  setup_status_bar (bVHF);
 | 
			
		||||
  m_TRperiod = ui->sbTR->value ();
 | 
			
		||||
  ui->sbTR->setMinimum(15);
 | 
			
		||||
  ui->sbTR->setMaximum(300);
 | 
			
		||||
  ui->sbSubmode->setMaximum(3);
 | 
			
		||||
  statusChanged();
 | 
			
		||||
}
 | 
			
		||||
@ -5839,9 +5843,14 @@ void MainWindow::on_actionFST280W_triggered()
 | 
			
		||||
  WSPR_config(true);
 | 
			
		||||
  ui->actionFST280W->setChecked(true);
 | 
			
		||||
//                         012345678901234567890123456789012
 | 
			
		||||
  displayWidgets(nWidgets("000000000000000001010000000000000"));
 | 
			
		||||
  displayWidgets(nWidgets("000001000000000001010000000000000"));
 | 
			
		||||
  bool bVHF=m_config.enable_VHF_features();
 | 
			
		||||
  setup_status_bar (bVHF);
 | 
			
		||||
  m_TRperiod = ui->sbTR->value ();
 | 
			
		||||
  ui->band_hopping_group_box->setVisible(false);
 | 
			
		||||
  ui->sbTR->setMinimum(120);
 | 
			
		||||
  ui->sbTR->setMaximum(300);
 | 
			
		||||
  ui->sbSubmode->setMaximum(3);
 | 
			
		||||
  statusChanged();
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@ -6464,6 +6473,7 @@ void MainWindow::WSPR_config(bool b)
 | 
			
		||||
  ui->label_7->setVisible(!b and ui->cbMenus->isChecked());
 | 
			
		||||
  ui->logQSOButton->setVisible(!b);
 | 
			
		||||
  ui->DecodeButton->setEnabled(!b);
 | 
			
		||||
  ui->band_hopping_group_box->setVisible(true);
 | 
			
		||||
  if(b and (m_mode!="Echo")) {
 | 
			
		||||
    QString t="UTC    dB   DT     Freq     Drift  Call          Grid    dBm    ";
 | 
			
		||||
    if(m_config.miles()) t += " mi";
 | 
			
		||||
 | 
			
		||||
@ -1039,7 +1039,7 @@ QPushButton[state="ok"] {
 | 
			
		||||
      <item row="0" column="3" rowspan="3">
 | 
			
		||||
       <widget class="QStackedWidget" name="controls_stack_widget">
 | 
			
		||||
        <property name="currentIndex">
 | 
			
		||||
         <number>0</number>
 | 
			
		||||
         <number>1</number>
 | 
			
		||||
        </property>
 | 
			
		||||
        <widget class="QWidget" name="page">
 | 
			
		||||
         <layout class="QHBoxLayout" name="horizontalLayout_8">
 | 
			
		||||
@ -1608,7 +1608,7 @@ When not checked you can view the calibration results.</string>
 | 
			
		||||
                <enum>QTabWidget::Triangular</enum>
 | 
			
		||||
               </property>
 | 
			
		||||
               <property name="currentIndex">
 | 
			
		||||
                <number>0</number>
 | 
			
		||||
                <number>1</number>
 | 
			
		||||
               </property>
 | 
			
		||||
               <widget class="QWidget" name="tab">
 | 
			
		||||
                <attribute name="title">
 | 
			
		||||
@ -2590,6 +2590,25 @@ list. The list can be maintained in Settings (F2).</string>
 | 
			
		||||
                      </property>
 | 
			
		||||
                     </widget>
 | 
			
		||||
                    </item>
 | 
			
		||||
                    <item>
 | 
			
		||||
                     <widget class="RestrictedSpinBox" name="sbTR_FST280W">
 | 
			
		||||
                      <property name="alignment">
 | 
			
		||||
                       <set>Qt::AlignCenter</set>
 | 
			
		||||
                      </property>
 | 
			
		||||
                      <property name="suffix">
 | 
			
		||||
                       <string>  s</string>
 | 
			
		||||
                      </property>
 | 
			
		||||
                      <property name="prefix">
 | 
			
		||||
                       <string>T/R  </string>
 | 
			
		||||
                      </property>
 | 
			
		||||
                      <property name="minimum">
 | 
			
		||||
                       <number>120</number>
 | 
			
		||||
                      </property>
 | 
			
		||||
                      <property name="maximum">
 | 
			
		||||
                       <number>300</number>
 | 
			
		||||
                      </property>
 | 
			
		||||
                     </widget>
 | 
			
		||||
                    </item>
 | 
			
		||||
                    <item>
 | 
			
		||||
                     <widget class="QGroupBox" name="band_hopping_group_box">
 | 
			
		||||
                      <property name="title">
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user