Compare commits

..

No commits in common. "a8de97a528be02c48b7f4a30dd07f95e988f540d" and "cc702a413efc2672c3e1ac3a842b5a77e4c1cf4c" have entirely different histories.

2 changed files with 1 additions and 2 deletions

View File

@ -49,7 +49,6 @@ public:
multimap<int, ATBDailyTicket> DailyTicket;
multimap<int, ATBTimeRange> TimeRange;
multimap<int, ATBTimeStepConfig> TimeStepConfig;
multimap<int, ATBTimeBase> TimeBase;
/// <summary>
/// Parse JSON string

View File

@ -417,7 +417,7 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
break;
case MemberType::TimeBaseType:
// qCritical() << TimeBase;
cfg->TimeBase.insert(pair<int, ATBTimeBase>(TimeBase.tbase_id, TimeBase));
cfg->TimeBase.insert(pair<int, ATBTimeRange>(TimeBase.tbase_id, TimeBase));
break;
case MemberType::TimeRangeType:
// qCritical() << TimeRange;