src/libkst/coredocument.h

@@ -27,7 +27,7 @@ namespace Kst {
 
 class ObjectStore;
 
-class KSTCORE_EXPORT CoreDocument 
+class KSTCORE_EXPORT CoreDocument
 {
   public:
     CoreDocument();

src/libkst/objectstore.h

@@ -35,7 +35,7 @@ class ObjectNameIndex;
 // The ObjectStore is responsible for storing all the Objects in an
 // application.
 
-class KSTCORE_EXPORT ObjectStore 
+class KSTCORE_EXPORT ObjectStore
 {
   public:
     ObjectStore();

src/libkst/updateserver.cpp

@@ -0,0 +1,60 @@
+/***************************************************************************
+ *                                                                         *
+ *   copyright : (C) 2013 C. Barth Netterfield                             *
+ *                   netterfield@astro.utoronto.ca                         *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#include "updateserver.h"
+#include <qapplication.h>
+
+namespace Kst {
+
+UpdateServer *UpdateServer::_self = UpdateServer::self();
+
+
+UpdateServer* UpdateServer::self() {
+  if (!_self) {
+    _self = new UpdateServer;
+    qAddPostRoutine(UpdateServer::cleanup);
+  }
+  return _self;
+}
+
+
+void UpdateServer::cleanup() {
+    delete _self;
+    _self = 0;
+}
+
+UpdateServer::UpdateServer(): _signalSuspendDepthCounter(0) {
+
+}
+
+UpdateServer::~UpdateServer() {
+}
+
+
+void UpdateServer::endSuspendSignals() {
+  if (_signalSuspendDepthCounter>0) {
+    _signalSuspendDepthCounter--;
+  }
+  if (_signalRequested) {
+    requestUpdateSignal();
+  }
+}
+
+void UpdateServer::requestUpdateSignal() {
+  if (_signalSuspendDepthCounter==0) {
+    emit objectListsChanged();
+    _signalRequested = false;
+  } else {
+    _signalRequested = true;
+  }
+}
+
+}

src/libkst/updateserver.h

@@ -0,0 +1,59 @@
+/***************************************************************************
+ *                                                                         *
+ *   copyright : (C) 2013 C. Barth Netterfield                             *
+ *                   netterfield@astro.utoronto.ca                         *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+/** this class will provide a signal when an update to object lists in
+ * dialogs is needed.  For instance, when a new vector is added, or its
+ * name has been changed. */
+
+#ifndef UPDATESERVER_H
+#define UPDATESERVER_H
+
+#include "kst_export.h"
+
+#include <QObject>
+
+namespace Kst {
+
+/** A signal is requested by a call to requestUpdateSignal.  The signal
+ * will be emitted when the _signalSuspendDepthCounter is zero.  If multiple
+ * signals are requested while _signalSuspendDepthCounter is non zero, only one
+ * will be emitted.  beginSuspendSignals() increments _signalSuspendDepthCounter.
+ * endSuspendSignals() decrements it. */
+class KSTCORE_EXPORT UpdateServer : public QObject
+{
+    Q_OBJECT
+  public:
+    static UpdateServer* self();
+    void beginSuspendSignals() {_signalSuspendDepthCounter++;}
+    void endSuspendSignals();
+    void requestUpdateSignal();
+
+  private:
+    UpdateServer();
+    ~UpdateServer();
+
+    static UpdateServer* _self;
+    static void cleanup();
+
+    int _signalSuspendDepthCounter;
+    bool _signalRequested;
+
+  Q_SIGNALS:
+    void objectListsChanged();
+
+  public slots:
+
+
+};
+
+}
+#endif // UPDATESERVER_H

src/libkstapp/changedatasampledialog.cpp

@@ -20,6 +20,7 @@
 #include "application.h"
 #include "dialogdefaults.h"
 #include "updatemanager.h"
+#include "updateserver.h"
 
 #include <QMessageBox>
 
@@ -54,6 +55,7 @@ ChangeDataSampleDialog::ChangeDataSampleDialog(QWidget *parent)
   connect(_buttonBox->button(QDialogButtonBox::Apply), SIGNAL(clicked()), this, SLOT(apply()));
   connect(_buttonBox->button(QDialogButtonBox::Ok), SIGNAL(clicked()), this, SLOT(OKClicked()));
   connect(_buttonBox->button(QDialogButtonBox::Cancel), SIGNAL(clicked()), this, SLOT(reject()));
+  connect(UpdateServer::self(), SIGNAL(objectListsChanged()), this, SLOT(updateCurveListDialog()));
 
   initializeEntries();
   updateButtons();
@@ -188,6 +190,7 @@ void ChangeDataSampleDialog::updateCurveListDialog() {
     if (!exists) {
       QListWidgetItem *item = _vectorList->takeItem(i_item);
       delete item;
+      i_item--;
     }
   }
 
@@ -203,6 +206,7 @@ void ChangeDataSampleDialog::updateCurveListDialog() {
     if (!exists) {
       QListWidgetItem *item = _selectedVectorList->takeItem(i_item);
       delete item;
+      i_item--;
     }
   }
 
@@ -379,6 +383,7 @@ void ChangeDataSampleDialog::apply() {
   }
 
   UpdateManager::self()->doUpdates(true);
+  UpdateServer::self()->requestUpdateSignal();
 
   _dialogDefaults->setValue("vector/range", _dataRange->range());
   _dialogDefaults->setValue("vector/start", _dataRange->start());

src/libkstapp/changedatasampledialog.h

@@ -50,14 +50,15 @@ class ChangeDataSampleDialog : public QDialog, Ui::ChangeDataSampleDialog
     void OKClicked();
     void apply();
 
+    void updateCurveListDialog();
 
   private:
-    void updateCurveListDialog();
 
     void updateIndexEntries();
 
     ObjectStore *_store;
 
+
 };
 
 }

src/libkstapp/changefiledialog.cpp

@@ -29,6 +29,7 @@
 #include "mainwindow.h"
 #include "application.h"
 #include "updatemanager.h"
+#include "updateserver.h"
 #include "datasourcepluginmanager.h"
 
 #include <QDir>
@@ -71,6 +72,7 @@ ChangeFileDialog::ChangeFileDialog(QWidget *parent)
   connect(_buttonBox->button(QDialogButtonBox::Apply), SIGNAL(clicked()), this, SLOT(apply()));
 
   connect(_configure, SIGNAL(clicked()), this, SLOT(showConfigWidget()));
+  connect(UpdateServer::self(), SIGNAL(objectListsChanged()), this, SLOT(updatePrimitiveList()));
 
   _dataFile->setFile(_dialogDefaults->value("changedatafile/newFileName",QDir::currentPath()).toString());
 
@@ -184,6 +186,7 @@ void ChangeFileDialog::updatePrimitiveList() {
     if (!exists) {
       QListWidgetItem *item = _changeFilePrimitiveList->takeItem(i_item);
       delete item;
+      i_item--;
     }
   }
 
@@ -199,6 +202,7 @@ void ChangeFileDialog::updatePrimitiveList() {
     if (!exists) {
       QListWidgetItem *item = _selectedFilePrimitiveList->takeItem(i_item);
       delete item;
+      i_item--;
     }
   }
 
@@ -477,6 +481,8 @@ void ChangeFileDialog::apply() {
   }
 
   UpdateManager::self()->doUpdates(true);
+  UpdateServer::self()->requestUpdateSignal();
+
   kstApp->mainWindow()->document()->setChanged(true);
 
   // store the newly used file as default for the next time the dialog is called

src/libkstapp/changefiledialog.h

@@ -54,9 +54,9 @@ class ChangeFileDialog : public QDialog, Ui::ChangeFileDialog
     void OKClicked();
     void apply();
 
-  private:
     void updatePrimitiveList();
 
+  private:
     ObjectStore *_store;
     DataSourcePtr _dataSource;
     int _requestID;

src/libkstapp/commandlineparser.cpp

@@ -732,6 +732,7 @@ bool CommandLineParser::processCommandLine(bool *ok) {
     _plotItem->view()->resetPlotFontSizes();
   }
   UpdateManager::self()->doUpdates(true);
+
   return (dataPlotted);
 }
 

src/libkstapp/csddialog.cpp

@@ -278,7 +278,6 @@ ObjectPtr CSDDialog::createNewDataObject() {
           }
       }
   }
-  UpdateManager::self()->doUpdates(true);
 
   return ObjectPtr(image.data());
 }
@@ -346,7 +345,6 @@ ObjectPtr CSDDialog::editExistingDataObject() const {
       csd->unlock();
     }
   }
-  UpdateManager::self()->doUpdates(true);
 
   return dataObject();
 }

src/libkstapp/curvedialog.cpp

@@ -477,8 +477,6 @@ ObjectPtr CurveDialog::createNewDataObject() {
       }
   }
 
-  UpdateManager::self()->doUpdates(true);
-
   return ObjectPtr(curve.data());
 }
 
@@ -601,7 +599,6 @@ ObjectPtr CurveDialog::editExistingDataObject() const {
     }
   }
 
-  UpdateManager::self()->doUpdates(true);
   return dataObject();
 }
 

src/libkstapp/datadialog.cpp

@@ -31,6 +31,7 @@
 #include "application.h"
 #include "updatemanager.h"
 #include "sessionmodel.h"
+#include "updateserver.h"
 
 namespace Kst {
 
@@ -175,11 +176,12 @@ void DataDialog::slotApply() {
     ptr = editExistingDataObject();
   }
   setDataObject(ptr);
+
   UpdateManager::self()->doUpdates();
+  UpdateServer::self()->requestUpdateSignal();
+
   kstApp->mainWindow()->document()->setChanged(true);
-  if (do_session_reset) {
-    kstApp->mainWindow()->document()->session()->triggerReset();
-  }
+
   clearModified();
 }
 

