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

[Eli Fidler]

SVN commit 607050 by fidler:

use trees for scalars and strings


 M  +6 -6      labelrenderer.cpp  


--- branches/work/kst/hierarchy/kst/src/libkstapp/labelrenderer.cpp #607049:607050
@@ -87,9 +87,9 @@
           rc._cache->append(DataRef(DataRef::DRExpression, fi->text, QString::null, 0.0, QVariant(eqResult)));
         }
       } else {
-        KST::scalarList.lock().readLock();
-        KstScalarPtr scp = *KST::scalarList.findTag(fi->text);
-        KST::scalarList.lock().unlock();
+        KST::scalarNameTree.lock().readLock();
+        KstScalarPtr scp = kst_cast<KstScalar>(KST::scalarNameTree.retrieveObject(KstObjectTag::fromString(fi->text)));
+        KST::scalarNameTree.lock().unlock();
         if (scp) {
           scp->readLock();
           txt = QString::number(scp->value(), 'g', rc.precision);
@@ -98,9 +98,9 @@
           }
           scp->unlock();
         } else {
-          KST::stringList.lock().readLock();
-          KstStringPtr stp = *KST::stringList.findTag(fi->text);
-          KST::stringList.lock().unlock();
+          KST::stringNameTree.lock().readLock();
+          KstStringPtr stp = kst_cast<KstString>(KST::stringNameTree.retrieveObject(KstObjectTag::fromString(fi->text)));
+          KST::stringNameTree.lock().unlock();
           if (stp) {
             stp->readLock();
             txt = stp->value();