Closes #14
This commit is contained in:
1 parent
51fcdb88ac
commit
0708316a37
155 files changed
+5190
-2691
No files matched your search
@@ -10,11 +10,13 @@
|
||||
*/
|
||||
|
||||
#include "dbc_decode_builder.h"
|
||||
#include <utility>
|
||||
|
||||
DecodeDatabase DbcDecodeBuilder::Build(const DbcDatabase &source) const {
|
||||
DecodeDatabase result;
|
||||
std::vector<DecodeFrame> frames;
|
||||
frames.reserve(source.frames.size());
|
||||
|
||||
for (const FrameInfo &sourceFrame : source.frames) {
|
||||
for (const FrameInfo &sourceFrame: source.frames) {
|
||||
DecodeFrame targetFrame;
|
||||
|
||||
targetFrame.name = sourceFrame.name;
|
||||
@@ -26,7 +28,8 @@ DecodeDatabase DbcDecodeBuilder::Build(const DbcDatabase &source) const {
|
||||
targetFrame.transmitter = sourceFrame.transmitter;
|
||||
targetFrame.comment = sourceFrame.comment;
|
||||
|
||||
for (const SignalInfo &sourceSignal : sourceFrame.signals) {
|
||||
targetFrame.signals.reserve(sourceFrame.signals.size());
|
||||
for (const SignalInfo &sourceSignal: sourceFrame.signals) {
|
||||
DecodeSignal targetSignal;
|
||||
|
||||
targetSignal.multiplexing = sourceSignal.multiplexing;
|
||||
@@ -44,13 +47,11 @@ DecodeDatabase DbcDecodeBuilder::Build(const DbcDatabase &source) const {
|
||||
targetSignal.comment = sourceSignal.comment;
|
||||
targetSignal.valueDescriptions = sourceSignal.valueDescriptions;
|
||||
|
||||
targetFrame.signals.push_back(targetSignal);
|
||||
targetFrame.signals.push_back(std::move(targetSignal));
|
||||
}
|
||||
|
||||
result.frames.push_back(targetFrame);
|
||||
result.frameIndexByKey[FrameKey(targetFrame.canId, targetFrame.isExtended)] =
|
||||
result.frames.size() - 1U;
|
||||
frames.push_back(std::move(targetFrame));
|
||||
}
|
||||
|
||||
return result;
|
||||
return DecodeDatabase(std::move(frames));
|
||||
}
|
||||
Reference in new issue
Block a user