Compare commits
No commits in common. "a8de97a528be02c48b7f4a30dd07f95e988f540d" and "cc702a413efc2672c3e1ac3a842b5a77e4c1cf4c" have entirely different histories.
a8de97a528
...
cc702a413e
@ -49,7 +49,6 @@ 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
|
||||||
|
@ -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, ATBTimeBase>(TimeBase.tbase_id, TimeBase));
|
cfg->TimeBase.insert(pair<int, ATBTimeRange>(TimeBase.tbase_id, TimeBase));
|
||||||
break;
|
break;
|
||||||
case MemberType::TimeRangeType:
|
case MemberType::TimeRangeType:
|
||||||
// qCritical() << TimeRange;
|
// qCritical() << TimeRange;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user