Compare commits
3 Commits
v1.0.0
...
7679eb9481
Author | SHA1 | Date | |
---|---|---|---|
7679eb9481
|
|||
a8de97a528 | |||
ed6592c273 |
@@ -49,6 +49,7 @@ public:
|
|||||||
multimap<int, ATBDailyTicket> DailyTicket;
|
multimap<int, ATBDailyTicket> DailyTicket;
|
||||||
multimap<int, ATBTimeRange> TimeRange;
|
multimap<int, ATBTimeRange> TimeRange;
|
||||||
multimap<int, ATBTimeStepConfig> TimeStepConfig;
|
multimap<int, ATBTimeStepConfig> TimeStepConfig;
|
||||||
|
multimap<int, ATBTimeBase> TimeBase;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Parse JSON string
|
/// Parse JSON string
|
||||||
|
@@ -9,7 +9,8 @@ INCLUDEPATH += $$_PRO_FILE_PWD_/include/mobilisis
|
|||||||
INCLUDEPATH += $$_PRO_FILE_PWD_/include/rapidjson
|
INCLUDEPATH += $$_PRO_FILE_PWD_/include/rapidjson
|
||||||
|
|
||||||
#start version with project neuhauser/galtuer
|
#start version with project neuhauser/galtuer
|
||||||
VERSION=1.0.0
|
#Version is set in yocto recipe with "EXTRA_QMAKEVARS_PRE"
|
||||||
|
#VERSION=1.0.0
|
||||||
|
|
||||||
CONFIG(debug, debug|release) {
|
CONFIG(debug, debug|release) {
|
||||||
win32 {
|
win32 {
|
||||||
|
@@ -417,7 +417,7 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
|
|||||||
break;
|
break;
|
||||||
case MemberType::TimeBaseType:
|
case MemberType::TimeBaseType:
|
||||||
// qCritical() << TimeBase;
|
// qCritical() << TimeBase;
|
||||||
cfg->TimeBase.insert(pair<int, ATBTimeRange>(TimeBase.tbase_id, TimeBase));
|
cfg->TimeBase.insert(pair<int, ATBTimeBase>(TimeBase.tbase_id, TimeBase));
|
||||||
break;
|
break;
|
||||||
case MemberType::TimeRangeType:
|
case MemberType::TimeRangeType:
|
||||||
// qCritical() << TimeRange;
|
// qCritical() << TimeRange;
|
||||||
|
Reference in New Issue
Block a user