comparison main/PreferencesDialog.cpp @ 115:c9930ec7a3f9

* Add fuzzy interpolation option as an alternative to zero padding in
  spectrogram (looks terrible though)
* Make spectrogram appear more quickly by having the FFT server notify of
  updates more often near the start of its run

     m_windowTypeSelector = new WindowTypeSelector(m_windowType);
 
     connect(m_windowTypeSelector, SIGNAL(windowTypeChanged(WindowType)),
             this, SLOT(windowTypeChanged(WindowType)));
 
-    QCheckBox *smoothing = new QCheckBox;
-    m_smoothSpectrogram = prefs->getSmoothSpectrogram();
-    smoothing->setCheckState(m_smoothSpectrogram ?
-                             Qt::Checked : Qt::Unchecked);
-
-    connect(smoothing, SIGNAL(stateChanged(int)),
-            this, SLOT(smoothSpectrogramChanged(int)));
+    QComboBox *smoothing = new QComboBox;
+    
+    int sm = prefs->getPropertyRangeAndValue("Spectrogram Smoothing", &min, &max,
+                                             &deflt);
+    m_spectrogramSmoothing = sm;
+
+    for (i = min; i <= max; ++i) {
+        smoothing->addItem(prefs->getPropertyValueLabel("Spectrogram Smoothing", i));
+    }
+
+    smoothing->setCurrentIndex(sm);
+
+    connect(smoothing, SIGNAL(currentIndexChanged(int)),
+            this, SLOT(spectrogramSmoothingChanged(int)));
 
     QComboBox *propertyLayout = new QComboBox;
     int pl = prefs->getPropertyRangeAndValue("Property Box Layout", &min, &max,
-                                             &deflt);
+                                         &deflt);
     m_propertyLayout = pl;
 
     for (i = min; i <= max; ++i) {
         propertyLayout->addItem(prefs->getPropertyValueLabel("Property Box Layout", i));
     }

                                                 ("Resample Quality"))),
                        row, 0);
     subgrid->addWidget(resampleQuality, row++, 1, 1, 2);
 
     subgrid->addWidget(new QLabel(prefs->getPropertyLabel
-                                  ("Smooth Spectrogram")),
-                       row, 0, 1, 2);
-    subgrid->addWidget(smoothing, row++, 2);
+                                  ("Spectrogram Smoothing")),
+                       row, 0);
+    subgrid->addWidget(smoothing, row++, 1, 1, 2);
 
     subgrid->addWidget(new QLabel(tr("%1:").arg(prefs->getPropertyLabel
                                                 ("Window Type"))),
                        row, 0);
     subgrid->addWidget(m_windowTypeSelector, row++, 1, 2, 2);

     m_windowType = type;
     m_applyButton->setEnabled(true);
 }
 
 void
-PreferencesDialog::smoothSpectrogramChanged(int state)
-{
-    m_smoothSpectrogram = (state == Qt::Checked);
+PreferencesDialog::spectrogramSmoothingChanged(int smoothing)
+{
+    m_spectrogramSmoothing = smoothing;
     m_applyButton->setEnabled(true);
 }
 
 void
 PreferencesDialog::propertyLayoutChanged(int layout)

 void
 PreferencesDialog::applyClicked()
 {
     Preferences *prefs = Preferences::getInstance();
     prefs->setWindowType(WindowType(m_windowType));
-    prefs->setSmoothSpectrogram(m_smoothSpectrogram);
+    prefs->setSpectrogramSmoothing(Preferences::SpectrogramSmoothing
+                                   (m_spectrogramSmoothing));
     prefs->setPropertyBoxLayout(Preferences::PropertyBoxLayout
                                 (m_propertyLayout));
     prefs->setTuningFrequency(m_tuningFrequency);
     prefs->setResampleQuality(m_resampleQuality);
     m_applyButton->setEnabled(false);