replaced tabs with spaces
This commit is contained in:
@ -168,36 +168,36 @@ bool PVArrayFilter::filter(const PVFieldPtr & pvField,const BitSetPtr & bitSet,b
|
|||||||
long end = this->end;
|
long end = this->end;
|
||||||
long no_elements = masterArray->getLength();
|
long no_elements = masterArray->getLength();
|
||||||
if(start<0) {
|
if(start<0) {
|
||||||
start = no_elements+start;
|
start = no_elements+start;
|
||||||
if(start<0) start = 0;
|
if(start<0) start = 0;
|
||||||
}
|
}
|
||||||
if (end < 0) {
|
if (end < 0) {
|
||||||
end = no_elements + end;
|
end = no_elements + end;
|
||||||
if (end < 0) end = 0;
|
if (end < 0) end = 0;
|
||||||
|
|
||||||
}
|
}
|
||||||
if(toCopy) {
|
if(toCopy) {
|
||||||
if (end >= no_elements) end = no_elements - 1;
|
if (end >= no_elements) end = no_elements - 1;
|
||||||
if (end - start >= 0) len = 1 + (end - start) / increment;
|
if (end - start >= 0) len = 1 + (end - start) / increment;
|
||||||
if(len<=0 || start>=no_elements) {
|
if(len<=0 || start>=no_elements) {
|
||||||
copyArray->setLength(0);
|
copyArray->setLength(0);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
long indfrom = start;
|
long indfrom = start;
|
||||||
long indto = 0;
|
long indto = 0;
|
||||||
copyArray->setCapacity(len);
|
copyArray->setCapacity(len);
|
||||||
if(increment==1) {
|
if(increment==1) {
|
||||||
copy(*masterArray,indfrom,1,*copyArray,indto,1,len);
|
copy(*masterArray,indfrom,1,*copyArray,indto,1,len);
|
||||||
} else {
|
} else {
|
||||||
for(long i=0; i<len; ++i) {
|
for(long i=0; i<len; ++i) {
|
||||||
copy(*masterArray,indfrom,1,*copyArray,indto,1,1);
|
copy(*masterArray,indfrom,1,*copyArray,indto,1,1);
|
||||||
indfrom += increment;
|
indfrom += increment;
|
||||||
indto += 1;
|
indto += 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
copyArray->setLength(len);
|
copyArray->setLength(len);
|
||||||
bitSet->set(pvField->getFieldOffset());
|
bitSet->set(pvField->getFieldOffset());
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
if (end - start >= 0) len = 1 + (end - start) / increment;
|
if (end - start >= 0) len = 1 + (end - start) / increment;
|
||||||
if(len<=0) return true;
|
if(len<=0) return true;
|
||||||
@ -205,13 +205,13 @@ bool PVArrayFilter::filter(const PVFieldPtr & pvField,const BitSetPtr & bitSet,b
|
|||||||
long indfrom = 0;
|
long indfrom = 0;
|
||||||
long indto = start;
|
long indto = start;
|
||||||
if(increment==1) {
|
if(increment==1) {
|
||||||
copy(*copyArray,indfrom,1,*masterArray,indto,1,len);
|
copy(*copyArray,indfrom,1,*masterArray,indto,1,len);
|
||||||
} else {
|
} else {
|
||||||
for(long i=0; i<len; ++i) {
|
for(long i=0; i<len; ++i) {
|
||||||
copy(*copyArray,indfrom,1,*masterArray,indto,1,1);
|
copy(*copyArray,indfrom,1,*masterArray,indto,1,1);
|
||||||
indfrom += 1;
|
indfrom += 1;
|
||||||
indto += increment;
|
indto += increment;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(isUnion) masterField->postPut();
|
if(isUnion) masterField->postPut();
|
||||||
return true;
|
return true;
|
||||||
@ -219,7 +219,7 @@ bool PVArrayFilter::filter(const PVFieldPtr & pvField,const BitSetPtr & bitSet,b
|
|||||||
|
|
||||||
string PVArrayFilter::getName()
|
string PVArrayFilter::getName()
|
||||||
{
|
{
|
||||||
return name;
|
return name;
|
||||||
}
|
}
|
||||||
|
|
||||||
}}
|
}}
|
||||||
|
@ -710,7 +710,7 @@ void PVCopy::setIgnore(CopyNodePtr const &node) {
|
|||||||
CopyNodePtrArrayPtr nodes = structureNode->nodes;
|
CopyNodePtrArrayPtr nodes = structureNode->nodes;
|
||||||
for(size_t i=0; i<nodes->size(); ++i) {
|
for(size_t i=0; i<nodes->size(); ++i) {
|
||||||
CopyNodePtr node = (*nodes)[i];
|
CopyNodePtr node = (*nodes)[i];
|
||||||
setIgnore(node); }
|
setIgnore(node); }
|
||||||
} else {
|
} else {
|
||||||
size_t num = node->masterPVField->getNumberFields();
|
size_t num = node->masterPVField->getNumberFields();
|
||||||
if(num>1) {
|
if(num>1) {
|
||||||
|
@ -128,7 +128,7 @@ bool PVDeadbandFilter::filter(const PVFieldPtr & pvCopy,const BitSetPtr & bitSet
|
|||||||
|
|
||||||
string PVDeadbandFilter::getName()
|
string PVDeadbandFilter::getName()
|
||||||
{
|
{
|
||||||
return name;
|
return name;
|
||||||
}
|
}
|
||||||
|
|
||||||
}}
|
}}
|
||||||
|
@ -120,7 +120,7 @@ bool PVTimestampFilter::filter(const PVFieldPtr & pvCopy,const BitSetPtr & bitSe
|
|||||||
|
|
||||||
string PVTimestampFilter::getName()
|
string PVTimestampFilter::getName()
|
||||||
{
|
{
|
||||||
return name;
|
return name;
|
||||||
}
|
}
|
||||||
|
|
||||||
}}
|
}}
|
||||||
|
@ -26,7 +26,7 @@
|
|||||||
|
|
||||||
#ifdef listenerEpicsExportSharedSymbols
|
#ifdef listenerEpicsExportSharedSymbols
|
||||||
# define epicsExportSharedSymbols
|
# define epicsExportSharedSymbols
|
||||||
# undef listenerEpicsExportSharedSymbols
|
# undef listenerEpicsExportSharedSymbols
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <shareLib.h>
|
#include <shareLib.h>
|
||||||
|
@ -25,7 +25,7 @@
|
|||||||
|
|
||||||
#ifdef powerSupplyEpicsExportSharedSymbols
|
#ifdef powerSupplyEpicsExportSharedSymbols
|
||||||
# define epicsExportSharedSymbols
|
# define epicsExportSharedSymbols
|
||||||
# undef powerSupplyEpicsExportSharedSymbols
|
# undef powerSupplyEpicsExportSharedSymbols
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <shareLib.h>
|
#include <shareLib.h>
|
||||||
|
@ -25,7 +25,7 @@
|
|||||||
|
|
||||||
#ifdef pvRecordClientEpicsExportSharedSymbols
|
#ifdef pvRecordClientEpicsExportSharedSymbols
|
||||||
# define epicsExportSharedSymbols
|
# define epicsExportSharedSymbols
|
||||||
# undef pvRecordClientEpicsExportSharedSymbols
|
# undef pvRecordClientEpicsExportSharedSymbols
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <shareLib.h>
|
#include <shareLib.h>
|
||||||
|
Reference in New Issue
Block a user