[Kst] extragear/graphics/kst/kst

[Rick Chern]

SVN commit 426193 by rchern:

Multiple edit mode for custom gaussian sigma

 M  +1 -1      fftoptionswidget.ui  
 M  +5 -1      fftoptionswidget.ui.h  
 M  +4 -3      kstcsddialog_i.cpp  
 M  +4 -3      kstpsddialog_i.cpp  


--- trunk/extragear/graphics/kst/kst/fftoptionswidget.ui #426192:426193
@@ -221,7 +221,7 @@
                             </item>
                             <item>
                                 <property name="text">
-                                    <string>Gaussian (sigma=3)</string>
+                                    <string>Gaussian (custom sigma)</string>
                                 </property>
                             </item>
                             <item>
--- trunk/extragear/graphics/kst/kst/fftoptionswidget.ui.h #426192:426193
@@ -31,7 +31,11 @@
 }
 
 void KstFFTOptions::changedApodizeFxn() {
-    Sigma->setEnabled(ApodizeFxn->currentItem() == 5 && Apodize->isChecked());
+    int gaussianIndex = 5;
+    if (ApodizeFxn->text(0) == "") {
+      gaussianIndex++;
+    }
+    Sigma->setEnabled(ApodizeFxn->currentItem() == gaussianIndex && Apodize->isChecked());
 }
 
 void KstFFTOptions::clickedInterleaved()
--- trunk/extragear/graphics/kst/kst/kstcsddialog_i.cpp #426192:426193
@@ -226,7 +226,8 @@
   }
   
   if (_gaussianSigmaDirty) {
-    csPtr->setGaussianSigma(_kstFFTOptions->Sigma->value());
+    csPtr->setGaussianSigma(_editMultipleMode ? _kstFFTOptions->Sigma->value() - 1 : 
+                                                _kstFFTOptions->Sigma->value());
   }
   
   if (_removeMeanDirty) {
@@ -326,7 +327,7 @@
   _kstFFTOptions->Apodize->setNoChange();
   _kstFFTOptions->ApodizeFxn->insertItem("", 0);
   _kstFFTOptions->ApodizeFxn->setCurrentItem(0);
-  _kstFFTOptions->Sigma->setMinValue(_kstFFTOptions->Sigma->minValue() - 1);
+  _kstFFTOptions->Sigma->setMinValue(_kstFFTOptions->Sigma->minValue() - 0.01);
   _kstFFTOptions->Sigma->setSpecialValueText(" ");
   _kstFFTOptions->Sigma->setValue(_kstFFTOptions->Sigma->minValue());
   _kstFFTOptions->RemoveMean->setNoChange();
@@ -362,7 +363,7 @@
   if (_editMultipleMode) {
      _kstFFTOptions->FFTLen->setMinValue(_kstFFTOptions->FFTLen->minValue() + 1);
      _kstFFTOptions->FFTLen->setSpecialValueText(QString::null);
-     _kstFFTOptions->Sigma->setMinValue(_kstFFTOptions->Sigma->minValue() + 1);
+     _kstFFTOptions->Sigma->setMinValue(_kstFFTOptions->Sigma->minValue() + 0.01);
      _kstFFTOptions->Sigma->setSpecialValueText(QString::null);
      _kstFFTOptions->ApodizeFxn->removeItem(0);
   }
--- trunk/extragear/graphics/kst/kst/kstpsddialog_i.cpp #426192:426193
@@ -289,7 +289,8 @@
   }
   
   if (_gaussianSigmaDirty) {
-    psPtr->setGaussianSigma(_kstFFTOptions->Sigma->value());
+    psPtr->setGaussianSigma(_editMultipleMode ? _kstFFTOptions->Sigma->value() - 1 : 
+                                                _kstFFTOptions->Sigma->value());
   }
   
   if (_removeMeanDirty) {
@@ -390,7 +391,7 @@
   _kstFFTOptions->FFTLen->setMinValue(_kstFFTOptions->FFTLen->minValue() - 1);
   _kstFFTOptions->FFTLen->setSpecialValueText(" ");
   _kstFFTOptions->FFTLen->setValue(_kstFFTOptions->FFTLen->minValue());
-  _kstFFTOptions->Sigma->setMinValue(_kstFFTOptions->Sigma->minValue() - 1);
+  _kstFFTOptions->Sigma->setMinValue(_kstFFTOptions->Sigma->minValue() - 0.01);
   _kstFFTOptions->Sigma->setSpecialValueText(" ");
   _kstFFTOptions->Sigma->setValue(_kstFFTOptions->Sigma->minValue());
   
@@ -434,7 +435,7 @@
 
 void KstPsdDialogI::dialogCleanup() {
   if (_editMultipleMode) {
-    _kstFFTOptions->Sigma->setMinValue(_kstFFTOptions->Sigma->minValue() + 1);
+    _kstFFTOptions->Sigma->setMinValue(_kstFFTOptions->Sigma->minValue() + 0.01);
     _kstFFTOptions->Sigma->setSpecialValueText(QString::null);
     _kstFFTOptions->FFTLen->setMinValue(_kstFFTOptions->FFTLen->minValue() + 1);
     _kstFFTOptions->FFTLen->setSpecialValueText(QString::null);