src/libkst/namedobject.cpp

@@ -309,6 +309,41 @@ bool shortNameLessThan(NamedObject *o1, NamedObject *o2) {
   return (n1.toInt() < n2.toInt());
 }
 
+void resetNameIndexes() {
+   _vnum = 1; // vectors
+   _pnum = 1; // plugins
+   _csdnum = 1; // csd
+   _cnum = 1; // curves
+   _enum = 1; // equations
+   _hnum = 1; // histograms
+   _inum = 1; // images
+   _psdnum = 1; // psd
+   _xnum = 1; // scalars
+   _tnum = 1; // text string
+   _mnum = 1; // matrix
+   _plotnum = 1; // plots
+   _lnum = 1; // legend
+   _dnum = 1; // view item
+   _dsnum = 1; // datasource
+
+   max_vnum = 0; // vectors
+   max_pnum = 0; // plugins
+   max_csdnum = 0; // csd
+   max_cnum = 0; // curves
+   max_enum = 0; // equations
+   max_hnum = 0; // histograms
+   max_inum = 0; // images
+   max_psdnum = 0; // psd
+   max_xnum = 0; // scalars
+   max_tnum = 0; // text string
+   max_mnum = 0; // matrix
+   max_plotnum = 0; // plots
+   max_lnum = 0; // legends
+   max_dnum = 0; // view item
+   max_dsnum = 0; // datasource
+
+}
+
 //void NamedObject::_initializeShortName() {
 //}
 

src/libkst/namedobject.h

@@ -66,6 +66,8 @@ struct SizeCache {
     QString name;
 };
 
+void resetNameIndexes();
+
 class KSTCORE_EXPORT NamedObject 
 {
 public: 

src/libkstapp/filterfitdialog.cpp

@@ -136,6 +136,7 @@ void FilterFitTab::pluginChanged(const QString &plugin) {
   if (_store) {
     _configWidget->setObjectStore(_store);
   }
+  configWidget()->load();
   if (_vectorX) {
     _configWidget->setVectorX(_vectorX);
   }
@@ -147,7 +148,6 @@ void FilterFitTab::pluginChanged(const QString &plugin) {
   }
   _layout->addWidget(_configWidget, 0, 0);
   _layout->activate();
-  //configWidget()->load();
 }
 
 

src/libkstapp/mainwindow.cpp

@@ -296,6 +296,7 @@ void MainWindow::newDoc(bool force) {
     delete _dataManager;
     _dataManager = 0;
     delete _doc;
+    resetNameIndexes();
     _doc = new Document(this);
     _scriptServer->setStore(_doc->objectStore());
     tabWidget()->clear();

src/plugins/filters/butterworth_bandpass/butterworth_bandpass.cpp

@@ -28,6 +28,7 @@ static const QString& VECTOR_OUT = "Y";
 class ConfigFilterButterworthBandPassPlugin : public Kst::DataObjectConfigWidget, public Ui_FilterButterworthBandPassConfig {
   public:
     ConfigFilterButterworthBandPassPlugin(QSettings* cfg) : DataObjectConfigWidget(cfg), Ui_FilterButterworthBandPassConfig() {
+      _store = 0;
       setupUi(this);
     }
 

src/plugins/filters/butterworth_bandstop/butterworth_bandstop.cpp

@@ -28,6 +28,7 @@ static const QString& VECTOR_OUT = "Y";
 class ConfigFilterButterworthBandStopPlugin : public Kst::DataObjectConfigWidget, public Ui_FilterButterworthBandStopConfig {
   public:
     ConfigFilterButterworthBandStopPlugin(QSettings* cfg) : DataObjectConfigWidget(cfg), Ui_FilterButterworthBandStopConfig() {
+      _store = 0;
       setupUi(this);
     }
 

src/plugins/filters/butterworth_highpass/butterworth_highpass.cpp

@@ -27,6 +27,7 @@ static const QString& VECTOR_OUT = "Y";
 class ConfigFilterButterworthHighPassPlugin : public Kst::DataObjectConfigWidget, public Ui_FilterButterworthHighPassConfig {
   public:
     ConfigFilterButterworthHighPassPlugin(QSettings* cfg) : DataObjectConfigWidget(cfg), Ui_FilterButterworthHighPassConfig() {
+      _store = 0;
       setupUi(this);
     }
 

src/plugins/filters/butterworth_lowpass/butterworth_lowpass.cpp

@@ -28,6 +28,7 @@ static const QString& VECTOR_OUT = "Y";
 class ConfigFilterButterworthLowPassPlugin : public Kst::DataObjectConfigWidget, public Ui_FilterButterworthLowPassConfig {
   public:
     ConfigFilterButterworthLowPassPlugin(QSettings* cfg) : DataObjectConfigWidget(cfg), Ui_FilterButterworthLowPassConfig() {
+      _store = 0;
       setupUi(this);
     }
 

src/plugins/filters/cumulativeaverage/cumulativeaverage.cpp

@@ -23,6 +23,7 @@ static const QString& VECTOR_OUT = "Avg(Y)";
 class ConfigCumulativeAveragePlugin : public Kst::DataObjectConfigWidget, public Ui_CumulativeAverageConfig {
   public:
     ConfigCumulativeAveragePlugin(QSettings* cfg) : DataObjectConfigWidget(cfg), Ui_CumulativeAverageConfig() {
+      _store = 0;
       setupUi(this);
     }
 

src/plugins/filters/cumulativesum/cumulativesum.cpp

@@ -24,6 +24,7 @@ static const QString& VECTOR_OUT = "sum(Y)dX";
 class ConfigCumulativeSumPlugin : public Kst::DataObjectConfigWidget, public Ui_CumulativeSumConfig {
   public:
     ConfigCumulativeSumPlugin(QSettings* cfg) : DataObjectConfigWidget(cfg), Ui_CumulativeSumConfig() {
+      _store = 0;
       setupUi(this);
     }
 

src/plugins/filters/despike/filterdespike.cpp

@@ -25,6 +25,7 @@ static const QString& VECTOR_OUT = "Y";
 class ConfigWidgetFilterDespikePlugin : public Kst::DataObjectConfigWidget, public Ui_FilterDespikeConfig {
   public:
     ConfigWidgetFilterDespikePlugin(QSettings* cfg) : DataObjectConfigWidget(cfg), Ui_FilterDespikeConfig() {
+      _store = 0;
       setupUi(this);
     }
 

src/plugins/filters/differentiation/differentiation.cpp

@@ -24,6 +24,7 @@ static const QString& VECTOR_OUT = "dY/dX";
 class ConfigDifferentiationPlugin : public Kst::DataObjectConfigWidget, public Ui_DifferentiationConfig {
   public:
     ConfigDifferentiationPlugin(QSettings* cfg) : DataObjectConfigWidget(cfg), Ui_DifferentiationConfig() {
+      _store = 0;
       setupUi(this);
     }
 

src/plugins/filters/unwind/filterunwind.cpp

@@ -26,6 +26,7 @@ static const QString& VECTOR_OUT = "Y";
 class ConfigWidgetFilterUnwindPlugin : public Kst::DataObjectConfigWidget, public Ui_FilterUnwindConfig {
   public:
     ConfigWidgetFilterUnwindPlugin(QSettings* cfg) : DataObjectConfigWidget(cfg), Ui_FilterUnwindConfig() {
+      _store = 0;
       setupUi(this);
     }