epics/pva2pva
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

imprecise precision

Browse Source 
The precision should be translated into 'display.format'
somehow.  Not sure what is expected, so leave it
blank.
This commit is contained in:
Michael Davidsaver
2016-03-23 15:18:51 -04:00
parent 704c0a1485
commit 679bd53974
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pdbApp/pvif.cpp
+3 -2
View File
@@ -156,7 +156,7 @@ void attachMeta(pvCommon& pvm, const pvd::PVStructurePtr& pv)
FMAP(controlHigh, PVDouble, "control.limitHigh", PROPERTY);
FMAP(controlLow, PVDouble, "control.limitLow", PROPERTY);
FMAP(egu, PVString, "display.units", PROPERTY);
FMAP(prec, PVScalar, "display.format", PROPERTY);
//FMAP(prec, PVScalar, "display.format", PROPERTY);
FMAP(warnHigh, PVScalar, "alarm.highWarningLimit", PROPERTY);
FMAP(warnLow, PVScalar, "alarm.lowWarningLimit", PROPERTY);
FMAP(alarmHigh, PVScalar, "alarm.highAlarmLimit", PROPERTY);
@@ -336,7 +336,8 @@ void putMeta(const pvCommon& pv, unsigned dbe, db_field_log *pfl)
FMAP(DBR_GR_DOUBLE|DBR_GR_LONG, egu, units);
#undef FMAP
#define FMAP(MASK, MNAME, FNAME) if(META::mask&(MASK) && pv.MNAME) pv.MNAME->putFrom(meta.FNAME)
FMAP(DBR_GR_DOUBLE, prec, precision.dp);
// not handling precision until I get a better idea of what 'format' is supposed to be...
//FMAP(prec, PVScalar, "display.format", PROPERTY);
FMAP(DBR_AL_DOUBLE|DBR_AL_DOUBLE, warnHigh, upper_warning_limit);
FMAP(DBR_AL_DOUBLE|DBR_AL_DOUBLE, warnLow, lower_warning_limit);
FMAP(DBR_AL_DOUBLE|DBR_AL_DOUBLE, alarmHigh, upper_alarm_limit);
testApp/testpdb.cpp
+1 -1
View File
@@ -312,7 +312,7 @@ void testSingleMonitor(const PDBProvider::shared_pointer& prov)
e = mon.poll();
testOk1(!!e);
if(!!e) testEqual(toString(*e.elem->changedBitSet), "{7, 8, 11, 12, 14, 15, 17, 18}");
if(!!e) testEqual(toString(*e.elem->changedBitSet), "{7, 8, 11, 12, 15, 17, 18}");
else testFail("oops");
testFieldEqual<pvd::PVDouble>(e, "display.limitHigh", 50.0);
testApp/testpvif.cpp
+3 -3
View File
@@ -75,7 +75,7 @@ void testScalar()
pvif_li->put(mask, DBE_VALUE|DBE_ALARM|DBE_PROPERTY, NULL);
dbScanUnlock((dbCommon*)prec_li);
testEqual(toString(mask), "{2, 4, 5, 8, 9, 12, 13, 15, 16, 18, 19}");
testEqual(toString(mask), "{2, 4, 5, 8, 9, 12, 13, 16, 18, 19}");
mask.clear();
dbScanLock((dbCommon*)prec_ai);
@@ -85,7 +85,7 @@ void testScalar()
pvif_ai_rval->put(mask, DBE_VALUE|DBE_ALARM|DBE_PROPERTY, NULL);
dbScanUnlock((dbCommon*)prec_ai);
testEqual(toString(mask), "{22, 24, 25, 28, 29, 32, 33, 35, 36, 38, 39, 42, 44, 45, 48, 49, 52, 53, 55, 56, 58, 59}");
testEqual(toString(mask), "{22, 24, 25, 28, 29, 32, 33, 36, 38, 39, 42, 44, 45, 48, 49, 52, 53, 56, 58, 59}");
mask.clear();
dbScanLock((dbCommon*)prec_mbbi);
@@ -111,7 +111,7 @@ void testScalar()
testFieldEqual<pvd::PVInt>(root, "ai.timeStamp.nanoseconds", 12345678);
testFieldEqual<pvd::PVDouble>(root, "ai.display.limitHigh", 200.0);
testFieldEqual<pvd::PVDouble>(root, "ai.display.limitLow", 20.0);
testFieldEqual<pvd::PVString>(root, "ai.display.format", "2");
testFieldEqual<pvd::PVString>(root, "ai.display.format", "");
testFieldEqual<pvd::PVString>(root, "ai.display.units", "foo");
testFieldEqual<pvd::PVInt>(root, "ai_rval.value", 1234);