Skip to content
Snippets Groups Projects
Commit 12a0ab77 authored by Tim Übelhör's avatar Tim Übelhör
Browse files

Added Strings to the values message

parent 22426903
No related branches found
No related tags found
No related merge requests found
......@@ -67,6 +67,8 @@ table Values {
RealValues:[double];
BoolVrs:[uint];
BoolValues:[int]; // fmistandard: stored as 1(true) or 0(false) int
StringVrs:[uint];
StringValues:[string];
}
......
......@@ -611,7 +611,9 @@ struct Values FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
VT_REALVRS = 12,
VT_REALVALUES = 14,
VT_BOOLVRS = 16,
VT_BOOLVALUES = 18
VT_BOOLVALUES = 18,
VT_STRINGVRS = 20,
VT_STRINGVALUES = 22
};
const flatbuffers::String *InstanceName() const {
return GetPointer<const flatbuffers::String *>(VT_INSTANCENAME);
......@@ -637,6 +639,12 @@ struct Values FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
const flatbuffers::Vector<int32_t> *BoolValues() const {
return GetPointer<const flatbuffers::Vector<int32_t> *>(VT_BOOLVALUES);
}
const flatbuffers::Vector<uint32_t> *StringVrs() const {
return GetPointer<const flatbuffers::Vector<uint32_t> *>(VT_STRINGVRS);
}
const flatbuffers::Vector<flatbuffers::Offset<flatbuffers::String>> *StringValues() const {
return GetPointer<const flatbuffers::Vector<flatbuffers::Offset<flatbuffers::String>> *>(VT_STRINGVALUES);
}
bool Verify(flatbuffers::Verifier &verifier) const {
return VerifyTableStart(verifier) &&
VerifyOffset(verifier, VT_INSTANCENAME) &&
......@@ -654,6 +662,11 @@ struct Values FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
verifier.Verify(BoolVrs()) &&
VerifyOffset(verifier, VT_BOOLVALUES) &&
verifier.Verify(BoolValues()) &&
VerifyOffset(verifier, VT_STRINGVRS) &&
verifier.Verify(StringVrs()) &&
VerifyOffset(verifier, VT_STRINGVALUES) &&
verifier.Verify(StringValues()) &&
verifier.VerifyVectorOfStrings(StringValues()) &&
verifier.EndTable();
}
};
......@@ -685,13 +698,19 @@ struct ValuesBuilder {
void add_BoolValues(flatbuffers::Offset<flatbuffers::Vector<int32_t>> BoolValues) {
fbb_.AddOffset(Values::VT_BOOLVALUES, BoolValues);
}
void add_StringVrs(flatbuffers::Offset<flatbuffers::Vector<uint32_t>> StringVrs) {
fbb_.AddOffset(Values::VT_STRINGVRS, StringVrs);
}
void add_StringValues(flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<flatbuffers::String>>> StringValues) {
fbb_.AddOffset(Values::VT_STRINGVALUES, StringValues);
}
ValuesBuilder(flatbuffers::FlatBufferBuilder &_fbb)
: fbb_(_fbb) {
start_ = fbb_.StartTable();
}
ValuesBuilder &operator=(const ValuesBuilder &);
flatbuffers::Offset<Values> Finish() {
const auto end = fbb_.EndTable(start_, 8);
const auto end = fbb_.EndTable(start_, 10);
auto o = flatbuffers::Offset<Values>(end);
return o;
}
......@@ -706,9 +725,13 @@ inline flatbuffers::Offset<Values> CreateValues(
flatbuffers::Offset<flatbuffers::Vector<uint32_t>> RealVrs = 0,
flatbuffers::Offset<flatbuffers::Vector<double>> RealValues = 0,
flatbuffers::Offset<flatbuffers::Vector<uint32_t>> BoolVrs = 0,
flatbuffers::Offset<flatbuffers::Vector<int32_t>> BoolValues = 0) {
flatbuffers::Offset<flatbuffers::Vector<int32_t>> BoolValues = 0,
flatbuffers::Offset<flatbuffers::Vector<uint32_t>> StringVrs = 0,
flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<flatbuffers::String>>> StringValues = 0) {
ValuesBuilder builder_(_fbb);
builder_.add_Timestamp(Timestamp);
builder_.add_StringValues(StringValues);
builder_.add_StringVrs(StringVrs);
builder_.add_BoolValues(BoolValues);
builder_.add_BoolVrs(BoolVrs);
builder_.add_RealValues(RealValues);
......@@ -728,7 +751,9 @@ inline flatbuffers::Offset<Values> CreateValuesDirect(
const std::vector<uint32_t> *RealVrs = nullptr,
const std::vector<double> *RealValues = nullptr,
const std::vector<uint32_t> *BoolVrs = nullptr,
const std::vector<int32_t> *BoolValues = nullptr) {
const std::vector<int32_t> *BoolValues = nullptr,
const std::vector<uint32_t> *StringVrs = nullptr,
const std::vector<flatbuffers::Offset<flatbuffers::String>> *StringValues = nullptr) {
return Network::Protocol::CreateValues(
_fbb,
InstanceName ? _fbb.CreateString(InstanceName) : 0,
......@@ -738,7 +763,9 @@ inline flatbuffers::Offset<Values> CreateValuesDirect(
RealVrs ? _fbb.CreateVector<uint32_t>(*RealVrs) : 0,
RealValues ? _fbb.CreateVector<double>(*RealValues) : 0,
BoolVrs ? _fbb.CreateVector<uint32_t>(*BoolVrs) : 0,
BoolValues ? _fbb.CreateVector<int32_t>(*BoolValues) : 0);
BoolValues ? _fbb.CreateVector<int32_t>(*BoolValues) : 0,
StringVrs ? _fbb.CreateVector<uint32_t>(*StringVrs) : 0,
StringValues ? _fbb.CreateVector<flatbuffers::Offset<flatbuffers::String>>(*StringValues) : 0);
}
struct Feedback FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
......
......@@ -38,6 +38,11 @@ public struct Values : IFlatbufferObject
public int BoolValues(int j) { int o = __p.__offset(18); return o != 0 ? __p.bb.GetInt(__p.__vector(o) + j * 4) : (int)0; }
public int BoolValuesLength { get { int o = __p.__offset(18); return o != 0 ? __p.__vector_len(o) : 0; } }
public ArraySegment<byte>? GetBoolValuesBytes() { return __p.__vector_as_arraysegment(18); }
public uint StringVrs(int j) { int o = __p.__offset(20); return o != 0 ? __p.bb.GetUint(__p.__vector(o) + j * 4) : (uint)0; }
public int StringVrsLength { get { int o = __p.__offset(20); return o != 0 ? __p.__vector_len(o) : 0; } }
public ArraySegment<byte>? GetStringVrsBytes() { return __p.__vector_as_arraysegment(20); }
public string StringValues(int j) { int o = __p.__offset(22); return o != 0 ? __p.__string(__p.__vector(o) + j * 4) : null; }
public int StringValuesLength { get { int o = __p.__offset(22); return o != 0 ? __p.__vector_len(o) : 0; } }
public static Offset<Values> CreateValues(FlatBufferBuilder builder,
StringOffset InstanceNameOffset = default(StringOffset),
......@@ -47,9 +52,13 @@ public struct Values : IFlatbufferObject
VectorOffset RealVrsOffset = default(VectorOffset),
VectorOffset RealValuesOffset = default(VectorOffset),
VectorOffset BoolVrsOffset = default(VectorOffset),
VectorOffset BoolValuesOffset = default(VectorOffset)) {
builder.StartObject(8);
VectorOffset BoolValuesOffset = default(VectorOffset),
VectorOffset StringVrsOffset = default(VectorOffset),
VectorOffset StringValuesOffset = default(VectorOffset)) {
builder.StartObject(10);
Values.AddTimestamp(builder, Timestamp);
Values.AddStringValues(builder, StringValuesOffset);
Values.AddStringVrs(builder, StringVrsOffset);
Values.AddBoolValues(builder, BoolValuesOffset);
Values.AddBoolVrs(builder, BoolVrsOffset);
Values.AddRealValues(builder, RealValuesOffset);
......@@ -60,7 +69,7 @@ public struct Values : IFlatbufferObject
return Values.EndValues(builder);
}
public static void StartValues(FlatBufferBuilder builder) { builder.StartObject(8); }
public static void StartValues(FlatBufferBuilder builder) { builder.StartObject(10); }
public static void AddInstanceName(FlatBufferBuilder builder, StringOffset InstanceNameOffset) { builder.AddOffset(0, InstanceNameOffset.Value, 0); }
public static void AddTimestamp(FlatBufferBuilder builder, double Timestamp) { builder.AddDouble(1, Timestamp, 0.0); }
public static void AddIntVrs(FlatBufferBuilder builder, VectorOffset IntVrsOffset) { builder.AddOffset(2, IntVrsOffset.Value, 0); }
......@@ -81,6 +90,12 @@ public struct Values : IFlatbufferObject
public static void AddBoolValues(FlatBufferBuilder builder, VectorOffset BoolValuesOffset) { builder.AddOffset(7, BoolValuesOffset.Value, 0); }
public static VectorOffset CreateBoolValuesVector(FlatBufferBuilder builder, int[] data) { builder.StartVector(4, data.Length, 4); for (int i = data.Length - 1; i >= 0; i--) builder.AddInt(data[i]); return builder.EndVector(); }
public static void StartBoolValuesVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(4, numElems, 4); }
public static void AddStringVrs(FlatBufferBuilder builder, VectorOffset StringVrsOffset) { builder.AddOffset(8, StringVrsOffset.Value, 0); }
public static VectorOffset CreateStringVrsVector(FlatBufferBuilder builder, uint[] data) { builder.StartVector(4, data.Length, 4); for (int i = data.Length - 1; i >= 0; i--) builder.AddUint(data[i]); return builder.EndVector(); }
public static void StartStringVrsVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(4, numElems, 4); }
public static void AddStringValues(FlatBufferBuilder builder, VectorOffset StringValuesOffset) { builder.AddOffset(9, StringValuesOffset.Value, 0); }
public static VectorOffset CreateStringValuesVector(FlatBufferBuilder builder, StringOffset[] data) { builder.StartVector(4, data.Length, 4); for (int i = data.Length - 1; i >= 0; i--) builder.AddOffset(data[i].Value); return builder.EndVector(); }
public static void StartStringValuesVector(FlatBufferBuilder builder, int numElems) { builder.StartVector(4, numElems, 4); }
public static Offset<Values> EndValues(FlatBufferBuilder builder) {
int o = builder.EndObject();
return new Offset<Values>(o);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment