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

unified output to caget

Browse Source
This commit is contained in:
Matej Sekoranja
2012-10-10 18:16:43 +02:00
parent 2db0594709
commit c0b889e7e7
1 changed files with 35 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
testApp/remote/pvget.cpp
View File

@@ -135,9 +135,11 @@ class ChannelGetRequesterImpl : public ChannelGetRequester
}
if (fieldSeparator == ' ' && value->getField()->getType() == scalar)
std::cout << std::setw(31) << std::left << m_channelName;
std::cout << std::setw(30) << std::left << m_channelName;
else
std::cout << m_channelName << fieldSeparator;
std::cout << m_channelName;
std::cout << fieldSeparator;
terse(std::cout, value) << std::endl;
}
@@ -222,13 +224,40 @@ class MonitorRequesterImpl : public MonitorRequester
MonitorElement::shared_pointer element;
while (element = monitor->poll())
{
std::cout << m_channelName << ": ";
if (mode == ValueOnlyMode)
{
PVField::shared_pointer value = element->pvStructurePtr->getSubField("value");
if (value.get() == 0)
{
std::cerr << "no 'value' field" << std::endl;
return;
}
if (fieldSeparator == ' ' && value->getField()->getType() == scalar)
std::cout << std::setw(30) << std::left << m_channelName;
else
std::cout << m_channelName;
std::cout << fieldSeparator;
terse(std::cout, value) << std::endl;
}
else if (mode == TerseMode)
{
if (fieldSeparator == ' ')
std::cout << std::setw(30) << std::left << m_channelName;
else
std::cout << m_channelName;
std::cout << fieldSeparator;
// TODO value only mode !!!
if (mode == TerseMode)
terseStructure(std::cout, element->pvStructurePtr) << std::endl;
}
else
std::cout << *(element->pvStructurePtr.get()) << std::endl;
{
std::cout << m_channelName << std::endl;
std::cout << *(element->pvStructurePtr.get()) << std::endl << std::endl;
}
monitor->release(element);
}