* fix channel dependent buffer offset, issue #15

* add python example multichannel.py
This commit is contained in:
Mario Fink 2023-02-17 11:13:45 +01:00
parent 46db4f3fe8
commit 89b7f045a4
2 changed files with 28 additions and 4 deletions

View File

@ -318,16 +318,16 @@ namespace imc
// convert buffer to actual datatype // convert buffer to actual datatype
void convert_buffer() void convert_buffer()
{ {
// TODO no clue how/if/when to handle buffer offset/mask/subsequent_bytes
// etc. and whatever that shit is!
std::vector<imc::parameter> prms = blocks_->at(chnenv_.CSuuid_).get_parameters(); std::vector<imc::parameter> prms = blocks_->at(chnenv_.CSuuid_).get_parameters();
if ( prms.size() < 4) if ( prms.size() < 4)
{ {
throw std::runtime_error("CS block is invalid and features to few parameters"); throw std::runtime_error("CS block is invalid and features to few parameters");
} }
// extract (channel dependent) part of buffer
unsigned long int buffstrt = prms[3].begin(); unsigned long int buffstrt = prms[3].begin();
std::vector<unsigned char> CSbuffer( buffer_->begin()+buffstrt+1, std::vector<unsigned char> CSbuffer( buffer_->begin()+buffstrt+buffer_offset_+1,
buffer_->begin()+buffstrt+buffer_size_+1 ); buffer_->begin()+buffstrt+buffer_offset_+buffer_size_+1 );
// determine number of values in buffer // determine number of values in buffer
unsigned long int num_values = (unsigned long int)(CSbuffer.size()/(signbits_/8)); unsigned long int num_values = (unsigned long int)(CSbuffer.size()/(signbits_/8));

View File

@ -0,0 +1,24 @@
import IMCtermite
import pandas
if __name__ == "__main__" :
imctm = IMCtermite.imctermite(b"Measurement.raw")
chns = imctm.get_channels(True)
df = pandas.DataFrame()
xcol = "time ["+chns[0]['xunit']+"]"
df[xcol] = pandas.Series(chns[0]['xdata'])
for idx,chn in enumerate(chns) :
#xcol = (chn['xname'] if chn['xname'] != '' else "x_"+str(idx))+" ["+chn['xunit']+"]"
#df[xcol] = pandas.Series(chn['xdata'])
ycol = chn['yname']+" ["+chn['yunit']+"]"
df[ycol] = pandas.Series(chn['ydata'])
print(df)
df.to_csv("Measurement.csv",header=True,sep='\t',index=False)