[Kst] branches/kst/hfi_calib/kst/kst

[George Staikos]

SVN commit 513084 by staikos:

this should make expressions and vector index updating work


 M  +13 -3     kstviewlabel.cpp  


--- branches/kst/hfi_calib/kst/kst/kstviewlabel.cpp #513083:513084
@@ -853,14 +853,24 @@
         }
         break;
       case DataRef::DRExpression:
-      // FIXME: implement
-        abort();
+        {
+          bool ok = false;
+          const double val = Equation::interpret((*i).name.latin1(), &ok);
+          if (QVariant(val) != (*i).value) {
+            valid = false;
+          }
+        }
       case DataRef::DRVector:
         {
+          bool ok = false;
+          const double idx = Equation::interpret((*i).index.latin1(), &ok);
+          if (idx != (*i).indexValue) {
+            valid = false;
+            break;
+          }
           KST::vectorList.lock().readLock();
           KstVectorPtr p = *KST::vectorList.findTag((*i).name);
           KST::vectorList.lock().readUnlock();
-          // FIXME: check the index for a change also
           if (p) {
             p->readLock();
             if (QVariant(p->value(int((*i).indexValue))) != (*i).value) {