Revert "Replace display.format with .form and .precision"

This reverts commit 4ffddfa2f6.
This commit is contained in:
Michael Davidsaver
2019-05-06 10:40:54 -07:00
parent 3ae2d09fe3
commit cd2436342d
6 changed files with 37 additions and 6 deletions
+3 -1
View File
@@ -172,6 +172,7 @@ static void testDisplay()
dy.setLow(-10.0);
dy.setHigh(-1.0);
dy.setDescription(string("testDescription"));
dy.setFormat(string("%f10.0"));
dy.setUnits(string("volts"));
result = pvDisplay.set(dy);
testOk1(result);
@@ -179,6 +180,7 @@ static void testDisplay()
testOk1(dy.getLow()==display.getLow());
testOk1(dy.getHigh()==display.getHigh());
testOk1(dy.getDescription().compare(display.getDescription())==0);
testOk1(dy.getFormat().compare(display.getFormat())==0);
testOk1(dy.getUnits().compare(display.getUnits())==0);
double low = display.getLow();
double high = display.getHigh();
@@ -215,7 +217,7 @@ static void testEnumerated()
MAIN(testProperty)
{
testPlan(26);
testPlan(27);
testDiag("Tests property");
fieldCreate = getFieldCreate();
pvDataCreate = getPVDataCreate();
+5 -1
View File
@@ -224,6 +224,10 @@ static void testPVScalarWithProperties(
string("display.description"));
testOk1(desc.get()!=0);
desc->put(string("this is a description"));
PVStringPtr format = pvStructure->getSubField<PVString>(
string("display.format"));
testOk1(format.get()!=0);
format->put(string("f10.2"));
PVStringPtr units = pvStructure->getSubField<PVString>(
string("display.units"));
testOk1(units.get()!=0);
@@ -736,7 +740,7 @@ static void testSubField()
MAIN(testPVData)
{
testPlan(261);
testPlan(271);
try{
fieldCreate = getFieldCreate();
pvDataCreate = getPVDataCreate();