src/libkstapp/datawizard.cpp

@@ -80,15 +80,20 @@ void DataWizardPageDataSource::updateUpdateBox()
       case DataSource::Timer: _updateBox->setCurrentIndex(0); break;
       case DataSource::File:  _updateBox->setCurrentIndex(1); break;
       case DataSource::None:  _updateBox->setCurrentIndex(2); break;
-      default: break;
+      default:                _updateBox->setCurrentIndex(dialogDefaults().value("wizard/updateType", 0).toInt()); break;
     };
   } else {
     _updateBox->setEnabled(false);
   }
 }
 
 void DataWizardPageDataSource::setTypeActivated() {
-    updateTypeActivated(_updateBox->currentIndex());
+  updateTypeActivated(_updateBox->currentIndex());
+}
+
+int DataWizardPageDataSource::updateType()
+{
+  return _updateBox->currentIndex();
 }
 
 void DataWizardPageDataSource::updateTypeActivated(int idx)
@@ -561,6 +566,19 @@ void DataWizardPagePlot::updatePlotBox() {
     break;
   }
 
+  PlotTabPlacement tabPlacement = static_cast<DataWizardPagePlot::PlotTabPlacement>(dialogDefaults().value("wizard/plotPlacement", SeparateTabs).toInt());
+  switch (tabPlacement) {
+  case CurrentTab:
+    _currentTab->setChecked(true);
+    break;
+  case NewTab:
+    _newTab->setChecked(true);
+    break;
+  case SeparateTabs:
+    _separateTabs->setChecked(true);
+    break;
+  }
+
   _gridColumns->setValue(dialogDefaults().value("wizard/gridColumns", CurvePlacement::Auto).toInt());
 }
 
@@ -774,9 +792,11 @@ void DataWizard::finished() {
   uint n_curves = 0;
   uint n_steps = 0;
 
+  dialogDefaults().setValue("wizard/updateType", _pageDataSource->updateType());
   dialogDefaults().setValue("wizard/doPSD", _pageDataPresentation->plotPSD());
   dialogDefaults().setValue("wizard/doXY", _pageDataPresentation->plotData());
   dialogDefaults().setValue("wizard/curvePlacement", _pagePlot->curvePlacement());
+  dialogDefaults().setValue("wizard/plotPlacement", _pagePlot->plotTabPlacement());
   dialogDefaults().setValue("wizard/plotCount", _pagePlot->plotCount());
 
   dialogDefaults().setValue("wizard/legendsOn", _pagePlot->legendsOn());

src/libkstapp/datawizard.h

@@ -47,6 +47,7 @@ class DataWizardPageDataSource : public QWizardPage, Ui::DataWizardPageDataSourc
     DataSourcePtr dataSource() const;
 
     void setTypeActivated();
+    int updateType();
 
   public Q_SLOTS:
     void sourceChanged(const QString&);

src/widgets/dialogdefaults.h

@@ -93,9 +93,11 @@ namespace Kst {
 //  matrix/yNumSteps             matrixdialog.cpp
 //  matrix/yReadToEnd            matrixdialog.cpp
 
+// wizard/updateType    int      datawizard.cpp
 // wizard/doPSD         bool     datawizard.cpp
 // wizard/doXY          bool     datawizard.cpp
 // wizard/curvePlacement enum    datawizard.cpp
+// wizard/plotPlacement  enum    datawizard.cpp
 // wizard/plotCount     int      datawizard.cpp
 
 // changedatafile/newFileName  QString  changefiledialog.cpp