[Kst] branches/work/kst/hierarchy/kst/src/libkst

[Eli Fidler]

SVN commit 613995 by fidler:

orphan tag context

commenting


 M  +1 -0      kstobject.cpp  
 M  +1 -0      kstobject.h  
 M  +1 -1      kstprimitive.cpp  
 M  +1 -0      kstrmatrix.cpp  


--- branches/work/kst/hierarchy/kst/src/libkst/kstobject.cpp #613994:613995
@@ -24,6 +24,7 @@
 
 const QStringList KstObjectTag::globalTagContext = QStringList();
 const QStringList KstObjectTag::constantTagContext = QStringList("CONSTANTS");
+const QStringList KstObjectTag::orphanTagContext = QStringList();
 
 const KstObjectTag KstObjectTag::invalidTag = KstObjectTag(QString::null, KstObjectTag::globalTagContext);
 
--- branches/work/kst/hierarchy/kst/src/libkst/kstobject.h #613994:613995
@@ -59,6 +59,7 @@
 
     static const QStringList globalTagContext;
     static const QStringList constantTagContext;
+    static const QStringList orphanTagContext;
 
 
     // construct a tag in a given context
--- branches/work/kst/hierarchy/kst/src/libkst/kstprimitive.cpp #613994:613995
@@ -50,7 +50,7 @@
   KstObject::UpdateType providerRC = NO_CHANGE;
 
   if (update_counter > 0) {
-    KstObjectPtr prov = KstObjectPtr(_provider);
+    KstObjectPtr prov = KstObjectPtr(_provider);  // use a KstObjectPtr to prevent provider being deleted during update
     if (prov) {
       KstWriteLocker pl(prov);
 
--- branches/work/kst/hierarchy/kst/src/libkst/kstrmatrix.cpp #613994:613995
@@ -523,6 +523,7 @@
 void KstRMatrix::commonConstructor(KstDataSourcePtr file, const QString &field,
                                    int reqXStart, int reqYStart, int reqNX, int reqNY,
                                    bool doAve, bool doSkip, int skip) {
+//  kstdDebug() << "constructing KstRMatrix " << tag().displayString() << " from file " << file->tag().displayString() << " (" << (void*)(&(*file)) << ")" << endl;
   _reqXStart = reqXStart;
   _reqYStart = reqYStart;
   _reqNX = reqNX;