* deal with any extra quotes in xunit,xname,yunit,yname => issue #13
* rename CLI binary to lowercase version * IMCtermite.pyx: rename boolean data flag * insert some double quotes in sampleA.raw for testing * version 2.0.1
This commit is contained in:
parent
ce4a106921
commit
028deaa2ce
@ -455,12 +455,12 @@ namespace imc
|
|||||||
<<"\",\"trigger-time\":\""<<std::put_time(std::localtime(&att),"%FT%T")
|
<<"\",\"trigger-time\":\""<<std::put_time(std::localtime(&att),"%FT%T")
|
||||||
<<"\",\"language-code\":\""<<language_code_
|
<<"\",\"language-code\":\""<<language_code_
|
||||||
<<"\",\"codepage\":\""<<codepage_
|
<<"\",\"codepage\":\""<<codepage_
|
||||||
<<"\",\"yname\":\""<<yname_
|
<<"\",\"yname\":\""<<prepjsonstr(yname_)
|
||||||
<<"\",\"yunit\":\""<<yunit_
|
<<"\",\"yunit\":\""<<prepjsonstr(yunit_)
|
||||||
<<"\",\"significantbits\":\""<<signbits_
|
<<"\",\"significantbits\":\""<<signbits_
|
||||||
<<"\",\"addtime\":\""<<addtime_
|
<<"\",\"addtime\":\""<<addtime_
|
||||||
<<"\",\"xname\":\""<<xname_
|
<<"\",\"xname\":\""<<prepjsonstr(xname_)
|
||||||
<<"\",\"xunit\":\""<<xunit_
|
<<"\",\"xunit\":\""<<prepjsonstr(xunit_)
|
||||||
<<"\",\"xstepwidth\":\""<<xstepwidth_
|
<<"\",\"xstepwidth\":\""<<xstepwidth_
|
||||||
<<"\",\"xoffset\":\""<<xoffset_
|
<<"\",\"xoffset\":\""<<xoffset_
|
||||||
<<"\",\"group\":{"<<"\"index\":\""<<group_index_
|
<<"\",\"group\":{"<<"\"index\":\""<<group_index_
|
||||||
@ -477,6 +477,25 @@ namespace imc
|
|||||||
return ss.str();
|
return ss.str();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// prepare string value for usage in JSON dump
|
||||||
|
std::string prepjsonstr(std::string value)
|
||||||
|
{
|
||||||
|
std::stringstream ss;
|
||||||
|
ss<<quoted(value);
|
||||||
|
return strip_quotes(ss.str());
|
||||||
|
}
|
||||||
|
|
||||||
|
// remove any leading or trailing double quotes
|
||||||
|
std::string strip_quotes(std::string astring)
|
||||||
|
{
|
||||||
|
// head
|
||||||
|
if ( astring.front() == '"' ) astring.erase(astring.begin()+0);
|
||||||
|
// tail
|
||||||
|
if ( astring.back() == '"' ) astring.erase(astring.end()-1);
|
||||||
|
|
||||||
|
return astring;
|
||||||
|
}
|
||||||
|
|
||||||
// print channel
|
// print channel
|
||||||
void print(std::string filename, const char sep = ',', int width = 25, int yprec = 9)
|
void print(std::string filename, const char sep = ',', int width = 25, int yprec = 9)
|
||||||
{
|
{
|
||||||
|
2
makefile
2
makefile
@ -3,7 +3,7 @@
|
|||||||
SHELL := /bin/bash
|
SHELL := /bin/bash
|
||||||
|
|
||||||
# name of executable and CLI tool
|
# name of executable and CLI tool
|
||||||
EXE = IMCtermite
|
EXE = imctermite
|
||||||
|
|
||||||
# directory names
|
# directory names
|
||||||
SRC = src/
|
SRC = src/
|
||||||
|
@ -20,8 +20,8 @@ cdef class imctermite:
|
|||||||
self.cppimc.set_file(rawfile)
|
self.cppimc.set_file(rawfile)
|
||||||
|
|
||||||
# get JSON list of channels
|
# get JSON list of channels
|
||||||
def get_channels(self, bool data):
|
def get_channels(self, bool include_data):
|
||||||
chnlst = self.cppimc.get_channels(True,data)
|
chnlst = self.cppimc.get_channels(True,include_data)
|
||||||
chnlstjn = [jn.loads(chn.decode(errors="ignore")) for chn in chnlst]
|
chnlstjn = [jn.loads(chn.decode(errors="ignore")) for chn in chnlst]
|
||||||
return chnlstjn
|
return chnlstjn
|
||||||
|
|
||||||
|
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user