Compare commits
5 Commits
4404590c44
...
v2.0.6
Author | SHA1 | Date | |
---|---|---|---|
46db4f3fe8 | |||
ef0bb7550d | |||
730b3dad83 | |||
9c69e94102 | |||
bd9135820a |
@@ -84,6 +84,7 @@ namespace imc
|
||||
// noncritical keys
|
||||
key(false,"NO","origin of data",1),
|
||||
key(false,"NT","timestamp of trigger",1),
|
||||
key(false,"NT","timestamp of trigger",2),
|
||||
key(false,"ND","(color) display properties",1),
|
||||
key(false,"NU","user defined key",1),
|
||||
key(false,"Np","property of channel",1),
|
||||
|
@@ -236,13 +236,27 @@ namespace imc
|
||||
// provide UUID for channel
|
||||
chnenv.uuid_ = chnenv.CNuuid_;
|
||||
|
||||
// for multichannel data there may be multiple channels referring to
|
||||
// the same (final) CS block (in contrast to what the IMC software
|
||||
// documentation seems to suggest) resulting in all channels missing
|
||||
// a CS block except for the very last
|
||||
if ( chnenv.CSuuid_.empty() ) {
|
||||
for ( imc::block blkCS: rawblocks_ ) {
|
||||
if ( blkCS.get_key().name_ == "CS"
|
||||
&& blkCS.get_begin() > (unsigned long int)stol(chnenv.uuid_) ) {
|
||||
chnenv.CSuuid_ = blkCS.get_uuid();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// create channel object and add it to the map of channels
|
||||
channels_.insert( std::pair<std::string,imc::channel>
|
||||
(chnenv.CNuuid_,imc::channel(chnenv,&mapblocks_,&buffer_))
|
||||
);
|
||||
|
||||
// reset channel uuid
|
||||
chnenv.CNuuid_.clear();
|
||||
chnenv.reset();
|
||||
//chnenv.CNuuid_.clear();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -254,7 +268,6 @@ namespace imc
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public:
|
||||
|
||||
// provide buffer size
|
||||
|
@@ -1 +1 @@
|
||||
2.0.3
|
||||
2.0.6
|
||||
|
Reference in New Issue
Block a user