pfsput.cpp (pfstools-2.1.0.tgz) | : | pfsput.cpp (pfstools-2.2.0.tgz) | ||
---|---|---|---|---|
skipping to change at line 149 | skipping to change at line 149 | |||
} | } | |||
} | } | |||
/* Not implemented - hopefuly nobody uses this | /* Not implemented - hopefuly nobody uses this | |||
// Copy channel tags | // Copy channel tags | |||
{ | { | |||
Octave_map::const_iterator itChTags = pfsStream.seek( "channelTags" ); | Octave_map::const_iterator itChTags = pfsStream.seek( "channelTags" ); | |||
if( itChTags != pfsStream.end() ) { | if( itChTags != pfsStream.end() ) { | |||
if( !pfsStream.contents( itChTags )(0).is_map() ) | if( !pfsStream.contents( itChTags )(0).isstruct() ) | |||
{ | { | |||
throw pfs::Exception( "'channelTags' field must be a structure" ); | throw pfs::Exception( "'channelTags' field must be a structure" ); | |||
} | } | |||
Octave_map tagChannels = pfsStream.contents( itChTags )(0).map_value(); | Octave_map tagChannels = pfsStream.contents( itChTags )(0).map_value(); | |||
for( Octave_map::iterator itCh = tagChannels.begin(); itCh != tagChannel s.end(); itCh++ ) { | for( Octave_map::iterator itCh = tagChannels.begin(); itCh != tagChannel s.end(); itCh++ ) { | |||
std::string channelName = tagChannels.key(itCh); | std::string channelName = tagChannels.key(itCh); | |||
if( !tagChannels.contents( itCh )(0).is_map() ) { | if( !tagChannels.contents( itCh )(0).isstruct() ) { | |||
throw pfs::Exception( "each channelTags file must be a structure" ); | throw pfs::Exception( "each channelTags file must be a structure" ); | |||
} | } | |||
pfs::Channel *pfsChannel = frame->getChannel( channelName.c_str() ); | pfs::Channel *pfsChannel = frame->getChannel( channelName.c_str() ); | |||
if( pfsChannel == NULL ) { | if( pfsChannel == NULL ) { | |||
throw pfs::Exception( "can not set channel tag if channel is missing " ); | throw pfs::Exception( "can not set channel tag if channel is missing " ); | |||
} | } | |||
Octave_map tags = tagChannels.contents( itCh )(0).map_value(); | Octave_map tags = tagChannels.contents( itCh )(0).map_value(); | |||
for( Octave_map::iterator itTag = tags.begin(); itTag != tags.end(); i tTag++ ) { | for( Octave_map::iterator itTag = tags.begin(); itTag != tags.end(); i tTag++ ) { | |||
std::string tagName = tags.key(itTag); | std::string tagName = tags.key(itTag); | |||
End of changes. 2 change blocks. | ||||
2 lines changed or deleted | 2 lines changed or added |