Now the data manager handles data sources also.

This displays datasourses, and enables delete for datasources.
Kst-plot · Apr 19, 2017 · 071a425 · 071a425
1 parent d246b89
commit 071a425
Show file tree

Hide file tree

Showing 5 changed files with 68 additions and 51 deletions.
diff --git a/src/datasources/bis/moc_bisdatasource.cxx_parameters b/src/datasources/bis/moc_bisdatasource.cxx_parameters
diff --git a/src/libkst/datasource.cpp b/src/libkst/datasource.cpp
@@ -152,8 +152,6 @@ DataSource::DataSource(ObjectStore *store, QSettings *cfg, const QString& filena
 
   _initializeShortName();
 
-  setDescriptiveName(QFileInfo(_filename).fileName() + " (" + shortName() + ')');
-
   // Timer needs to be the default: File sometimes fails.
   startUpdating(Timer);
 }
@@ -261,7 +259,25 @@ void DataSource::checkUpdate() {
 
 
 void DataSource::deleteDependents() {
+
+  ObjectList<Primitive> primitiveList = _store->getObjects<Primitive>();
+  foreach (PrimitivePtr primitive, primitiveList) {
+    DataPrimitive* dp = qobject_cast<DataPrimitive*>(primitive);
+    if (dp && (dp->dataSource()->Name() == Name())) {
+      primitive->deleteDependents();
+      _store->removeObject(primitive);
+    }
+  }
+
+  QList<ObjectPtr> Objects = _store->objectList();
+
   foreach (const PrimitivePtr &p, slavePrimitives) {
+    ObjectPtr op = kst_cast<Object>(p);
+    foreach (ObjectPtr object, Objects) {
+      if (object->uses(op)) {
+        _store->removeObject(object);
+      }
+    }
     store()->removeObject(p);
   }
 }
@@ -548,7 +564,7 @@ void DataSource::disableReuse() {
 }
 
 QString DataSource::_automaticDescriptiveName() const {
-  return fileName();
+  return QFileInfo(_filename).fileName();
 }
 
 QString DataSource::descriptionTip() const {

diff --git a/src/libkstapp/datamanager.cpp b/src/libkstapp/datamanager.cpp
@@ -408,6 +408,8 @@ void DataManager::deleteObject() {
     _doc->objectStore()->removeObject(dataObject);
   } else if (PrimitivePtr primitive = kst_cast<Primitive>(_currentObject)) {
     _doc->objectStore()->removeObject(primitive);
+  } else if (DataSourcePtr datasource = kst_cast<DataSource>(_currentObject)) {
+    _doc->objectStore()->removeObject(datasource);
   }
   _currentObject = 0;
   UpdateServer::self()->requestUpdateSignal();

diff --git a/src/libkstapp/sessionmodel.cpp b/src/libkstapp/sessionmodel.cpp
@@ -23,6 +23,7 @@
 #include <generatedvector.h>
 #include <datamatrix.h>
 #include <generatedmatrix.h>
+#include <datasource.h>
 
 namespace Kst {
 
@@ -54,20 +55,25 @@ void SessionModel::generateObjectList() {
   ObjectList<Primitive> pol = _store->getObjects<Primitive>();
   ObjectList<Relation> rol = _store->getObjects<Relation>();
   ObjectList<DataObject> dol = _store->getObjects<DataObject>();
+  DataSourceList dsl = _store->dataSourceList();
   _objectList.clear();
-  foreach(Primitive* P, pol) {
+  foreach(PrimitivePtr P, pol) {
     if ((!P->provider()) && (!P->hidden())) {
       _objectList.append(P);
     }
   }
 
-  foreach(Relation* relation, rol) {
+  foreach(RelationPtr relation, rol) {
     _objectList.append(relation);
   }
 
-  foreach(DataObject* dataObject, dol) {
+  foreach(DataObjectPtr dataObject, dol) {
     _objectList.append(dataObject);
   }
+
+  foreach(DataSourcePtr dataSource, dsl) {
+    _objectList.append(dataSource);
+  }
 }
 
 
@@ -142,9 +148,12 @@ QVariant SessionModel::data(const QModelIndex& index, int role) const {
     return relationData(p, index);
   } else if (PrimitivePtr p=kst_cast<Primitive>(_objectList.at(row))) {
     return primitiveData(p, index);
+  } else if (DataSourcePtr p=kst_cast<DataSource>(_objectList.at(row))) {
+    return dataSourceData(p, index);
   } else {
     return QVariant();
   }
+  return QVariant();
 }
 
 
@@ -196,6 +205,40 @@ QVariant SessionModel::primitiveData(PrimitivePtr p, const QModelIndex& index) c
   return rc;
 }
 
+QVariant SessionModel::dataSourceData(DataSourcePtr p, const QModelIndex& index) const {
+  QVariant rc;
+
+  if (!p) {
+    return rc;
+  }
+
+  p->readLock();
+  switch (index.column()) {
+  case 0:
+    rc.setValue(p->Name());
+    break;
+  case 1:
+    rc = p->typeString();
+    break;
+    //case 2:
+    //  rc = p->sizeString();
+    //  break;
+  case 3:
+    if (p->updateType() == DataSource::Timer) {
+      rc = "Timer update. " + p->fileName();
+    } else if (p->updateType() == DataSource::File) {
+      rc = "FileChange update. " + p->fileName();
+    } else if (p->updateType() == DataSource::None) {
+      rc = "No update. " + p->fileName();
+    }
+    break;
+  default:
+    break;
+  }
+  p->unlock();
+  return rc;
+}
+
 QVariant SessionModel::dataObjectData(DataObjectPtr p, const QModelIndex& index) const {
   QVariant rc;
   if (!p) {

diff --git a/src/libkstapp/sessionmodel.h b/src/libkstapp/sessionmodel.h
@@ -46,6 +46,7 @@ public Q_SLOTS:
 private:
   QVariant dataObjectOutputData(DataObjectPtr parent, const QModelIndex& index) const;
   QVariant primitiveData(PrimitivePtr parent, const QModelIndex& index) const;
+  QVariant dataSourceData(DataSourcePtr parent, const QModelIndex& index) const;
   QVariant dataObjectData(DataObjectPtr dataObject, const QModelIndex& index) const;
   QVariant relationData(RelationPtr relation, const QModelIndex& index) const;