Skip to content

D
DaqIOLib
Commit edebc038 by iowa\vhorosewski
Options

*** empty log message ***

parent d3ccbace
Showing with 3 additions and 1 deletions
DaqFileIO.cxx
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
/// ///
// DAQ low level IO Library // DAQ low level IO Library
// //
// $Id: DaqFileIO.cxx,v 1.18 2011/10/06 21:53:56 iowa\dheitbri Exp $ // $Id: DaqFileIO.cxx,v 1.19 2011/10/07 20:48:06 iowa\vhorosewski Exp $
// Date: March, 2005 // Date: March, 2005
// Author: Yiannis Papelis // Author: Yiannis Papelis
// //
...@@ -1754,6 +1754,7 @@ CDaqLowLevelIo::GetFullData( ...@@ -1754,6 +1754,7 @@ CDaqLowLevelIo::GetFullData(
bool diffChan = chInf.GetCapRate() < 0; bool diffChan = chInf.GetCapRate() < 0;
const void* pSrc = latestData[idx].GetDataPtr(); const void* pSrc = latestData[idx].GetDataPtr();
if (pSrc) {
if ( diffChan && (option & eEXPAND_DIFFERENTIAL) ) { if ( diffChan && (option & eEXPAND_DIFFERENTIAL) ) {
userDataStorage[idx].Append(pSrc, size, chInf.GetItemCount()); userDataStorage[idx].Append(pSrc, size, chInf.GetItemCount());
if ( pFrmList) (*pFrmList)[idx].push_back(curFrame); if ( pFrmList) (*pFrmList)[idx].push_back(curFrame);
...@@ -1764,6 +1765,7 @@ CDaqLowLevelIo::GetFullData( ...@@ -1764,6 +1765,7 @@ CDaqLowLevelIo::GetFullData(
} }
} }
} }
}
else { // no data for that frame else { // no data for that frame
if ( option & eEXPAND_DIFFERENTIAL ) { if ( option & eEXPAND_DIFFERENTIAL ) {
// when expanding differential data, we output samples for each frame // when expanding differential data, we output samples for each frame
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment