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

eget/testServer latest NTNDArray support

Browse Source
This commit is contained in:
Matej Sekoranja
2014-09-23 13:25:35 +02:00
parent 38bc3a7b60
commit a22fb63af9
3 changed files with 84 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pvtoolsSrc/eget.cpp
+57 -26
View File
@@ -682,76 +682,107 @@ void formatNTURI(std::ostream& o, PVStructurePtr const & pvStruct)
}
void formatNTImage(std::ostream& /*o*/, PVStructurePtr const & pvStruct)
void formatNTNDArray(std::ostream& /*o*/, PVStructurePtr const & pvStruct)
{
PVIntPtr colorMode = pvStruct->getIntField("colorMode");
if (colorMode.get() == 0)
PVUnion::shared_pointer pvUnion = pvStruct->getSubField<PVUnion>("value");
if (pvUnion.get() == 0)
{
std::cerr << "no int 'colorMode' field in NTImage" << std::endl;
return;
}
int32 cm = colorMode->get();
if (cm != 0 && cm != 1 && cm != 2)
{
std::cerr << "unsupported image 'colorMode', only {0,1,2} modes are supported" << std::endl;
std::cerr << "no 'value' union field in NTNDArray" << std::endl;
return;
}
PVScalarArrayPtr value = dynamic_pointer_cast<PVScalarArray>(pvStruct->getSubField("value"));
PVScalarArray::shared_pointer value = pvUnion->get<PVScalarArray>();
if (value.get() == 0)
{
std::cerr << "no scalar array 'value' field in NTImage" << std::endl;
std::cerr << "'value' union field in given NTNDArray does not hold scalar array value" << std::endl;
return;
}
// undefined
int32 cm = -1;
PVStructureArray::shared_pointer pvAttributes = pvStruct->getSubField<PVStructureArray>("attribute");
PVStructureArray::const_svector attributes(pvAttributes->view());
for (PVStructureArray::const_svector::const_iterator iter = attributes.begin();
iter != attributes.end();
iter++)
{
PVStructure::shared_pointer attribute = *iter;
PVString::shared_pointer pvName = attribute->getSubField<PVString>("name");
if (pvName && pvName->get() == "ColorMode")
{
PVInt::shared_pointer pvCM = attribute->getSubField<PVUnion>("value")->get<PVInt>();
if (!pvCM)
break;
cm = pvCM->get();
break;
}
}
if (cm == -1)
{
std::cerr << "no PVInt 'ColorMode' attribute in NTNDArray" << std::endl;
return;
}
if (cm != 0 && cm != 1 && cm != 2)
{
std::cerr << "unsupported 'ColorMode', only {0,1,2} modes are supported" << std::endl;
return;
}
int32 rows, cols;
PVIntArrayPtr dim = dynamic_pointer_cast<PVIntArray>(pvStruct->getScalarArrayField("dim", pvInt));
PVStructureArray::shared_pointer dim = pvStruct->getSubField<PVStructureArray>("dimension");
if (dim.get() == 0)
{
std::cerr << "no int[] 'dim' field in NTImage" << std::endl;
std::cerr << "no 'dimension' structure array field in NTNDArray" << std::endl;
return;
}
// dim[] = { rows, columns } or
// dim[] = { 3, rows, columns }
PVIntArray::const_svector data = dim->view();
PVStructureArray::const_svector data = dim->view();
size_t dims = dim->getLength();
size_t imageSize;
if ((cm == 0 || cm == 1) && dims == 2)
{
cols = data[0];
rows = data[1];
cols = data[0]->getSubField<PVInt>("size")->get();
rows = data[1]->getSubField<PVInt>("size")->get();
imageSize = cols * rows;
}
else if (cm == 2 && dims == 3)
{
cols = data[1];
rows = data[2];
cols = data[0]->getSubField<PVInt>("size")->get();
rows = data[1]->getSubField<PVInt>("size")->get();
imageSize = cols * rows * 3;
}
else
{
std::cerr << "malformed NTImage, dim[] is invalid for specified color mode" << std::endl;
std::cerr << "malformed NTNDArray, dimension[] is invalid for specified color mode" << std::endl;
return;
}
if (rows <= 0 || cols <= 0)
{
std::cerr << "malformed NTImage, dim[] must contain elements > 0" << std::endl;
std::cerr << "malformed NTNDArray, dimension[] gives negative size" << std::endl;
return;
}
PVByteArrayPtr array = dynamic_pointer_cast<PVByteArray>(value);
if (array.get() == 0)
{
std::cerr << "currently only byte[] value field is supported" << std::endl;
std::cerr << "currently only byte[] value is supported" << std::endl;
return;
}
if (array->getLength() != imageSize)
{
std::cerr << "byte[] length does not match expected image size (" <<
std::cerr << "value array length does not match expected image size (" <<
array->getLength() << " != " << imageSize << ")" << std::endl;
return;
}
@@ -792,7 +823,7 @@ void formatNTImage(std::ostream& /*o*/, PVStructurePtr const & pvStruct)
}
else
{
// grayscale
// monochrome
fprintf(gnuplotPipe, "set palette grey\n");
fprintf(gnuplotPipe, "set cbrange [0:255]\n");
@@ -822,7 +853,7 @@ void initializeNTFormatterLUT()
ntFormatterLUT["uri:ev4:nt/2012/pwd:NTAny"] = formatNTAny;
ntFormatterLUT["uri:ev4:nt/2012/pwd:NTNameValue"] = formatNTNameValue;
ntFormatterLUT["uri:ev4:nt/2012/pwd:NTURI"] = formatNTURI;
ntFormatterLUT["uri:ev4:nt/2012/pwd:NTImage"] = formatNTImage;
ntFormatterLUT["uri:ev4:nt/2012/pwd:NTNDArray"] = formatNTNDArray;
}
void formatNT(std::ostream& o, PVFieldPtr const & pv)
testApp/remote/testNTImage.cpp
+25 -17
View File
@@ -32,7 +32,7 @@ epics::pvData::StructureConstPtr createNTNDArrayStructure()
StructureConstPtr attributeStruc = fb->setId("uri:ev4:nt/2012/pwd:NTAttribute")->
add("name", pvString)->
add("value", getFieldCreate()->createVariantUnion())->
add("description", pvString)->
add("descriptor", pvString)->
add("sourceType", pvInt)->
add("source", pvString)->
createStructure();
@@ -40,9 +40,9 @@ epics::pvData::StructureConstPtr createNTNDArrayStructure()
ntndArrayStructure = fb->setId("uri:ev4:nt/2012/pwd:NTNDArray")->
add("value", valueType)->
add("codec", codecStruc)->
add("compressedSize", pvLong)->
add("uncompressedSize", pvLong)->
add("codec", codecStruc)->
addArray("dimension", dimensionStruc)->
add("uniqueId", pvInt)->
add("dataTimeStamp", standardField->timeStamp())->
@@ -108,28 +108,36 @@ void setNTNDArrayValue(
void setNTNDArrayData(
PVStructure::shared_pointer const & imagePV,
const string & codec
const string & codec,
int32 colorMode
)
{
imagePV->getSubField<PVString>("codec.name")->put(codec);
imagePV->getSubField<PVInt>("uniqueId")->put(0);
}
/*
//d) Attributes
structure[] attribute
structure NTAttribute
string name
any value
string description
int sourceType
string source
*/
PVStructureArray::shared_pointer pvAttributes = imagePV->getSubField<PVStructureArray>("attribute");
PVStructureArray::svector attributes(pvAttributes->reuse());
PVStructure::shared_pointer attribute =
getPVDataCreate()->createPVStructure(pvAttributes->getStructureArray()->getStructure());
attribute->getSubField<PVString>("name")->put("ColorMode");
PVInt::shared_pointer pvColorMode = getPVDataCreate()->createPVScalar<PVInt>();
pvColorMode->put(colorMode);
attributes.push_back(attribute);
pvAttributes->replace(freeze(attributes));
attribute->getSubField<PVUnion>("value")->set(pvColorMode);
attribute->getSubField<PVString>("descriptor")->put("Color mode");
attribute->getSubField<PVInt>("sourceType")->put(0);
attribute->getSubField<PVString>("source")->put("");
}
void initImage(
PVStructure::shared_pointer const & imagePV,
const string & codec,
int32 colorMode,
const size_t raw_dim_size,
const int32_t* raw_dim,
const size_t raw_size,
@@ -137,13 +145,13 @@ void initImage(
)
{
setNTNDArrayValue(imagePV, raw_dim_size, raw_dim, raw_size, raw);
setNTNDArrayData(imagePV, codec);
setNTNDArrayData(imagePV, codec, colorMode);
}
void initImageEPICSv4GrayscaleLogo(PVStructure::shared_pointer const & imagePV)
{
setNTNDArrayValue(imagePV, 2, epicsv4_raw_dim, epicsv4_raw_size, epicsv4_raw);
setNTNDArrayData(imagePV, "grayscale");
setNTNDArrayData(imagePV, "", 0 /* NDColorModeMono=0 */);
}
void rotateImage(PVStructure::shared_pointer const & imagePV, const int8_t* originalImage, float deg)
@@ -152,7 +160,7 @@ void rotateImage(PVStructure::shared_pointer const & imagePV, const int8_t* orig
PVStructureArrayPtr dim = imagePV->getSubField<PVStructureArray>("dimension");
PVStructureArray::const_svector data = dim->view();
// { x, y }
// 2d NTNDArray - { x, y }
int32 cols = data[0]->getSubField<PVInt>("size")->get();
int32 rows = data[1]->getSubField<PVInt>("size")->get();
testApp/remote/testServer.cpp
+2 -2
View File
@@ -1467,12 +1467,12 @@ public:
if (isRGB)
{
const int32_t dim[] = { 3, wv, hv };
initImage(m_pvStructure, "RGB", 3, dim, fileSize, 0);
initImage(m_pvStructure, "", 2 /* NDColorModeRGB1=2 */, 3, dim, fileSize, 0);
}
else
{
const int32_t dim[] = { wv, hv };
initImage(m_pvStructure, "grayscale", 2, dim, fileSize, 0);
initImage(m_pvStructure, "", 0 /* NDColorModeMono=0 */, 2, dim, fileSize, 0);
}
PVByteArrayPtr value = std::tr1::dynamic_pointer_cast<PVByteArray>(m_pvStructure->getSubField("value"));