diff --git a/events/events.proto b/events/events.proto index 4585780..05b8468 100644 --- a/events/events.proto +++ b/events/events.proto @@ -39,10 +39,11 @@ message ObjectsMessage { FrameRef frame_ref = 2; } +// BoundingBox that contains an object message Object { TypeObject type = 1; - int32 lLeft = 2; - int32 up = 3; + int32 left = 2; + int32 top = 3; int32 right = 4; int32 bottom = 5; float confidence = 6; diff --git a/go/events/events.pb.go b/go/events/events.pb.go index 2179c36..7dbaabb 100644 --- a/go/events/events.pb.go +++ b/go/events/events.pb.go @@ -369,10 +369,11 @@ func (m *ObjectsMessage) GetFrameRef() *FrameRef { return nil } +// BoundingBox that contains an object type Object struct { Type TypeObject `protobuf:"varint,1,opt,name=type,proto3,enum=robocar.events.TypeObject" json:"type,omitempty"` - LLeft int32 `protobuf:"varint,2,opt,name=lLeft,proto3" json:"lLeft,omitempty"` - Up int32 `protobuf:"varint,3,opt,name=up,proto3" json:"up,omitempty"` + Left int32 `protobuf:"varint,2,opt,name=left,proto3" json:"left,omitempty"` + Top int32 `protobuf:"varint,3,opt,name=top,proto3" json:"top,omitempty"` Right int32 `protobuf:"varint,4,opt,name=right,proto3" json:"right,omitempty"` Bottom int32 `protobuf:"varint,5,opt,name=bottom,proto3" json:"bottom,omitempty"` Confidence float32 `protobuf:"fixed32,6,opt,name=confidence,proto3" json:"confidence,omitempty"` @@ -413,16 +414,16 @@ func (m *Object) GetType() TypeObject { return TypeObject_ANY } -func (m *Object) GetLLeft() int32 { +func (m *Object) GetLeft() int32 { if m != nil { - return m.LLeft + return m.Left } return 0 } -func (m *Object) GetUp() int32 { +func (m *Object) GetTop() int32 { if m != nil { - return m.Up + return m.Top } return 0 } @@ -503,35 +504,35 @@ func init() { func init() { proto.RegisterFile("events/events.proto", fileDescriptor_8ec31f2d2a3db598) } var fileDescriptor_8ec31f2d2a3db598 = []byte{ - // 473 bytes of a gzipped FileDescriptorProto + // 472 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x53, 0x4d, 0x6b, 0xdb, 0x40, - 0x10, 0x8d, 0x64, 0x5b, 0x96, 0x26, 0xc1, 0x15, 0x9b, 0x12, 0xd4, 0x1c, 0x4a, 0xd0, 0xc9, 0x04, + 0x10, 0x8d, 0x64, 0x4b, 0x96, 0xc6, 0xc1, 0x15, 0x9b, 0x12, 0xd4, 0x1c, 0x4a, 0xd0, 0xc9, 0x04, 0xaa, 0x14, 0x97, 0x42, 0xaf, 0x4e, 0xd3, 0x82, 0xc1, 0x76, 0xcc, 0xda, 0x29, 0xb4, 0x97, 0xa0, - 0x8f, 0x91, 0xad, 0x62, 0x6b, 0xc5, 0x6a, 0x93, 0xe2, 0x7b, 0x7f, 0x4e, 0x7f, 0x64, 0xd9, 0x5d, - 0xad, 0x9b, 0xe8, 0xd2, 0x5e, 0x7a, 0xf2, 0xbc, 0xe7, 0x79, 0x6f, 0xdf, 0xce, 0x8e, 0xe0, 0x14, - 0x1f, 0xb1, 0x14, 0xf5, 0x95, 0xfe, 0x89, 0x2a, 0xce, 0x04, 0x23, 0x03, 0xce, 0x12, 0x96, 0xc6, - 0x3c, 0xd2, 0x6c, 0x18, 0x81, 0xfb, 0x99, 0xc7, 0x3b, 0xa4, 0x98, 0x13, 0x02, 0xdd, 0x32, 0xde, - 0x61, 0x60, 0x5d, 0x58, 0x43, 0x8f, 0xaa, 0x9a, 0x0c, 0xc0, 0x2e, 0xb2, 0xc0, 0x56, 0x8c, 0x5d, - 0x64, 0xe1, 0x1c, 0x4e, 0x54, 0xff, 0x0c, 0xeb, 0x3a, 0x5e, 0x23, 0x19, 0xaa, 0xff, 0xa5, 0xe2, - 0x78, 0x14, 0x44, 0xcf, 0xcd, 0x23, 0xe3, 0x2c, 0x95, 0xe4, 0x25, 0xf4, 0x72, 0x89, 0x95, 0xd9, - 0x09, 0xd5, 0x20, 0xfc, 0x69, 0xc1, 0x8b, 0xa5, 0x40, 0xe4, 0x45, 0xb9, 0x36, 0x9e, 0xe7, 0xe0, - 0xd6, 0x0d, 0xa5, 0x9c, 0x6d, 0x7a, 0xc0, 0xe4, 0x35, 0x40, 0xca, 0xca, 0xbc, 0xc8, 0xb0, 0x4c, - 0xb5, 0x95, 0x4d, 0x9f, 0x30, 0xe4, 0x3d, 0x78, 0xca, 0xf8, 0x9e, 0x63, 0x1e, 0x74, 0xfe, 0x12, - 0xcb, 0xcd, 0x9b, 0x4a, 0xc5, 0x58, 0x6d, 0x38, 0x13, 0x62, 0x8b, 0x4f, 0x62, 0x88, 0x86, 0x32, - 0x31, 0x0c, 0xfe, 0x5f, 0x31, 0xa6, 0xe0, 0xdf, 0xf0, 0xe2, 0x11, 0x67, 0x2c, 0x3b, 0xc4, 0xf8, - 0x00, 0x90, 0x49, 0xee, 0x7e, 0xc7, 0x32, 0x1d, 0x64, 0x30, 0x7a, 0xd5, 0xf6, 0x3a, 0xa8, 0xa8, - 0x97, 0x99, 0x32, 0xdc, 0xc3, 0xe0, 0x36, 0xf9, 0x8e, 0xa9, 0xa8, 0x8d, 0xd7, 0x5b, 0xe8, 0x33, - 0xcd, 0x04, 0xd6, 0x45, 0x67, 0x78, 0x3c, 0x3a, 0x6b, 0x1b, 0x69, 0x01, 0x35, 0x6d, 0xcf, 0x2f, - 0x62, 0xff, 0xf3, 0x45, 0x7e, 0x59, 0xe0, 0x68, 0x2b, 0x12, 0x41, 0x57, 0xec, 0x2b, 0x93, 0xfc, - 0xbc, 0x2d, 0x5e, 0xed, 0x2b, 0x6c, 0x0e, 0x55, 0x7d, 0x72, 0x4f, 0xb6, 0x53, 0xcc, 0x85, 0x3a, - 0xad, 0x47, 0x35, 0x90, 0x7b, 0xf8, 0x50, 0xa9, 0x49, 0xf6, 0xa8, 0xfd, 0x50, 0xc9, 0x2e, 0x5e, - 0xac, 0x37, 0x22, 0xe8, 0xea, 0x2e, 0x05, 0xc8, 0x19, 0x38, 0x09, 0x13, 0x82, 0xed, 0x82, 0x9e, - 0xa2, 0x1b, 0xd4, 0x7a, 0x2e, 0xa7, 0xfd, 0x5c, 0xe1, 0x15, 0x9c, 0x2e, 0x7f, 0x14, 0x22, 0xdd, - 0x50, 0x4c, 0x19, 0xcf, 0xcc, 0xb8, 0x02, 0xe8, 0x63, 0x19, 0x27, 0x5b, 0xd4, 0x1b, 0xee, 0x52, - 0x03, 0x2f, 0xdf, 0x80, 0x77, 0x18, 0x39, 0x39, 0x86, 0xfe, 0x64, 0xfe, 0x65, 0x3c, 0x9d, 0xdc, - 0xf8, 0x47, 0xc4, 0x85, 0xee, 0xdd, 0xf2, 0x13, 0xf5, 0x2d, 0xe2, 0x41, 0x6f, 0x31, 0x99, 0xde, - 0xae, 0x7c, 0xfb, 0x72, 0x04, 0xf0, 0xe7, 0x9e, 0xa4, 0x0f, 0x9d, 0xf1, 0xfc, 0xab, 0x7f, 0x24, - 0x8b, 0x8f, 0x63, 0xd9, 0xea, 0x42, 0xf7, 0xfa, 0x6e, 0xb6, 0xf0, 0x6d, 0x59, 0x2d, 0xa4, 0xa6, - 0x73, 0xed, 0x7e, 0x73, 0xf4, 0x88, 0x12, 0x47, 0x7d, 0xba, 0xef, 0x7e, 0x07, 0x00, 0x00, 0xff, - 0xff, 0x77, 0x9d, 0xdb, 0x75, 0xd1, 0x03, 0x00, 0x00, + 0x8f, 0x91, 0xad, 0x62, 0x6b, 0xcd, 0x6a, 0x49, 0xf1, 0xbd, 0x3f, 0xa7, 0x3f, 0xb2, 0xec, 0xae, + 0xd6, 0x4d, 0x74, 0x69, 0x2f, 0x3d, 0xf9, 0xbd, 0xe7, 0x99, 0xb7, 0x6f, 0x67, 0x47, 0x70, 0x86, + 0x8f, 0x58, 0x89, 0xfa, 0x5a, 0xff, 0xc4, 0x7b, 0xce, 0x04, 0x23, 0x03, 0xce, 0x52, 0x96, 0x25, + 0x3c, 0xd6, 0x6a, 0x14, 0x83, 0xf7, 0x99, 0x27, 0x3b, 0xa4, 0x58, 0x10, 0x02, 0xdd, 0x2a, 0xd9, + 0x61, 0x68, 0x5d, 0x5a, 0x43, 0x9f, 0x2a, 0x4c, 0x06, 0x60, 0x97, 0x79, 0x68, 0x2b, 0xc5, 0x2e, + 0xf3, 0x68, 0x0e, 0xa7, 0xaa, 0x7e, 0x86, 0x75, 0x9d, 0xac, 0x91, 0x0c, 0xd5, 0xff, 0xb2, 0xa3, + 0x3f, 0x0a, 0xe3, 0xe7, 0xe6, 0xb1, 0x71, 0x96, 0x9d, 0xe4, 0x25, 0x38, 0x85, 0xe4, 0xca, 0xec, + 0x94, 0x6a, 0x12, 0xfd, 0xb4, 0xe0, 0xc5, 0x52, 0x20, 0xf2, 0xb2, 0x5a, 0x1b, 0xcf, 0x0b, 0xf0, + 0xea, 0x46, 0x52, 0xce, 0x36, 0x3d, 0x72, 0xf2, 0x1a, 0x20, 0x63, 0x55, 0x51, 0xe6, 0x58, 0x65, + 0xda, 0xca, 0xa6, 0x4f, 0x14, 0xf2, 0x1e, 0x7c, 0x65, 0xfc, 0xc0, 0xb1, 0x08, 0x3b, 0x7f, 0x89, + 0xe5, 0x15, 0x0d, 0x52, 0x31, 0x56, 0x1b, 0xce, 0x84, 0xd8, 0xe2, 0x93, 0x18, 0xa2, 0x91, 0x4c, + 0x0c, 0xc3, 0xff, 0x57, 0x8c, 0x29, 0x04, 0xb7, 0xbc, 0x7c, 0xc4, 0x19, 0xcb, 0x8f, 0x31, 0x3e, + 0x00, 0xe4, 0x52, 0x7b, 0xd8, 0xb1, 0x5c, 0x07, 0x19, 0x8c, 0x5e, 0xb5, 0xbd, 0x8e, 0x5d, 0xd4, + 0xcf, 0x0d, 0x8c, 0x0e, 0x30, 0xb8, 0x4b, 0xbf, 0x63, 0x26, 0x6a, 0xe3, 0xf5, 0x16, 0x7a, 0x4c, + 0x2b, 0xa1, 0x75, 0xd9, 0x19, 0xf6, 0x47, 0xe7, 0x6d, 0x23, 0xdd, 0x40, 0x4d, 0xd9, 0xf3, 0x8b, + 0xd8, 0xff, 0x7c, 0x91, 0x5f, 0x16, 0xb8, 0xda, 0x8a, 0xc4, 0xd0, 0x15, 0x87, 0xbd, 0x49, 0x7e, + 0xd1, 0x6e, 0x5e, 0x1d, 0xf6, 0xd8, 0x1c, 0xaa, 0xea, 0xe4, 0x16, 0x6e, 0xb1, 0x10, 0xea, 0x30, + 0x87, 0x2a, 0x4c, 0x02, 0xe8, 0x08, 0xb6, 0x57, 0x83, 0x74, 0xa8, 0x84, 0x72, 0x9b, 0x78, 0xb9, + 0xde, 0x88, 0xb0, 0xab, 0x34, 0x4d, 0xc8, 0x39, 0xb8, 0x29, 0x13, 0x82, 0xed, 0x42, 0x47, 0xc9, + 0x0d, 0x6b, 0x3d, 0x97, 0xdb, 0x7e, 0xae, 0xe8, 0x1a, 0xce, 0x96, 0x3f, 0x4a, 0x91, 0x6d, 0x28, + 0x66, 0x8c, 0xe7, 0x66, 0x5c, 0x21, 0xf4, 0xb0, 0x4a, 0xd2, 0x2d, 0xea, 0x0d, 0xf7, 0xa8, 0xa1, + 0x57, 0x6f, 0xc0, 0x3f, 0x8e, 0x9c, 0xf4, 0xa1, 0x37, 0x99, 0x7f, 0x19, 0x4f, 0x27, 0xb7, 0xc1, + 0x09, 0xf1, 0xa0, 0x7b, 0xbf, 0xfc, 0x44, 0x03, 0x8b, 0xf8, 0xe0, 0x2c, 0x26, 0xd3, 0xbb, 0x55, + 0x60, 0x5f, 0x8d, 0x00, 0xfe, 0xdc, 0x93, 0xf4, 0xa0, 0x33, 0x9e, 0x7f, 0x0d, 0x4e, 0x24, 0xf8, + 0x38, 0x96, 0xa5, 0x1e, 0x74, 0x6f, 0xee, 0x67, 0x8b, 0xc0, 0x96, 0x68, 0x21, 0x7b, 0x3a, 0x37, + 0xde, 0x37, 0x57, 0x8f, 0x28, 0x75, 0xd5, 0xa7, 0xfb, 0xee, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, + 0xac, 0xa9, 0xc0, 0x00, 0xd1, 0x03, 0x00, 0x00, } diff --git a/python/events/events_pb2.py b/python/events/events_pb2.py index 5506638..14c9831 100644 --- a/python/events/events_pb2.py +++ b/python/events/events_pb2.py @@ -20,7 +20,7 @@ DESCRIPTOR = _descriptor.FileDescriptor( package='robocar.events', syntax='proto3', serialized_options=_b('Z\006events'), - serialized_pb=_b('\n\x13\x65vents/events.proto\x12\x0erobocar.events\"$\n\x08\x46rameRef\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\n\n\x02id\x18\x02 \x01(\t\"C\n\x0c\x46rameMessage\x12$\n\x02id\x18\x01 \x01(\x0b\x32\x18.robocar.events.FrameRef\x12\r\n\x05\x66rame\x18\x02 \x01(\x0c\"d\n\x0fSteeringMessage\x12\x10\n\x08steering\x18\x01 \x01(\x02\x12\x12\n\nconfidence\x18\x02 \x01(\x02\x12+\n\tframe_ref\x18\x03 \x01(\x0b\x32\x18.robocar.events.FrameRef\"d\n\x0fThrottleMessage\x12\x10\n\x08throttle\x18\x01 \x01(\x02\x12\x12\n\nconfidence\x18\x02 \x01(\x02\x12+\n\tframe_ref\x18\x03 \x01(\x0b\x32\x18.robocar.events.FrameRef\"A\n\x10\x44riveModeMessage\x12-\n\ndrive_mode\x18\x01 \x01(\x0e\x32\x19.robocar.events.DriveMode\"f\n\x0eObjectsMessage\x12\'\n\x07objects\x18\x01 \x03(\x0b\x32\x16.robocar.events.Object\x12+\n\tframe_ref\x18\x02 \x01(\x0b\x32\x18.robocar.events.FrameRef\"\x80\x01\n\x06Object\x12(\n\x04type\x18\x01 \x01(\x0e\x32\x1a.robocar.events.TypeObject\x12\r\n\x05lLeft\x18\x02 \x01(\x05\x12\n\n\x02up\x18\x03 \x01(\x05\x12\r\n\x05right\x18\x04 \x01(\x05\x12\x0e\n\x06\x62ottom\x18\x05 \x01(\x05\x12\x12\n\nconfidence\x18\x06 \x01(\x02\"&\n\x13SwitchRecordMessage\x12\x0f\n\x07\x65nabled\x18\x01 \x01(\x08*-\n\tDriveMode\x12\x0b\n\x07INVALID\x10\x00\x12\x08\n\x04USER\x10\x01\x12\t\n\x05PILOT\x10\x02*2\n\nTypeObject\x12\x07\n\x03\x41NY\x10\x00\x12\x07\n\x03\x43\x41R\x10\x01\x12\x08\n\x04\x42UMP\x10\x02\x12\x08\n\x04PLOT\x10\x03\x42\x08Z\x06\x65ventsb\x06proto3') + serialized_pb=_b('\n\x13\x65vents/events.proto\x12\x0erobocar.events\"$\n\x08\x46rameRef\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\n\n\x02id\x18\x02 \x01(\t\"C\n\x0c\x46rameMessage\x12$\n\x02id\x18\x01 \x01(\x0b\x32\x18.robocar.events.FrameRef\x12\r\n\x05\x66rame\x18\x02 \x01(\x0c\"d\n\x0fSteeringMessage\x12\x10\n\x08steering\x18\x01 \x01(\x02\x12\x12\n\nconfidence\x18\x02 \x01(\x02\x12+\n\tframe_ref\x18\x03 \x01(\x0b\x32\x18.robocar.events.FrameRef\"d\n\x0fThrottleMessage\x12\x10\n\x08throttle\x18\x01 \x01(\x02\x12\x12\n\nconfidence\x18\x02 \x01(\x02\x12+\n\tframe_ref\x18\x03 \x01(\x0b\x32\x18.robocar.events.FrameRef\"A\n\x10\x44riveModeMessage\x12-\n\ndrive_mode\x18\x01 \x01(\x0e\x32\x19.robocar.events.DriveMode\"f\n\x0eObjectsMessage\x12\'\n\x07objects\x18\x01 \x03(\x0b\x32\x16.robocar.events.Object\x12+\n\tframe_ref\x18\x02 \x01(\x0b\x32\x18.robocar.events.FrameRef\"\x80\x01\n\x06Object\x12(\n\x04type\x18\x01 \x01(\x0e\x32\x1a.robocar.events.TypeObject\x12\x0c\n\x04left\x18\x02 \x01(\x05\x12\x0b\n\x03top\x18\x03 \x01(\x05\x12\r\n\x05right\x18\x04 \x01(\x05\x12\x0e\n\x06\x62ottom\x18\x05 \x01(\x05\x12\x12\n\nconfidence\x18\x06 \x01(\x02\"&\n\x13SwitchRecordMessage\x12\x0f\n\x07\x65nabled\x18\x01 \x01(\x08*-\n\tDriveMode\x12\x0b\n\x07INVALID\x10\x00\x12\x08\n\x04USER\x10\x01\x12\t\n\x05PILOT\x10\x02*2\n\nTypeObject\x12\x07\n\x03\x41NY\x10\x00\x12\x07\n\x03\x43\x41R\x10\x01\x12\x08\n\x04\x42UMP\x10\x02\x12\x08\n\x04PLOT\x10\x03\x42\x08Z\x06\x65ventsb\x06proto3') ) _DRIVEMODE = _descriptor.EnumDescriptor( @@ -341,14 +341,14 @@ _OBJECT = _descriptor.Descriptor( is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='lLeft', full_name='robocar.events.Object.lLeft', index=1, + name='left', full_name='robocar.events.Object.left', index=1, number=2, type=5, cpp_type=1, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='up', full_name='robocar.events.Object.up', index=2, + name='top', full_name='robocar.events.Object.top', index=2, number=3, type=5, cpp_type=1, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None,