[Kst] branches/work/kst/portto4/kst/src/libkstapp

[Peter Kümmel]

SVN commit 1276331 by kuemmel:

Don't crash when neither _xAxisGroup nor _FFTOption is checked.
Enforce selection, by disabling 'Next' button. 

(Or should it be possible to only load vectors without plotting?)

 M  +8 -1      datawizard.cpp  


--- branches/work/kst/portto4/kst/src/libkstapp/datawizard.cpp #1276330:1276331
@@ -572,6 +572,9 @@
 
   _FFTOptions->GroupBoxFFTOptions->setChecked(_dialogDefaults->value("wizard/doPSD",false).toBool());
   _xAxisGroup->setChecked(_dialogDefaults->value("wizard/doXY",true).toBool());
+
+  connect(_xAxisGroup, SIGNAL(clicked()), this, SLOT(optionsUpdated()));
+  connect(_FFTOptions->GroupBoxFFTOptions, SIGNAL(clicked()), this, SLOT(optionsUpdated()));
 }
 
 
@@ -655,6 +658,10 @@
 
 
 bool DataWizardPageDataPresentation::validOptions() {
+  if (!_FFTOptions->GroupBoxFFTOptions->isChecked() && !_xAxisGroup->isChecked()) {
+    return false;
+  }
+
   if (!_xAxisGroup->isEnabled()) {
     return true;
   }
@@ -1161,7 +1168,7 @@
       plot->update();
       plot->view()->appendToLayout(layout_type, plot, num_columns);
     }
-    if (layout_type == CurvePlacement::Custom) {
+    if (!plotList.isEmpty() && layout_type == CurvePlacement::Custom) {
       plotList.at(0)->createCustomLayout(num_columns);
     }