interim commit
This commit is contained in:
@@ -194,16 +194,15 @@ static void testPVScalarArray(
|
||||
BitSetPtr bitSet;
|
||||
String builder;
|
||||
size_t offset;
|
||||
ConvertPtr convert = getConvert();
|
||||
size_t n = 5;
|
||||
DoubleArray values(n);
|
||||
shared_vector<double> values(n);
|
||||
|
||||
pvRecord->lock_guard();
|
||||
cout << endl;
|
||||
pvStructureRecord = pvRecord->getPVRecordStructure()->getPVStructure();
|
||||
pvValueRecord = pvStructureRecord->getScalarArrayField(valueNameRecord,scalarType);
|
||||
for(size_t i=0; i<n; i++) values[i] = i;
|
||||
convert->fromDoubleArray(pvValueRecord,0,n,get(values),0);
|
||||
pvValueRecord->PVScalarArray::putFrom<pvDouble>(values);
|
||||
StructureConstPtr structure = pvCopy->getStructure();
|
||||
builder.clear(); structure->toString(&builder);
|
||||
cout << "structure from copy" << endl << builder << endl;
|
||||
@@ -215,7 +214,7 @@ static void testPVScalarArray(
|
||||
cout << "after initCopy pvValueCopy " << builder << endl;
|
||||
cout << endl;
|
||||
for(size_t i=0; i<n; i++) values[i] = i + .06;
|
||||
convert->fromDoubleArray(pvValueRecord,0,n,get(values),0);
|
||||
pvValueRecord->PVScalarArray::putFrom<pvDouble>(values);
|
||||
pvCopy->updateCopySetBitSet(pvStructureCopy,bitSet,true);
|
||||
builder.clear(); pvValueCopy->toString(&builder);
|
||||
cout << "after put(i+ .06) pvValueCopy " << builder << endl;
|
||||
@@ -228,11 +227,13 @@ static void testPVScalarArray(
|
||||
cout << "getCopyOffset() " << offset;
|
||||
cout << " pvValueCopy->getOffset() " << pvValueCopy->getFieldOffset();
|
||||
cout << " pvValueRecord->getOffset() " << pvValueRecord->getFieldOffset();
|
||||
builder.clear();
|
||||
bitSet->toString(&builder);
|
||||
cout << " bitSet " << builder;
|
||||
cout << endl;
|
||||
bitSet->clear();
|
||||
for(size_t i=0; i<n; i++) values[i] = i + 1.0;
|
||||
convert->fromDoubleArray(pvValueRecord,0,n,get(values),0);
|
||||
pvValueRecord->PVScalarArray::putFrom<pvDouble>(values);
|
||||
builder.clear();
|
||||
bitSet->toString(&builder);
|
||||
cout << "before updateCopyFromBitSet";
|
||||
@@ -241,6 +242,8 @@ static void testPVScalarArray(
|
||||
builder.clear(); pvValueCopy->toString(&builder);
|
||||
cout << " copyValue " << builder << endl;
|
||||
cout << " bitSet " << builder;
|
||||
builder.clear();
|
||||
bitSet->toString(&builder);
|
||||
cout << endl;
|
||||
bitSet->set(0);
|
||||
pvCopy->updateCopyFromBitSet(pvStructureCopy,bitSet,true);
|
||||
@@ -249,16 +252,20 @@ static void testPVScalarArray(
|
||||
cout << " recordValue " << builder << endl;
|
||||
builder.clear(); pvValueCopy->toString(&builder);
|
||||
cout << " copyValue " << builder << endl;
|
||||
builder.clear();
|
||||
bitSet->toString(&builder);
|
||||
cout << " bitSet " << builder;
|
||||
cout << endl;
|
||||
for(size_t i=0; i<n; i++) values[i] = i + 2.0;
|
||||
convert->fromDoubleArray(pvValueRecord,0,n,get(values),0);
|
||||
pvValueRecord->PVScalarArray::putFrom<pvDouble>(values);
|
||||
bitSet->set(0);
|
||||
cout << "before updateRecord";
|
||||
builder.clear(); pvValueRecord->toString(&builder);
|
||||
cout << " recordValue " << builder << endl;
|
||||
builder.clear(); pvValueCopy->toString(&builder);
|
||||
cout << " copyValue " << builder << endl;
|
||||
builder.clear();
|
||||
bitSet->toString(&builder);
|
||||
cout << " bitSet " << builder;
|
||||
cout << endl;
|
||||
pvCopy->updateRecord(pvStructureCopy,bitSet,true);
|
||||
@@ -267,6 +274,8 @@ static void testPVScalarArray(
|
||||
cout << " recordValue " << builder << endl;
|
||||
builder.clear(); pvValueCopy->toString(&builder);
|
||||
cout << " copyValue " << builder << endl;
|
||||
builder.clear();
|
||||
bitSet->toString(&builder);
|
||||
cout << " bitSet " << builder;
|
||||
cout << endl;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user