Commitb714eb0

committed

Fixed issue with big comment and localization.

1 parent2ccb121 commitb714eb0Copy full SHA for b714eb0

File tree

+35

-7

lines changed

+35

-7

lines changed

Lines changed: 28 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -57,3 +57,31 @@ std::string str_tolower(std::string s)`
`57`	`57`	`});`
`58`	`58`	`return s;`
`59`	`59`	`}`
	`60`	`+`
	`61`	`+std::stringstr_trim(std::string s)`
	`62`	`+{`
	`63`	`+size_t passed =0;`
	`64`	`+`
	`65`	`+if (s.empty())`
	`66`	`+return s +'\n';`
	`67`	`+`
	`68`	`+ passed =0;`
	`69`	`+`
	`70`	`+while (passed < s.size())`
	`71`	`+ {`
	`72`	`+if (s[s.size() - passed -1] >'')`
	`73`	`+ {`
	`74`	`+break;`
	`75`	`+ }`
	`76`	`+`
	`77`	`+ ++passed;`
	`78`	`+ }`
	`79`	`+`
	`80`	`+if (passed !=0)`
	`81`	`+ {`
	`82`	`+// remove tail with non-printable values`
	`83`	`+ s.erase(s.size() - passed, passed);`
	`84`	`+ }`
	`85`	`+`
	`86`	`+return s;`
	`87`	`+}`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,3 +12,5 @@ std::string PrintType(uint8_t tid);`
`12`	`12`	`std::stringstr_toupper(std::string s);`
`13`	`13`
`14`	`14`	`std::stringstr_tolower(std::string s);`
	`15`	`+`
	`16`	`+std::stringstr_trim(std::string s);`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -206,6 +206,8 @@ bool DbcLineParser::ParseSignalLine(SignalDescriptor_t* sig, const std::string&`
`206`	`206`	`//value into the signal's physical value and vice versa:`
`207`	`207`	`// physical_value = raw_value * factor + offset`
`208`	`208`	`// raw_value = (physical_value - offset) / factor`
	`209`	`+std::setlocale(LC_ALL,"en_US.UTF-8");`
	`210`	`+`
`209`	`211`	`sig->Factor =atof(valpart[3].c_str());`
`210`	`212`	`sig->Offset =atof(valpart[4].c_str());`
`211`	`213`

Lines changed: 3 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`#include"dbcscanner.h"`
`2`	`2`	`#include<algorithm>`
`3`	`3`	`#include<math.h>`
	`4`	`+#include"../helpers/formatter.h"`
`4`	`5`
`5`	`6`	`#defineMAX_LINE4096`
`6`	`7`
`@@ -67,7 +68,7 @@ void DbcScanner::ParseMessageInfo(istream& readstrm)`
`67`	`68`	`{`
`68`	`69`	`readstrm.getline(line, MAX_LINE);`
`69`	`70`
`70`		`- sline = line;`
	`71`	`+ sline =str_trim(line);`
`71`	`72`
`72`	`73`	`// New message line has been found`
`73`	`74`	`if (lparser.IsMessageLine(sline))`
`@@ -121,12 +122,7 @@ void DbcScanner::ParseOtherInfo(istream& readstrm)`
`121`	`122`	`{`
`122`	`123`	`readstrm.getline(line, MAX_LINE);`
`123`	`124`
`124`		`- sline = line;`
`125`		`-`
`126`		`-if (sline.size() >0 && sline.back() <'')`
`127`		`- {`
`128`		`- sline.erase(sline.size() -1,1);`
`129`		`- }`
	`125`	`+ sline =str_trim(line);`
`130`	`126`
`131`	`127`	`if (lparser.ParseCommentLine(&cmmnt, sline))`
`132`	`128`	`{`

Comments

(0)