src/libkstapp/datamanager.cpp

@@ -34,6 +34,7 @@
 #include "image.h"
 #include "csd.h"
 #include "basicplugin.h"
+#include "updateserver.h"
 
 #include <QHeaderView>
 #include <QToolBar>
@@ -260,14 +261,6 @@ void DataManager::showEditDialog() {
 }
 
 
-bool DataManager::event(QEvent * event) {
-  if ((event->type() == QEvent::WindowActivate) || (event->type() == QEvent::Show)) {
-    _doc->session()->triggerReset();
-  }
-  return QDialog::event(event);
-}
-
-
 void DataManager::showVectorDialog() {
   QString tmp;
   DialogLauncher::self()->showVectorDialog(tmp);
@@ -381,7 +374,8 @@ void DataManager::deleteObject() {
     _doc->objectStore()->removeObject(primitive);
   }
   _currentObject = 0;
-  _doc->session()->triggerReset();
+  UpdateServer::self()->requestUpdateSignal();
+
   // Now select the next item
   _session->selectionModel()->select(_proxyModel->mapFromSource(model->index(row,0)), QItemSelectionModel::Select);
   // Cleanup and return
@@ -504,7 +498,7 @@ void DataManager::purge() {
   do {
     setUsedFlags();
   } while (_doc->objectStore()->deleteUnsetUsedFlags());
-  _doc->session()->triggerReset();
+  UpdateServer::self()->requestUpdateSignal();
   _session->reset();
 }
 

src/libkstapp/datamanager.h

@@ -60,8 +60,6 @@ class DataManager : public QDialog, Ui::DataManager
     void addToPlot(QAction* action);
     void removeFromPlot(QAction* action);
 
-    virtual bool event(QEvent * event);
-
     void setUsedFlags();
     void purge();
 

src/libkstapp/datawizard.cpp

@@ -34,6 +34,7 @@
 #include "datasourcepluginmanager.h"
 #include "sharedaxisboxitem.h"
 #include "boxitem.h"
+#include "updateserver.h"
 
 
 namespace Kst {
@@ -1267,6 +1268,7 @@ void DataWizard::finished() {
   QApplication::restoreOverrideCursor();
   accept();
 
+  UpdateServer::self()->requestUpdateSignal();
 }
 
 }

src/libkstapp/document.cpp

@@ -24,6 +24,7 @@
 #include <commandlineparser.h>
 #include "objectstore.h"
 #include "updatemanager.h"
+#include "updateserver.h"
 
 #include <QDebug>
 #include <QFile>
@@ -418,6 +419,9 @@ bool Document::open(const QString& file) {
   // Restore current app path
   QDir::setCurrent(restorePath);
 
+
+  UpdateServer::self()->requestUpdateSignal();
+
   return _isOpen = true;
 }