From 1e6bad85f20e8ca2db8e1c2e438bbf7af455d9f6 Mon Sep 17 00:00:00 2001 From: kshalnev Date: Wed, 19 Aug 2015 21:46:07 +0300 Subject: [PATCH] Added Shield class in proto, autogenerated files were updated --- indexer/drules_struct.pb.cc | 355 ++++++++++- indexer/drules_struct.pb.h | 279 ++++++++ indexer/drules_struct.proto | 9 + tools/kothic/drules_struct_pb2.py | 630 +++++++++++-------- tools/python/stylesheet/drules_struct_pb2.py | 407 +++++++----- tools/unix/generate_proto.sh | 33 + 6 files changed, 1311 insertions(+), 402 deletions(-) create mode 100755 tools/unix/generate_proto.sh diff --git a/indexer/drules_struct.pb.cc b/indexer/drules_struct.pb.cc index c8624cf730..cc95ab4de4 100644 --- a/indexer/drules_struct.pb.cc +++ b/indexer/drules_struct.pb.cc @@ -24,6 +24,7 @@ void protobuf_ShutdownFile_drules_5fstruct_2eproto() { delete CaptionRuleProto::default_instance_; delete CircleRuleProto::default_instance_; delete PathTextRuleProto::default_instance_; + delete ShieldRuleProto::default_instance_; delete DrawElementProto::default_instance_; delete ClassifElementProto::default_instance_; delete ContainerProto::default_instance_; @@ -51,6 +52,7 @@ void protobuf_AddDesc_drules_5fstruct_2eproto() { CaptionRuleProto::default_instance_ = new CaptionRuleProto(); CircleRuleProto::default_instance_ = new CircleRuleProto(); PathTextRuleProto::default_instance_ = new PathTextRuleProto(); + ShieldRuleProto::default_instance_ = new ShieldRuleProto(); DrawElementProto::default_instance_ = new DrawElementProto(); ClassifElementProto::default_instance_ = new ClassifElementProto(); ContainerProto::default_instance_ = new ContainerProto(); @@ -64,6 +66,7 @@ void protobuf_AddDesc_drules_5fstruct_2eproto() { CaptionRuleProto::default_instance_->InitAsDefaultInstance(); CircleRuleProto::default_instance_->InitAsDefaultInstance(); PathTextRuleProto::default_instance_->InitAsDefaultInstance(); + ShieldRuleProto::default_instance_->InitAsDefaultInstance(); DrawElementProto::default_instance_->InitAsDefaultInstance(); ClassifElementProto::default_instance_->InitAsDefaultInstance(); ContainerProto::default_instance_->InitAsDefaultInstance(); @@ -3250,6 +3253,311 @@ void PathTextRuleProto::Swap(PathTextRuleProto* other) { } +// =================================================================== + +#ifndef _MSC_VER +const int ShieldRuleProto::kHeightFieldNumber; +const int ShieldRuleProto::kColorFieldNumber; +const int ShieldRuleProto::kStrokeColorFieldNumber; +const int ShieldRuleProto::kPriorityFieldNumber; +#endif // !_MSC_VER + +ShieldRuleProto::ShieldRuleProto() + : ::google::protobuf::MessageLite() { + SharedCtor(); + // @@protoc_insertion_point(constructor:ShieldRuleProto) +} + +void ShieldRuleProto::InitAsDefaultInstance() { +} + +ShieldRuleProto::ShieldRuleProto(const ShieldRuleProto& from) + : ::google::protobuf::MessageLite() { + SharedCtor(); + MergeFrom(from); + // @@protoc_insertion_point(copy_constructor:ShieldRuleProto) +} + +void ShieldRuleProto::SharedCtor() { + _cached_size_ = 0; + height_ = 0; + color_ = 0u; + stroke_color_ = 0u; + priority_ = 0; + ::memset(_has_bits_, 0, sizeof(_has_bits_)); +} + +ShieldRuleProto::~ShieldRuleProto() { + // @@protoc_insertion_point(destructor:ShieldRuleProto) + SharedDtor(); +} + +void ShieldRuleProto::SharedDtor() { + #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + if (this != &default_instance()) { + #else + if (this != default_instance_) { + #endif + } +} + +void ShieldRuleProto::SetCachedSize(int size) const { + GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); + _cached_size_ = size; + GOOGLE_SAFE_CONCURRENT_WRITES_END(); +} +const ShieldRuleProto& ShieldRuleProto::default_instance() { +#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + protobuf_AddDesc_drules_5fstruct_2eproto(); +#else + if (default_instance_ == NULL) protobuf_AddDesc_drules_5fstruct_2eproto(); +#endif + return *default_instance_; +} + +ShieldRuleProto* ShieldRuleProto::default_instance_ = NULL; + +ShieldRuleProto* ShieldRuleProto::New() const { + return new ShieldRuleProto; +} + +void ShieldRuleProto::Clear() { +#define OFFSET_OF_FIELD_(f) (reinterpret_cast( \ + &reinterpret_cast(16)->f) - \ + reinterpret_cast(16)) + +#define ZR_(first, last) do { \ + size_t f = OFFSET_OF_FIELD_(first); \ + size_t n = OFFSET_OF_FIELD_(last) - f + sizeof(last); \ + ::memset(&first, 0, n); \ + } while (0) + + ZR_(height_, priority_); + +#undef OFFSET_OF_FIELD_ +#undef ZR_ + + ::memset(_has_bits_, 0, sizeof(_has_bits_)); + mutable_unknown_fields()->clear(); +} + +bool ShieldRuleProto::MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) { +#define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure + ::google::protobuf::uint32 tag; + ::google::protobuf::io::StringOutputStream unknown_fields_string( + mutable_unknown_fields()); + ::google::protobuf::io::CodedOutputStream unknown_fields_stream( + &unknown_fields_string); + // @@protoc_insertion_point(parse_start:ShieldRuleProto) + for (;;) { + ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); + tag = p.first; + if (!p.second) goto handle_unusual; + switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { + // required int32 height = 1; + case 1: { + if (tag == 8) { + DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< + ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( + input, &height_))); + set_has_height(); + } else { + goto handle_unusual; + } + if (input->ExpectTag(16)) goto parse_color; + break; + } + + // required uint32 color = 2; + case 2: { + if (tag == 16) { + parse_color: + DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< + ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>( + input, &color_))); + set_has_color(); + } else { + goto handle_unusual; + } + if (input->ExpectTag(24)) goto parse_stroke_color; + break; + } + + // optional uint32 stroke_color = 3; + case 3: { + if (tag == 24) { + parse_stroke_color: + DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< + ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>( + input, &stroke_color_))); + set_has_stroke_color(); + } else { + goto handle_unusual; + } + if (input->ExpectTag(32)) goto parse_priority; + break; + } + + // required int32 priority = 4; + case 4: { + if (tag == 32) { + parse_priority: + DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< + ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( + input, &priority_))); + set_has_priority(); + } else { + goto handle_unusual; + } + if (input->ExpectAtEnd()) goto success; + break; + } + + default: { + handle_unusual: + if (tag == 0 || + ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == + ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) { + goto success; + } + DO_(::google::protobuf::internal::WireFormatLite::SkipField( + input, tag, &unknown_fields_stream)); + break; + } + } + } +success: + // @@protoc_insertion_point(parse_success:ShieldRuleProto) + return true; +failure: + // @@protoc_insertion_point(parse_failure:ShieldRuleProto) + return false; +#undef DO_ +} + +void ShieldRuleProto::SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const { + // @@protoc_insertion_point(serialize_start:ShieldRuleProto) + // required int32 height = 1; + if (has_height()) { + ::google::protobuf::internal::WireFormatLite::WriteInt32(1, this->height(), output); + } + + // required uint32 color = 2; + if (has_color()) { + ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->color(), output); + } + + // optional uint32 stroke_color = 3; + if (has_stroke_color()) { + ::google::protobuf::internal::WireFormatLite::WriteUInt32(3, this->stroke_color(), output); + } + + // required int32 priority = 4; + if (has_priority()) { + ::google::protobuf::internal::WireFormatLite::WriteInt32(4, this->priority(), output); + } + + output->WriteRaw(unknown_fields().data(), + unknown_fields().size()); + // @@protoc_insertion_point(serialize_end:ShieldRuleProto) +} + +int ShieldRuleProto::ByteSize() const { + int total_size = 0; + + if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { + // required int32 height = 1; + if (has_height()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::Int32Size( + this->height()); + } + + // required uint32 color = 2; + if (has_color()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::UInt32Size( + this->color()); + } + + // optional uint32 stroke_color = 3; + if (has_stroke_color()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::UInt32Size( + this->stroke_color()); + } + + // required int32 priority = 4; + if (has_priority()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::Int32Size( + this->priority()); + } + + } + total_size += unknown_fields().size(); + + GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); + _cached_size_ = total_size; + GOOGLE_SAFE_CONCURRENT_WRITES_END(); + return total_size; +} + +void ShieldRuleProto::CheckTypeAndMergeFrom( + const ::google::protobuf::MessageLite& from) { + MergeFrom(*::google::protobuf::down_cast(&from)); +} + +void ShieldRuleProto::MergeFrom(const ShieldRuleProto& from) { + GOOGLE_CHECK_NE(&from, this); + if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { + if (from.has_height()) { + set_height(from.height()); + } + if (from.has_color()) { + set_color(from.color()); + } + if (from.has_stroke_color()) { + set_stroke_color(from.stroke_color()); + } + if (from.has_priority()) { + set_priority(from.priority()); + } + } + mutable_unknown_fields()->append(from.unknown_fields()); +} + +void ShieldRuleProto::CopyFrom(const ShieldRuleProto& from) { + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +bool ShieldRuleProto::IsInitialized() const { + if ((_has_bits_[0] & 0x0000000b) != 0x0000000b) return false; + + return true; +} + +void ShieldRuleProto::Swap(ShieldRuleProto* other) { + if (other != this) { + std::swap(height_, other->height_); + std::swap(color_, other->color_); + std::swap(stroke_color_, other->stroke_color_); + std::swap(priority_, other->priority_); + std::swap(_has_bits_[0], other->_has_bits_[0]); + _unknown_fields_.swap(other->_unknown_fields_); + std::swap(_cached_size_, other->_cached_size_); + } +} + +::std::string ShieldRuleProto::GetTypeName() const { + return "ShieldRuleProto"; +} + + // =================================================================== #ifndef _MSC_VER @@ -3260,6 +3568,7 @@ const int DrawElementProto::kSymbolFieldNumber; const int DrawElementProto::kCaptionFieldNumber; const int DrawElementProto::kCircleFieldNumber; const int DrawElementProto::kPathTextFieldNumber; +const int DrawElementProto::kShieldFieldNumber; #endif // !_MSC_VER DrawElementProto::DrawElementProto() @@ -3299,6 +3608,12 @@ void DrawElementProto::InitAsDefaultInstance() { #else path_text_ = const_cast< ::PathTextRuleProto*>(&::PathTextRuleProto::default_instance()); #endif +#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + shield_ = const_cast< ::ShieldRuleProto*>( + ::ShieldRuleProto::internal_default_instance()); +#else + shield_ = const_cast< ::ShieldRuleProto*>(&::ShieldRuleProto::default_instance()); +#endif } DrawElementProto::DrawElementProto(const DrawElementProto& from) @@ -3316,6 +3631,7 @@ void DrawElementProto::SharedCtor() { caption_ = NULL; circle_ = NULL; path_text_ = NULL; + shield_ = NULL; ::memset(_has_bits_, 0, sizeof(_has_bits_)); } @@ -3335,6 +3651,7 @@ void DrawElementProto::SharedDtor() { delete caption_; delete circle_; delete path_text_; + delete shield_; } } @@ -3359,7 +3676,7 @@ DrawElementProto* DrawElementProto::New() const { } void DrawElementProto::Clear() { - if (_has_bits_[0 / 32] & 125) { + if (_has_bits_[0 / 32] & 253) { scale_ = 0; if (has_area()) { if (area_ != NULL) area_->::AreaRuleProto::Clear(); @@ -3376,6 +3693,9 @@ void DrawElementProto::Clear() { if (has_path_text()) { if (path_text_ != NULL) path_text_->::PathTextRuleProto::Clear(); } + if (has_shield()) { + if (shield_ != NULL) shield_->::ShieldRuleProto::Clear(); + } } lines_.Clear(); ::memset(_has_bits_, 0, sizeof(_has_bits_)); @@ -3485,6 +3805,19 @@ bool DrawElementProto::MergePartialFromCodedStream( } else { goto handle_unusual; } + if (input->ExpectTag(66)) goto parse_shield; + break; + } + + // optional .ShieldRuleProto shield = 8; + case 8: { + if (tag == 66) { + parse_shield: + DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( + input, mutable_shield())); + } else { + goto handle_unusual; + } if (input->ExpectAtEnd()) goto success; break; } @@ -3555,6 +3888,12 @@ void DrawElementProto::SerializeWithCachedSizes( 7, this->path_text(), output); } + // optional .ShieldRuleProto shield = 8; + if (has_shield()) { + ::google::protobuf::internal::WireFormatLite::WriteMessage( + 8, this->shield(), output); + } + output->WriteRaw(unknown_fields().data(), unknown_fields().size()); // @@protoc_insertion_point(serialize_end:DrawElementProto) @@ -3606,6 +3945,13 @@ int DrawElementProto::ByteSize() const { this->path_text()); } + // optional .ShieldRuleProto shield = 8; + if (has_shield()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + this->shield()); + } + } // repeated .LineRuleProto lines = 2; total_size += 1 * this->lines_size(); @@ -3650,6 +3996,9 @@ void DrawElementProto::MergeFrom(const DrawElementProto& from) { if (from.has_path_text()) { mutable_path_text()->::PathTextRuleProto::MergeFrom(from.path_text()); } + if (from.has_shield()) { + mutable_shield()->::ShieldRuleProto::MergeFrom(from.shield()); + } } mutable_unknown_fields()->append(from.unknown_fields()); } @@ -3679,6 +4028,9 @@ bool DrawElementProto::IsInitialized() const { if (has_path_text()) { if (!this->path_text().IsInitialized()) return false; } + if (has_shield()) { + if (!this->shield().IsInitialized()) return false; + } return true; } @@ -3691,6 +4043,7 @@ void DrawElementProto::Swap(DrawElementProto* other) { std::swap(caption_, other->caption_); std::swap(circle_, other->circle_); std::swap(path_text_, other->path_text_); + std::swap(shield_, other->shield_); std::swap(_has_bits_[0], other->_has_bits_[0]); _unknown_fields_.swap(other->_unknown_fields_); std::swap(_cached_size_, other->_cached_size_); diff --git a/indexer/drules_struct.pb.h b/indexer/drules_struct.pb.h index 86128071f3..9d324dcaf9 100644 --- a/indexer/drules_struct.pb.h +++ b/indexer/drules_struct.pb.h @@ -40,6 +40,7 @@ class CaptionDefProto; class CaptionRuleProto; class CircleRuleProto; class PathTextRuleProto; +class ShieldRuleProto; class DrawElementProto; class ClassifElementProto; class ContainerProto; @@ -1299,6 +1300,127 @@ class PathTextRuleProto : public ::google::protobuf::MessageLite { }; // ------------------------------------------------------------------- +class ShieldRuleProto : public ::google::protobuf::MessageLite { + public: + ShieldRuleProto(); + virtual ~ShieldRuleProto(); + + ShieldRuleProto(const ShieldRuleProto& from); + + inline ShieldRuleProto& operator=(const ShieldRuleProto& from) { + CopyFrom(from); + return *this; + } + + inline const ::std::string& unknown_fields() const { + return _unknown_fields_; + } + + inline ::std::string* mutable_unknown_fields() { + return &_unknown_fields_; + } + + static const ShieldRuleProto& default_instance(); + + #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + // Returns the internal default instance pointer. This function can + // return NULL thus should not be used by the user. This is intended + // for Protobuf internal code. Please use default_instance() declared + // above instead. + static inline const ShieldRuleProto* internal_default_instance() { + return default_instance_; + } + #endif + + void Swap(ShieldRuleProto* other); + + // implements Message ---------------------------------------------- + + ShieldRuleProto* New() const; + void CheckTypeAndMergeFrom(const ::google::protobuf::MessageLite& from); + void CopyFrom(const ShieldRuleProto& from); + void MergeFrom(const ShieldRuleProto& from); + void Clear(); + bool IsInitialized() const; + + int ByteSize() const; + bool MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input); + void SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const; + void DiscardUnknownFields(); + int GetCachedSize() const { return _cached_size_; } + private: + void SharedCtor(); + void SharedDtor(); + void SetCachedSize(int size) const; + public: + ::std::string GetTypeName() const; + + // nested types ---------------------------------------------------- + + // accessors ------------------------------------------------------- + + // required int32 height = 1; + inline bool has_height() const; + inline void clear_height(); + static const int kHeightFieldNumber = 1; + inline ::google::protobuf::int32 height() const; + inline void set_height(::google::protobuf::int32 value); + + // required uint32 color = 2; + inline bool has_color() const; + inline void clear_color(); + static const int kColorFieldNumber = 2; + inline ::google::protobuf::uint32 color() const; + inline void set_color(::google::protobuf::uint32 value); + + // optional uint32 stroke_color = 3; + inline bool has_stroke_color() const; + inline void clear_stroke_color(); + static const int kStrokeColorFieldNumber = 3; + inline ::google::protobuf::uint32 stroke_color() const; + inline void set_stroke_color(::google::protobuf::uint32 value); + + // required int32 priority = 4; + inline bool has_priority() const; + inline void clear_priority(); + static const int kPriorityFieldNumber = 4; + inline ::google::protobuf::int32 priority() const; + inline void set_priority(::google::protobuf::int32 value); + + // @@protoc_insertion_point(class_scope:ShieldRuleProto) + private: + inline void set_has_height(); + inline void clear_has_height(); + inline void set_has_color(); + inline void clear_has_color(); + inline void set_has_stroke_color(); + inline void clear_has_stroke_color(); + inline void set_has_priority(); + inline void clear_has_priority(); + + ::std::string _unknown_fields_; + + ::google::protobuf::uint32 _has_bits_[1]; + mutable int _cached_size_; + ::google::protobuf::int32 height_; + ::google::protobuf::uint32 color_; + ::google::protobuf::uint32 stroke_color_; + ::google::protobuf::int32 priority_; + #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + friend void protobuf_AddDesc_drules_5fstruct_2eproto_impl(); + #else + friend void protobuf_AddDesc_drules_5fstruct_2eproto(); + #endif + friend void protobuf_AssignDesc_drules_5fstruct_2eproto(); + friend void protobuf_ShutdownFile_drules_5fstruct_2eproto(); + + void InitAsDefaultInstance(); + static ShieldRuleProto* default_instance_; +}; +// ------------------------------------------------------------------- + class DrawElementProto : public ::google::protobuf::MessageLite { public: DrawElementProto(); @@ -1424,6 +1546,15 @@ class DrawElementProto : public ::google::protobuf::MessageLite { inline ::PathTextRuleProto* release_path_text(); inline void set_allocated_path_text(::PathTextRuleProto* path_text); + // optional .ShieldRuleProto shield = 8; + inline bool has_shield() const; + inline void clear_shield(); + static const int kShieldFieldNumber = 8; + inline const ::ShieldRuleProto& shield() const; + inline ::ShieldRuleProto* mutable_shield(); + inline ::ShieldRuleProto* release_shield(); + inline void set_allocated_shield(::ShieldRuleProto* shield); + // @@protoc_insertion_point(class_scope:DrawElementProto) private: inline void set_has_scale(); @@ -1438,6 +1569,8 @@ class DrawElementProto : public ::google::protobuf::MessageLite { inline void clear_has_circle(); inline void set_has_path_text(); inline void clear_has_path_text(); + inline void set_has_shield(); + inline void clear_has_shield(); ::std::string _unknown_fields_; @@ -1449,6 +1582,7 @@ class DrawElementProto : public ::google::protobuf::MessageLite { ::CaptionRuleProto* caption_; ::CircleRuleProto* circle_; ::PathTextRuleProto* path_text_; + ::ShieldRuleProto* shield_; ::google::protobuf::int32 scale_; #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER friend void protobuf_AddDesc_drules_5fstruct_2eproto_impl(); @@ -2969,6 +3103,106 @@ inline void PathTextRuleProto::set_priority(::google::protobuf::int32 value) { // ------------------------------------------------------------------- +// ShieldRuleProto + +// required int32 height = 1; +inline bool ShieldRuleProto::has_height() const { + return (_has_bits_[0] & 0x00000001u) != 0; +} +inline void ShieldRuleProto::set_has_height() { + _has_bits_[0] |= 0x00000001u; +} +inline void ShieldRuleProto::clear_has_height() { + _has_bits_[0] &= ~0x00000001u; +} +inline void ShieldRuleProto::clear_height() { + height_ = 0; + clear_has_height(); +} +inline ::google::protobuf::int32 ShieldRuleProto::height() const { + // @@protoc_insertion_point(field_get:ShieldRuleProto.height) + return height_; +} +inline void ShieldRuleProto::set_height(::google::protobuf::int32 value) { + set_has_height(); + height_ = value; + // @@protoc_insertion_point(field_set:ShieldRuleProto.height) +} + +// required uint32 color = 2; +inline bool ShieldRuleProto::has_color() const { + return (_has_bits_[0] & 0x00000002u) != 0; +} +inline void ShieldRuleProto::set_has_color() { + _has_bits_[0] |= 0x00000002u; +} +inline void ShieldRuleProto::clear_has_color() { + _has_bits_[0] &= ~0x00000002u; +} +inline void ShieldRuleProto::clear_color() { + color_ = 0u; + clear_has_color(); +} +inline ::google::protobuf::uint32 ShieldRuleProto::color() const { + // @@protoc_insertion_point(field_get:ShieldRuleProto.color) + return color_; +} +inline void ShieldRuleProto::set_color(::google::protobuf::uint32 value) { + set_has_color(); + color_ = value; + // @@protoc_insertion_point(field_set:ShieldRuleProto.color) +} + +// optional uint32 stroke_color = 3; +inline bool ShieldRuleProto::has_stroke_color() const { + return (_has_bits_[0] & 0x00000004u) != 0; +} +inline void ShieldRuleProto::set_has_stroke_color() { + _has_bits_[0] |= 0x00000004u; +} +inline void ShieldRuleProto::clear_has_stroke_color() { + _has_bits_[0] &= ~0x00000004u; +} +inline void ShieldRuleProto::clear_stroke_color() { + stroke_color_ = 0u; + clear_has_stroke_color(); +} +inline ::google::protobuf::uint32 ShieldRuleProto::stroke_color() const { + // @@protoc_insertion_point(field_get:ShieldRuleProto.stroke_color) + return stroke_color_; +} +inline void ShieldRuleProto::set_stroke_color(::google::protobuf::uint32 value) { + set_has_stroke_color(); + stroke_color_ = value; + // @@protoc_insertion_point(field_set:ShieldRuleProto.stroke_color) +} + +// required int32 priority = 4; +inline bool ShieldRuleProto::has_priority() const { + return (_has_bits_[0] & 0x00000008u) != 0; +} +inline void ShieldRuleProto::set_has_priority() { + _has_bits_[0] |= 0x00000008u; +} +inline void ShieldRuleProto::clear_has_priority() { + _has_bits_[0] &= ~0x00000008u; +} +inline void ShieldRuleProto::clear_priority() { + priority_ = 0; + clear_has_priority(); +} +inline ::google::protobuf::int32 ShieldRuleProto::priority() const { + // @@protoc_insertion_point(field_get:ShieldRuleProto.priority) + return priority_; +} +inline void ShieldRuleProto::set_priority(::google::protobuf::int32 value) { + set_has_priority(); + priority_ = value; + // @@protoc_insertion_point(field_set:ShieldRuleProto.priority) +} + +// ------------------------------------------------------------------- + // DrawElementProto // required int32 scale = 1; @@ -3250,6 +3484,51 @@ inline void DrawElementProto::set_allocated_path_text(::PathTextRuleProto* path_ // @@protoc_insertion_point(field_set_allocated:DrawElementProto.path_text) } +// optional .ShieldRuleProto shield = 8; +inline bool DrawElementProto::has_shield() const { + return (_has_bits_[0] & 0x00000080u) != 0; +} +inline void DrawElementProto::set_has_shield() { + _has_bits_[0] |= 0x00000080u; +} +inline void DrawElementProto::clear_has_shield() { + _has_bits_[0] &= ~0x00000080u; +} +inline void DrawElementProto::clear_shield() { + if (shield_ != NULL) shield_->::ShieldRuleProto::Clear(); + clear_has_shield(); +} +inline const ::ShieldRuleProto& DrawElementProto::shield() const { + // @@protoc_insertion_point(field_get:DrawElementProto.shield) +#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + return shield_ != NULL ? *shield_ : *default_instance().shield_; +#else + return shield_ != NULL ? *shield_ : *default_instance_->shield_; +#endif +} +inline ::ShieldRuleProto* DrawElementProto::mutable_shield() { + set_has_shield(); + if (shield_ == NULL) shield_ = new ::ShieldRuleProto; + // @@protoc_insertion_point(field_mutable:DrawElementProto.shield) + return shield_; +} +inline ::ShieldRuleProto* DrawElementProto::release_shield() { + clear_has_shield(); + ::ShieldRuleProto* temp = shield_; + shield_ = NULL; + return temp; +} +inline void DrawElementProto::set_allocated_shield(::ShieldRuleProto* shield) { + delete shield_; + shield_ = shield; + if (shield) { + set_has_shield(); + } else { + clear_has_shield(); + } + // @@protoc_insertion_point(field_set_allocated:DrawElementProto.shield) +} + // ------------------------------------------------------------------- // ClassifElementProto diff --git a/indexer/drules_struct.proto b/indexer/drules_struct.proto index e6412fd55f..9a18a68497 100644 --- a/indexer/drules_struct.proto +++ b/indexer/drules_struct.proto @@ -93,6 +93,14 @@ message PathTextRuleProto required int32 priority = 3; } +message ShieldRuleProto +{ + required int32 height = 1; + required uint32 color = 2; + optional uint32 stroke_color = 3; + required int32 priority = 4; +} + message DrawElementProto { required int32 scale = 1; @@ -102,6 +110,7 @@ message DrawElementProto optional CaptionRuleProto caption = 5; optional CircleRuleProto circle = 6; optional PathTextRuleProto path_text = 7; + optional ShieldRuleProto shield = 8; } message ClassifElementProto diff --git a/tools/kothic/drules_struct_pb2.py b/tools/kothic/drules_struct_pb2.py index 47d1db5510..d30e24a482 100644 --- a/tools/kothic/drules_struct_pb2.py +++ b/tools/kothic/drules_struct_pb2.py @@ -1,69 +1,82 @@ # Generated by the protocol buffer compiler. DO NOT EDIT! +# source: drules_struct.proto -from google.protobuf import descriptor -from google.protobuf import message -from google.protobuf import reflection +import sys +_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1')) +from google.protobuf.internal import enum_type_wrapper +from google.protobuf import descriptor as _descriptor +from google.protobuf import message as _message +from google.protobuf import reflection as _reflection +from google.protobuf import symbol_database as _symbol_database from google.protobuf import descriptor_pb2 # @@protoc_insertion_point(imports) +_sym_db = _symbol_database.Default() -DESCRIPTOR = descriptor.FileDescriptor( - name='drules_struct.proto', - package='', - serialized_pb='\n\x13\x64rules_struct.proto\"*\n\x0c\x44\x61shDotProto\x12\n\n\x02\x64\x64\x18\x01 \x03(\x01\x12\x0e\n\x06offset\x18\x02 \x01(\x01\":\n\x0cPathSymProto\x12\x0c\n\x04name\x18\x01 \x02(\t\x12\x0c\n\x04step\x18\x02 \x02(\x01\x12\x0e\n\x06offset\x18\x03 \x01(\x01\"\xaf\x01\n\rLineRuleProto\x12\r\n\x05width\x18\x01 \x02(\x01\x12\r\n\x05\x63olor\x18\x02 \x02(\r\x12\x1e\n\x07\x64\x61shdot\x18\x03 \x01(\x0b\x32\r.DashDotProto\x12\x10\n\x08priority\x18\x04 \x02(\x05\x12\x1e\n\x07pathsym\x18\x05 \x01(\x0b\x32\r.PathSymProto\x12\x17\n\x04join\x18\x06 \x01(\x0e\x32\t.LineJoin\x12\x15\n\x03\x63\x61p\x18\x07 \x01(\x0e\x32\x08.LineCap\"\x9c\x01\n\x0cLineDefProto\x12\r\n\x05width\x18\x01 \x02(\x01\x12\r\n\x05\x63olor\x18\x02 \x02(\r\x12\x1e\n\x07\x64\x61shdot\x18\x03 \x01(\x0b\x32\r.DashDotProto\x12\x1e\n\x07pathsym\x18\x04 \x01(\x0b\x32\r.PathSymProto\x12\x17\n\x04join\x18\x06 \x01(\x0e\x32\t.LineJoin\x12\x15\n\x03\x63\x61p\x18\x07 \x01(\x0e\x32\x08.LineCap\"O\n\rAreaRuleProto\x12\r\n\x05\x63olor\x18\x01 \x02(\r\x12\x1d\n\x06\x62order\x18\x02 \x01(\x0b\x32\r.LineDefProto\x12\x10\n\x08priority\x18\x03 \x02(\x05\"I\n\x0fSymbolRuleProto\x12\x0c\n\x04name\x18\x01 \x02(\t\x12\x16\n\x0e\x61pply_for_type\x18\x02 \x01(\x05\x12\x10\n\x08priority\x18\x03 \x02(\x05\"j\n\x0f\x43\x61ptionDefProto\x12\x0e\n\x06height\x18\x01 \x02(\x05\x12\r\n\x05\x63olor\x18\x02 \x02(\r\x12\x14\n\x0cstroke_color\x18\x03 \x01(\r\x12\x10\n\x08offset_x\x18\x04 \x01(\x05\x12\x10\n\x08offset_y\x18\x05 \x01(\x05\"l\n\x10\x43\x61ptionRuleProto\x12!\n\x07primary\x18\x01 \x02(\x0b\x32\x10.CaptionDefProto\x12#\n\tsecondary\x18\x02 \x01(\x0b\x32\x10.CaptionDefProto\x12\x10\n\x08priority\x18\x03 \x02(\x05\"a\n\x0f\x43ircleRuleProto\x12\x0e\n\x06radius\x18\x01 \x02(\x01\x12\r\n\x05\x63olor\x18\x02 \x02(\r\x12\x1d\n\x06\x62order\x18\x03 \x01(\x0b\x32\r.LineDefProto\x12\x10\n\x08priority\x18\x04 \x02(\x05\"m\n\x11PathTextRuleProto\x12!\n\x07primary\x18\x01 \x02(\x0b\x32\x10.CaptionDefProto\x12#\n\tsecondary\x18\x02 \x01(\x0b\x32\x10.CaptionDefProto\x12\x10\n\x08priority\x18\x03 \x02(\x05\"\xed\x01\n\x10\x44rawElementProto\x12\r\n\x05scale\x18\x01 \x02(\x05\x12\x1d\n\x05lines\x18\x02 \x03(\x0b\x32\x0e.LineRuleProto\x12\x1c\n\x04\x61rea\x18\x03 \x01(\x0b\x32\x0e.AreaRuleProto\x12 \n\x06symbol\x18\x04 \x01(\x0b\x32\x10.SymbolRuleProto\x12\"\n\x07\x63\x61ption\x18\x05 \x01(\x0b\x32\x11.CaptionRuleProto\x12 \n\x06\x63ircle\x18\x06 \x01(\x0b\x32\x10.CircleRuleProto\x12%\n\tpath_text\x18\x07 \x01(\x0b\x32\x12.PathTextRuleProto\"G\n\x13\x43lassifElementProto\x12\x0c\n\x04name\x18\x01 \x02(\t\x12\"\n\x07\x65lement\x18\x02 \x03(\x0b\x32\x11.DrawElementProto\"4\n\x0e\x43ontainerProto\x12\"\n\x04\x63ont\x18\x01 \x03(\x0b\x32\x14.ClassifElementProto*4\n\x08LineJoin\x12\r\n\tROUNDJOIN\x10\x00\x12\r\n\tBEVELJOIN\x10\x01\x12\n\n\x06NOJOIN\x10\x02*3\n\x07LineCap\x12\x0c\n\x08ROUNDCAP\x10\x00\x12\x0b\n\x07\x42UTTCAP\x10\x01\x12\r\n\tSQUARECAP\x10\x02\x42\x02H\x03') -_LINEJOIN = descriptor.EnumDescriptor( - name='LineJoin', - full_name='LineJoin', - filename=None, - file=DESCRIPTOR, - values=[ - descriptor.EnumValueDescriptor( - name='ROUNDJOIN', index=0, number=0, - options=None, - type=None), - descriptor.EnumValueDescriptor( - name='BEVELJOIN', index=1, number=1, - options=None, - type=None), - descriptor.EnumValueDescriptor( - name='NOJOIN', index=2, number=2, - options=None, - type=None), - ], - containing_type=None, - options=None, - serialized_start=1415, - serialized_end=1467, + + +DESCRIPTOR = _descriptor.FileDescriptor( + name='drules_struct.proto', + package='', + serialized_pb=_b('\n\x13\x64rules_struct.proto\"*\n\x0c\x44\x61shDotProto\x12\n\n\x02\x64\x64\x18\x01 \x03(\x01\x12\x0e\n\x06offset\x18\x02 \x01(\x01\":\n\x0cPathSymProto\x12\x0c\n\x04name\x18\x01 \x02(\t\x12\x0c\n\x04step\x18\x02 \x02(\x01\x12\x0e\n\x06offset\x18\x03 \x01(\x01\"\xaf\x01\n\rLineRuleProto\x12\r\n\x05width\x18\x01 \x02(\x01\x12\r\n\x05\x63olor\x18\x02 \x02(\r\x12\x1e\n\x07\x64\x61shdot\x18\x03 \x01(\x0b\x32\r.DashDotProto\x12\x10\n\x08priority\x18\x04 \x02(\x05\x12\x1e\n\x07pathsym\x18\x05 \x01(\x0b\x32\r.PathSymProto\x12\x17\n\x04join\x18\x06 \x01(\x0e\x32\t.LineJoin\x12\x15\n\x03\x63\x61p\x18\x07 \x01(\x0e\x32\x08.LineCap\"\x9c\x01\n\x0cLineDefProto\x12\r\n\x05width\x18\x01 \x02(\x01\x12\r\n\x05\x63olor\x18\x02 \x02(\r\x12\x1e\n\x07\x64\x61shdot\x18\x03 \x01(\x0b\x32\r.DashDotProto\x12\x1e\n\x07pathsym\x18\x04 \x01(\x0b\x32\r.PathSymProto\x12\x17\n\x04join\x18\x06 \x01(\x0e\x32\t.LineJoin\x12\x15\n\x03\x63\x61p\x18\x07 \x01(\x0e\x32\x08.LineCap\"O\n\rAreaRuleProto\x12\r\n\x05\x63olor\x18\x01 \x02(\r\x12\x1d\n\x06\x62order\x18\x02 \x01(\x0b\x32\r.LineDefProto\x12\x10\n\x08priority\x18\x03 \x02(\x05\"I\n\x0fSymbolRuleProto\x12\x0c\n\x04name\x18\x01 \x02(\t\x12\x16\n\x0e\x61pply_for_type\x18\x02 \x01(\x05\x12\x10\n\x08priority\x18\x03 \x02(\x05\"j\n\x0f\x43\x61ptionDefProto\x12\x0e\n\x06height\x18\x01 \x02(\x05\x12\r\n\x05\x63olor\x18\x02 \x02(\r\x12\x14\n\x0cstroke_color\x18\x03 \x01(\r\x12\x10\n\x08offset_x\x18\x04 \x01(\x05\x12\x10\n\x08offset_y\x18\x05 \x01(\x05\"l\n\x10\x43\x61ptionRuleProto\x12!\n\x07primary\x18\x01 \x02(\x0b\x32\x10.CaptionDefProto\x12#\n\tsecondary\x18\x02 \x01(\x0b\x32\x10.CaptionDefProto\x12\x10\n\x08priority\x18\x03 \x02(\x05\"a\n\x0f\x43ircleRuleProto\x12\x0e\n\x06radius\x18\x01 \x02(\x01\x12\r\n\x05\x63olor\x18\x02 \x02(\r\x12\x1d\n\x06\x62order\x18\x03 \x01(\x0b\x32\r.LineDefProto\x12\x10\n\x08priority\x18\x04 \x02(\x05\"m\n\x11PathTextRuleProto\x12!\n\x07primary\x18\x01 \x02(\x0b\x32\x10.CaptionDefProto\x12#\n\tsecondary\x18\x02 \x01(\x0b\x32\x10.CaptionDefProto\x12\x10\n\x08priority\x18\x03 \x02(\x05\"X\n\x0fShieldRuleProto\x12\x0e\n\x06height\x18\x01 \x02(\x05\x12\r\n\x05\x63olor\x18\x02 \x02(\r\x12\x14\n\x0cstroke_color\x18\x03 \x01(\r\x12\x10\n\x08priority\x18\x04 \x02(\x05\"\x8f\x02\n\x10\x44rawElementProto\x12\r\n\x05scale\x18\x01 \x02(\x05\x12\x1d\n\x05lines\x18\x02 \x03(\x0b\x32\x0e.LineRuleProto\x12\x1c\n\x04\x61rea\x18\x03 \x01(\x0b\x32\x0e.AreaRuleProto\x12 \n\x06symbol\x18\x04 \x01(\x0b\x32\x10.SymbolRuleProto\x12\"\n\x07\x63\x61ption\x18\x05 \x01(\x0b\x32\x11.CaptionRuleProto\x12 \n\x06\x63ircle\x18\x06 \x01(\x0b\x32\x10.CircleRuleProto\x12%\n\tpath_text\x18\x07 \x01(\x0b\x32\x12.PathTextRuleProto\x12 \n\x06shield\x18\x08 \x01(\x0b\x32\x10.ShieldRuleProto\"G\n\x13\x43lassifElementProto\x12\x0c\n\x04name\x18\x01 \x02(\t\x12\"\n\x07\x65lement\x18\x02 \x03(\x0b\x32\x11.DrawElementProto\"4\n\x0e\x43ontainerProto\x12\"\n\x04\x63ont\x18\x01 \x03(\x0b\x32\x14.ClassifElementProto*4\n\x08LineJoin\x12\r\n\tROUNDJOIN\x10\x00\x12\r\n\tBEVELJOIN\x10\x01\x12\n\n\x06NOJOIN\x10\x02*3\n\x07LineCap\x12\x0c\n\x08ROUNDCAP\x10\x00\x12\x0b\n\x07\x42UTTCAP\x10\x01\x12\r\n\tSQUARECAP\x10\x02\x42\x02H\x03') ) +_sym_db.RegisterFileDescriptor(DESCRIPTOR) - -_LINECAP = descriptor.EnumDescriptor( - name='LineCap', - full_name='LineCap', - filename=None, - file=DESCRIPTOR, - values=[ - descriptor.EnumValueDescriptor( - name='ROUNDCAP', index=0, number=0, - options=None, - type=None), - descriptor.EnumValueDescriptor( - name='BUTTCAP', index=1, number=1, - options=None, - type=None), - descriptor.EnumValueDescriptor( - name='SQUARECAP', index=2, number=2, - options=None, - type=None), - ], - containing_type=None, - options=None, - serialized_start=1469, - serialized_end=1520, +_LINEJOIN = _descriptor.EnumDescriptor( + name='LineJoin', + full_name='LineJoin', + filename=None, + file=DESCRIPTOR, + values=[ + _descriptor.EnumValueDescriptor( + name='ROUNDJOIN', index=0, number=0, + options=None, + type=None), + _descriptor.EnumValueDescriptor( + name='BEVELJOIN', index=1, number=1, + options=None, + type=None), + _descriptor.EnumValueDescriptor( + name='NOJOIN', index=2, number=2, + options=None, + type=None), + ], + containing_type=None, + options=None, + serialized_start=1539, + serialized_end=1591, ) +_sym_db.RegisterEnumDescriptor(_LINEJOIN) +LineJoin = enum_type_wrapper.EnumTypeWrapper(_LINEJOIN) +_LINECAP = _descriptor.EnumDescriptor( + name='LineCap', + full_name='LineCap', + filename=None, + file=DESCRIPTOR, + values=[ + _descriptor.EnumValueDescriptor( + name='ROUNDCAP', index=0, number=0, + options=None, + type=None), + _descriptor.EnumValueDescriptor( + name='BUTTCAP', index=1, number=1, + options=None, + type=None), + _descriptor.EnumValueDescriptor( + name='SQUARECAP', index=2, number=2, + options=None, + type=None), + ], + containing_type=None, + options=None, + serialized_start=1593, + serialized_end=1644, +) +_sym_db.RegisterEnumDescriptor(_LINECAP) +LineCap = enum_type_wrapper.EnumTypeWrapper(_LINECAP) ROUNDJOIN = 0 BEVELJOIN = 1 NOJOIN = 2 @@ -72,63 +85,66 @@ BUTTCAP = 1 SQUARECAP = 2 -_DASHDOTPROTO = descriptor.Descriptor( - name='DashDotProto', - full_name='DashDotProto', - filename=None, - file=DESCRIPTOR, - containing_type=None, - fields=[ - descriptor.FieldDescriptor( - name='dd', full_name='DashDotProto.dd', index=0, - number=1, type=1, cpp_type=5, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None), - descriptor.FieldDescriptor( - name='offset', full_name='DashDotProto.offset', index=1, - number=2, type=1, cpp_type=5, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - options=None, - is_extendable=False, - extension_ranges=[], - serialized_start=23, - serialized_end=65, -) - -_PATHSYMPROTO = descriptor.Descriptor( - name='PathSymProto', - full_name='PathSymProto', - filename=None, - file=DESCRIPTOR, - containing_type=None, - fields=[ - descriptor.FieldDescriptor( - name='name', full_name='PathSymProto.name', index=0, - number=1, type=9, cpp_type=9, label=2, - has_default_value=False, default_value=unicode("", "utf-8"), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None), - descriptor.FieldDescriptor( - name='step', full_name='PathSymProto.step', index=1, - number=2, type=1, cpp_type=5, label=2, +_DASHDOTPROTO = _descriptor.Descriptor( + name='DashDotProto', + full_name='DashDotProto', + filename=None, + file=DESCRIPTOR, + containing_type=None, + fields=[ + _descriptor.FieldDescriptor( + name='dd', full_name='DashDotProto.dd', index=0, + number=1, type=1, cpp_type=5, label=3, + has_default_value=False, default_value=[], + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + options=None), + _descriptor.FieldDescriptor( + name='offset', full_name='DashDotProto.offset', index=1, + number=2, type=1, cpp_type=5, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - descriptor.FieldDescriptor( + ], + extensions=[ + ], + nested_types=[], + enum_types=[ + ], + options=None, + is_extendable=False, + extension_ranges=[], + oneofs=[ + ], + serialized_start=23, + serialized_end=65, +) + + +_PATHSYMPROTO = _descriptor.Descriptor( + name='PathSymProto', + full_name='PathSymProto', + filename=None, + file=DESCRIPTOR, + containing_type=None, + fields=[ + _descriptor.FieldDescriptor( + name='name', full_name='PathSymProto.name', index=0, + number=1, type=9, cpp_type=9, label=2, + has_default_value=False, default_value=_b("").decode('utf-8'), + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + options=None), + _descriptor.FieldDescriptor( + name='step', full_name='PathSymProto.step', index=1, + number=2, type=1, cpp_type=5, label=2, + has_default_value=False, default_value=0, + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + options=None), + _descriptor.FieldDescriptor( name='offset', full_name='PathSymProto.offset', index=2, number=3, type=1, cpp_type=5, label=1, has_default_value=False, default_value=0, @@ -144,61 +160,63 @@ _PATHSYMPROTO = descriptor.Descriptor( options=None, is_extendable=False, extension_ranges=[], + oneofs=[ + ], serialized_start=67, serialized_end=125, ) -_LINERULEPROTO = descriptor.Descriptor( +_LINERULEPROTO = _descriptor.Descriptor( name='LineRuleProto', full_name='LineRuleProto', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='width', full_name='LineRuleProto.width', index=0, number=1, type=1, cpp_type=5, label=2, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='color', full_name='LineRuleProto.color', index=1, number=2, type=13, cpp_type=3, label=2, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='dashdot', full_name='LineRuleProto.dashdot', index=2, number=3, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='priority', full_name='LineRuleProto.priority', index=3, number=4, type=5, cpp_type=1, label=2, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='pathsym', full_name='LineRuleProto.pathsym', index=4, number=5, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='join', full_name='LineRuleProto.join', index=5, number=6, type=14, cpp_type=8, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='cap', full_name='LineRuleProto.cap', index=6, number=7, type=14, cpp_type=8, label=1, has_default_value=False, default_value=0, @@ -214,54 +232,56 @@ _LINERULEPROTO = descriptor.Descriptor( options=None, is_extendable=False, extension_ranges=[], + oneofs=[ + ], serialized_start=128, serialized_end=303, ) -_LINEDEFPROTO = descriptor.Descriptor( +_LINEDEFPROTO = _descriptor.Descriptor( name='LineDefProto', full_name='LineDefProto', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='width', full_name='LineDefProto.width', index=0, number=1, type=1, cpp_type=5, label=2, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='color', full_name='LineDefProto.color', index=1, number=2, type=13, cpp_type=3, label=2, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='dashdot', full_name='LineDefProto.dashdot', index=2, number=3, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='pathsym', full_name='LineDefProto.pathsym', index=3, number=4, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='join', full_name='LineDefProto.join', index=4, number=6, type=14, cpp_type=8, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='cap', full_name='LineDefProto.cap', index=5, number=7, type=14, cpp_type=8, label=1, has_default_value=False, default_value=0, @@ -277,33 +297,35 @@ _LINEDEFPROTO = descriptor.Descriptor( options=None, is_extendable=False, extension_ranges=[], + oneofs=[ + ], serialized_start=306, serialized_end=462, ) -_AREARULEPROTO = descriptor.Descriptor( +_AREARULEPROTO = _descriptor.Descriptor( name='AreaRuleProto', full_name='AreaRuleProto', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='color', full_name='AreaRuleProto.color', index=0, number=1, type=13, cpp_type=3, label=2, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='border', full_name='AreaRuleProto.border', index=1, number=2, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='priority', full_name='AreaRuleProto.priority', index=2, number=3, type=5, cpp_type=1, label=2, has_default_value=False, default_value=0, @@ -319,33 +341,35 @@ _AREARULEPROTO = descriptor.Descriptor( options=None, is_extendable=False, extension_ranges=[], + oneofs=[ + ], serialized_start=464, serialized_end=543, ) -_SYMBOLRULEPROTO = descriptor.Descriptor( +_SYMBOLRULEPROTO = _descriptor.Descriptor( name='SymbolRuleProto', full_name='SymbolRuleProto', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='name', full_name='SymbolRuleProto.name', index=0, number=1, type=9, cpp_type=9, label=2, - has_default_value=False, default_value=unicode("", "utf-8"), + has_default_value=False, default_value=_b("").decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='apply_for_type', full_name='SymbolRuleProto.apply_for_type', 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, options=None), - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='priority', full_name='SymbolRuleProto.priority', index=2, number=3, type=5, cpp_type=1, label=2, has_default_value=False, default_value=0, @@ -361,47 +385,49 @@ _SYMBOLRULEPROTO = descriptor.Descriptor( options=None, is_extendable=False, extension_ranges=[], + oneofs=[ + ], serialized_start=545, serialized_end=618, ) -_CAPTIONDEFPROTO = descriptor.Descriptor( +_CAPTIONDEFPROTO = _descriptor.Descriptor( name='CaptionDefProto', full_name='CaptionDefProto', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='height', full_name='CaptionDefProto.height', index=0, number=1, type=5, cpp_type=1, label=2, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='color', full_name='CaptionDefProto.color', index=1, number=2, type=13, cpp_type=3, label=2, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='stroke_color', full_name='CaptionDefProto.stroke_color', index=2, number=3, type=13, cpp_type=3, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='offset_x', full_name='CaptionDefProto.offset_x', index=3, number=4, 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, options=None), - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='offset_y', full_name='CaptionDefProto.offset_y', index=4, number=5, type=5, cpp_type=1, label=1, has_default_value=False, default_value=0, @@ -417,33 +443,35 @@ _CAPTIONDEFPROTO = descriptor.Descriptor( options=None, is_extendable=False, extension_ranges=[], + oneofs=[ + ], serialized_start=620, serialized_end=726, ) -_CAPTIONRULEPROTO = descriptor.Descriptor( +_CAPTIONRULEPROTO = _descriptor.Descriptor( name='CaptionRuleProto', full_name='CaptionRuleProto', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='primary', full_name='CaptionRuleProto.primary', index=0, number=1, type=11, cpp_type=10, label=2, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='secondary', full_name='CaptionRuleProto.secondary', index=1, number=2, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='priority', full_name='CaptionRuleProto.priority', index=2, number=3, type=5, cpp_type=1, label=2, has_default_value=False, default_value=0, @@ -459,40 +487,42 @@ _CAPTIONRULEPROTO = descriptor.Descriptor( options=None, is_extendable=False, extension_ranges=[], + oneofs=[ + ], serialized_start=728, serialized_end=836, ) -_CIRCLERULEPROTO = descriptor.Descriptor( +_CIRCLERULEPROTO = _descriptor.Descriptor( name='CircleRuleProto', full_name='CircleRuleProto', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='radius', full_name='CircleRuleProto.radius', index=0, number=1, type=1, cpp_type=5, label=2, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='color', full_name='CircleRuleProto.color', index=1, number=2, type=13, cpp_type=3, label=2, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='border', full_name='CircleRuleProto.border', index=2, number=3, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='priority', full_name='CircleRuleProto.priority', index=3, number=4, type=5, cpp_type=1, label=2, has_default_value=False, default_value=0, @@ -508,33 +538,35 @@ _CIRCLERULEPROTO = descriptor.Descriptor( options=None, is_extendable=False, extension_ranges=[], + oneofs=[ + ], serialized_start=838, serialized_end=935, ) -_PATHTEXTRULEPROTO = descriptor.Descriptor( +_PATHTEXTRULEPROTO = _descriptor.Descriptor( name='PathTextRuleProto', full_name='PathTextRuleProto', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='primary', full_name='PathTextRuleProto.primary', index=0, number=1, type=11, cpp_type=10, label=2, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='secondary', full_name='PathTextRuleProto.secondary', index=1, number=2, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='priority', full_name='PathTextRuleProto.priority', index=2, number=3, type=5, cpp_type=1, label=2, has_default_value=False, default_value=0, @@ -550,67 +582,127 @@ _PATHTEXTRULEPROTO = descriptor.Descriptor( options=None, is_extendable=False, extension_ranges=[], + oneofs=[ + ], serialized_start=937, serialized_end=1046, ) -_DRAWELEMENTPROTO = descriptor.Descriptor( +_SHIELDRULEPROTO = _descriptor.Descriptor( + name='ShieldRuleProto', + full_name='ShieldRuleProto', + filename=None, + file=DESCRIPTOR, + containing_type=None, + fields=[ + _descriptor.FieldDescriptor( + name='height', full_name='ShieldRuleProto.height', index=0, + number=1, type=5, cpp_type=1, label=2, + has_default_value=False, default_value=0, + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + options=None), + _descriptor.FieldDescriptor( + name='color', full_name='ShieldRuleProto.color', index=1, + number=2, type=13, cpp_type=3, label=2, + has_default_value=False, default_value=0, + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + options=None), + _descriptor.FieldDescriptor( + name='stroke_color', full_name='ShieldRuleProto.stroke_color', index=2, + number=3, type=13, cpp_type=3, label=1, + has_default_value=False, default_value=0, + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + options=None), + _descriptor.FieldDescriptor( + name='priority', full_name='ShieldRuleProto.priority', index=3, + number=4, type=5, cpp_type=1, label=2, + has_default_value=False, default_value=0, + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + options=None), + ], + extensions=[ + ], + nested_types=[], + enum_types=[ + ], + options=None, + is_extendable=False, + extension_ranges=[], + oneofs=[ + ], + serialized_start=1048, + serialized_end=1136, +) + + +_DRAWELEMENTPROTO = _descriptor.Descriptor( name='DrawElementProto', full_name='DrawElementProto', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='scale', full_name='DrawElementProto.scale', index=0, number=1, type=5, cpp_type=1, label=2, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='lines', full_name='DrawElementProto.lines', index=1, number=2, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='area', full_name='DrawElementProto.area', index=2, number=3, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='symbol', full_name='DrawElementProto.symbol', index=3, number=4, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='caption', full_name='DrawElementProto.caption', index=4, number=5, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='circle', full_name='DrawElementProto.circle', index=5, number=6, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='path_text', full_name='DrawElementProto.path_text', index=6, number=7, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), + _descriptor.FieldDescriptor( + name='shield', full_name='DrawElementProto.shield', index=7, + number=8, type=11, cpp_type=10, label=1, + has_default_value=False, default_value=None, + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + options=None), ], extensions=[ ], @@ -620,26 +712,28 @@ _DRAWELEMENTPROTO = descriptor.Descriptor( options=None, is_extendable=False, extension_ranges=[], - serialized_start=1049, - serialized_end=1286, + oneofs=[ + ], + serialized_start=1139, + serialized_end=1410, ) -_CLASSIFELEMENTPROTO = descriptor.Descriptor( +_CLASSIFELEMENTPROTO = _descriptor.Descriptor( name='ClassifElementProto', full_name='ClassifElementProto', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='name', full_name='ClassifElementProto.name', index=0, number=1, type=9, cpp_type=9, label=2, - has_default_value=False, default_value=unicode("", "utf-8"), + has_default_value=False, default_value=_b("").decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='element', full_name='ClassifElementProto.element', index=1, number=2, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], @@ -655,19 +749,21 @@ _CLASSIFELEMENTPROTO = descriptor.Descriptor( options=None, is_extendable=False, extension_ranges=[], - serialized_start=1288, - serialized_end=1359, + oneofs=[ + ], + serialized_start=1412, + serialized_end=1483, ) -_CONTAINERPROTO = descriptor.Descriptor( +_CONTAINERPROTO = _descriptor.Descriptor( name='ContainerProto', full_name='ContainerProto', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='cont', full_name='ContainerProto.cont', index=0, number=1, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], @@ -683,8 +779,10 @@ _CONTAINERPROTO = descriptor.Descriptor( options=None, is_extendable=False, extension_ranges=[], - serialized_start=1361, - serialized_end=1413, + oneofs=[ + ], + serialized_start=1485, + serialized_end=1537, ) _LINERULEPROTO.fields_by_name['dashdot'].message_type = _DASHDOTPROTO @@ -707,6 +805,7 @@ _DRAWELEMENTPROTO.fields_by_name['symbol'].message_type = _SYMBOLRULEPROTO _DRAWELEMENTPROTO.fields_by_name['caption'].message_type = _CAPTIONRULEPROTO _DRAWELEMENTPROTO.fields_by_name['circle'].message_type = _CIRCLERULEPROTO _DRAWELEMENTPROTO.fields_by_name['path_text'].message_type = _PATHTEXTRULEPROTO +_DRAWELEMENTPROTO.fields_by_name['shield'].message_type = _SHIELDRULEPROTO _CLASSIFELEMENTPROTO.fields_by_name['element'].message_type = _DRAWELEMENTPROTO _CONTAINERPROTO.fields_by_name['cont'].message_type = _CLASSIFELEMENTPROTO DESCRIPTOR.message_types_by_name['DashDotProto'] = _DASHDOTPROTO @@ -719,99 +818,112 @@ DESCRIPTOR.message_types_by_name['CaptionDefProto'] = _CAPTIONDEFPROTO DESCRIPTOR.message_types_by_name['CaptionRuleProto'] = _CAPTIONRULEPROTO DESCRIPTOR.message_types_by_name['CircleRuleProto'] = _CIRCLERULEPROTO DESCRIPTOR.message_types_by_name['PathTextRuleProto'] = _PATHTEXTRULEPROTO +DESCRIPTOR.message_types_by_name['ShieldRuleProto'] = _SHIELDRULEPROTO DESCRIPTOR.message_types_by_name['DrawElementProto'] = _DRAWELEMENTPROTO DESCRIPTOR.message_types_by_name['ClassifElementProto'] = _CLASSIFELEMENTPROTO DESCRIPTOR.message_types_by_name['ContainerProto'] = _CONTAINERPROTO +DESCRIPTOR.enum_types_by_name['LineJoin'] = _LINEJOIN +DESCRIPTOR.enum_types_by_name['LineCap'] = _LINECAP + +DashDotProto = _reflection.GeneratedProtocolMessageType('DashDotProto', (_message.Message,), dict( + DESCRIPTOR = _DASHDOTPROTO, + __module__ = 'drules_struct_pb2' + # @@protoc_insertion_point(class_scope:DashDotProto) + )) +_sym_db.RegisterMessage(DashDotProto) + +PathSymProto = _reflection.GeneratedProtocolMessageType('PathSymProto', (_message.Message,), dict( + DESCRIPTOR = _PATHSYMPROTO, + __module__ = 'drules_struct_pb2' + # @@protoc_insertion_point(class_scope:PathSymProto) + )) +_sym_db.RegisterMessage(PathSymProto) + +LineRuleProto = _reflection.GeneratedProtocolMessageType('LineRuleProto', (_message.Message,), dict( + DESCRIPTOR = _LINERULEPROTO, + __module__ = 'drules_struct_pb2' + # @@protoc_insertion_point(class_scope:LineRuleProto) + )) +_sym_db.RegisterMessage(LineRuleProto) + +LineDefProto = _reflection.GeneratedProtocolMessageType('LineDefProto', (_message.Message,), dict( + DESCRIPTOR = _LINEDEFPROTO, + __module__ = 'drules_struct_pb2' + # @@protoc_insertion_point(class_scope:LineDefProto) + )) +_sym_db.RegisterMessage(LineDefProto) + +AreaRuleProto = _reflection.GeneratedProtocolMessageType('AreaRuleProto', (_message.Message,), dict( + DESCRIPTOR = _AREARULEPROTO, + __module__ = 'drules_struct_pb2' + # @@protoc_insertion_point(class_scope:AreaRuleProto) + )) +_sym_db.RegisterMessage(AreaRuleProto) + +SymbolRuleProto = _reflection.GeneratedProtocolMessageType('SymbolRuleProto', (_message.Message,), dict( + DESCRIPTOR = _SYMBOLRULEPROTO, + __module__ = 'drules_struct_pb2' + # @@protoc_insertion_point(class_scope:SymbolRuleProto) + )) +_sym_db.RegisterMessage(SymbolRuleProto) + +CaptionDefProto = _reflection.GeneratedProtocolMessageType('CaptionDefProto', (_message.Message,), dict( + DESCRIPTOR = _CAPTIONDEFPROTO, + __module__ = 'drules_struct_pb2' + # @@protoc_insertion_point(class_scope:CaptionDefProto) + )) +_sym_db.RegisterMessage(CaptionDefProto) + +CaptionRuleProto = _reflection.GeneratedProtocolMessageType('CaptionRuleProto', (_message.Message,), dict( + DESCRIPTOR = _CAPTIONRULEPROTO, + __module__ = 'drules_struct_pb2' + # @@protoc_insertion_point(class_scope:CaptionRuleProto) + )) +_sym_db.RegisterMessage(CaptionRuleProto) + +CircleRuleProto = _reflection.GeneratedProtocolMessageType('CircleRuleProto', (_message.Message,), dict( + DESCRIPTOR = _CIRCLERULEPROTO, + __module__ = 'drules_struct_pb2' + # @@protoc_insertion_point(class_scope:CircleRuleProto) + )) +_sym_db.RegisterMessage(CircleRuleProto) + +PathTextRuleProto = _reflection.GeneratedProtocolMessageType('PathTextRuleProto', (_message.Message,), dict( + DESCRIPTOR = _PATHTEXTRULEPROTO, + __module__ = 'drules_struct_pb2' + # @@protoc_insertion_point(class_scope:PathTextRuleProto) + )) +_sym_db.RegisterMessage(PathTextRuleProto) + +ShieldRuleProto = _reflection.GeneratedProtocolMessageType('ShieldRuleProto', (_message.Message,), dict( + DESCRIPTOR = _SHIELDRULEPROTO, + __module__ = 'drules_struct_pb2' + # @@protoc_insertion_point(class_scope:ShieldRuleProto) + )) +_sym_db.RegisterMessage(ShieldRuleProto) + +DrawElementProto = _reflection.GeneratedProtocolMessageType('DrawElementProto', (_message.Message,), dict( + DESCRIPTOR = _DRAWELEMENTPROTO, + __module__ = 'drules_struct_pb2' + # @@protoc_insertion_point(class_scope:DrawElementProto) + )) +_sym_db.RegisterMessage(DrawElementProto) + +ClassifElementProto = _reflection.GeneratedProtocolMessageType('ClassifElementProto', (_message.Message,), dict( + DESCRIPTOR = _CLASSIFELEMENTPROTO, + __module__ = 'drules_struct_pb2' + # @@protoc_insertion_point(class_scope:ClassifElementProto) + )) +_sym_db.RegisterMessage(ClassifElementProto) + +ContainerProto = _reflection.GeneratedProtocolMessageType('ContainerProto', (_message.Message,), dict( + DESCRIPTOR = _CONTAINERPROTO, + __module__ = 'drules_struct_pb2' + # @@protoc_insertion_point(class_scope:ContainerProto) + )) +_sym_db.RegisterMessage(ContainerProto) -class DashDotProto(message.Message): - __metaclass__ = reflection.GeneratedProtocolMessageType - DESCRIPTOR = _DASHDOTPROTO - - # @@protoc_insertion_point(class_scope:DashDotProto) - - -class PathSymProto(message.Message): - __metaclass__ = reflection.GeneratedProtocolMessageType - DESCRIPTOR = _PATHSYMPROTO - - # @@protoc_insertion_point(class_scope:PathSymProto) - - -class LineRuleProto(message.Message): - __metaclass__ = reflection.GeneratedProtocolMessageType - DESCRIPTOR = _LINERULEPROTO - - # @@protoc_insertion_point(class_scope:LineRuleProto) - - -class LineDefProto(message.Message): - __metaclass__ = reflection.GeneratedProtocolMessageType - DESCRIPTOR = _LINEDEFPROTO - - # @@protoc_insertion_point(class_scope:LineDefProto) - - -class AreaRuleProto(message.Message): - __metaclass__ = reflection.GeneratedProtocolMessageType - DESCRIPTOR = _AREARULEPROTO - - # @@protoc_insertion_point(class_scope:AreaRuleProto) - - -class SymbolRuleProto(message.Message): - __metaclass__ = reflection.GeneratedProtocolMessageType - DESCRIPTOR = _SYMBOLRULEPROTO - - # @@protoc_insertion_point(class_scope:SymbolRuleProto) - - -class CaptionDefProto(message.Message): - __metaclass__ = reflection.GeneratedProtocolMessageType - DESCRIPTOR = _CAPTIONDEFPROTO - - # @@protoc_insertion_point(class_scope:CaptionDefProto) - - -class CaptionRuleProto(message.Message): - __metaclass__ = reflection.GeneratedProtocolMessageType - DESCRIPTOR = _CAPTIONRULEPROTO - - # @@protoc_insertion_point(class_scope:CaptionRuleProto) - - -class CircleRuleProto(message.Message): - __metaclass__ = reflection.GeneratedProtocolMessageType - DESCRIPTOR = _CIRCLERULEPROTO - - # @@protoc_insertion_point(class_scope:CircleRuleProto) - - -class PathTextRuleProto(message.Message): - __metaclass__ = reflection.GeneratedProtocolMessageType - DESCRIPTOR = _PATHTEXTRULEPROTO - - # @@protoc_insertion_point(class_scope:PathTextRuleProto) - - -class DrawElementProto(message.Message): - __metaclass__ = reflection.GeneratedProtocolMessageType - DESCRIPTOR = _DRAWELEMENTPROTO - - # @@protoc_insertion_point(class_scope:DrawElementProto) - - -class ClassifElementProto(message.Message): - __metaclass__ = reflection.GeneratedProtocolMessageType - DESCRIPTOR = _CLASSIFELEMENTPROTO - - # @@protoc_insertion_point(class_scope:ClassifElementProto) - - -class ContainerProto(message.Message): - __metaclass__ = reflection.GeneratedProtocolMessageType - DESCRIPTOR = _CONTAINERPROTO - - # @@protoc_insertion_point(class_scope:ContainerProto) - +DESCRIPTOR.has_options = True +DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('H\003')) # @@protoc_insertion_point(module_scope) diff --git a/tools/python/stylesheet/drules_struct_pb2.py b/tools/python/stylesheet/drules_struct_pb2.py index 8276fc6cf4..d30e24a482 100644 --- a/tools/python/stylesheet/drules_struct_pb2.py +++ b/tools/python/stylesheet/drules_struct_pb2.py @@ -1,70 +1,82 @@ # Generated by the protocol buffer compiler. DO NOT EDIT! +# source: drules_struct.proto -from google.protobuf import descriptor -from google.protobuf import message -from google.protobuf import reflection +import sys +_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1')) +from google.protobuf.internal import enum_type_wrapper +from google.protobuf import descriptor as _descriptor +from google.protobuf import message as _message +from google.protobuf import reflection as _reflection +from google.protobuf import symbol_database as _symbol_database from google.protobuf import descriptor_pb2 # @@protoc_insertion_point(imports) +_sym_db = _symbol_database.Default() -DESCRIPTOR = descriptor.FileDescriptor( + + +DESCRIPTOR = _descriptor.FileDescriptor( name='drules_struct.proto', package='', - serialized_pb='\n\x13\x64rules_struct.proto\"*\n\x0c\x44\x61shDotProto\x12\n\n\x02\x64\x64\x18\x01 \x03(\x01\x12\x0e\n\x06offset\x18\x02 \x01(\x01\":\n\x0cPathSymProto\x12\x0c\n\x04name\x18\x01 \x02(\t\x12\x0c\n\x04step\x18\x02 \x02(\x01\x12\x0e\n\x06offset\x18\x03 \x01(\x01\"\xaf\x01\n\rLineRuleProto\x12\r\n\x05width\x18\x01 \x02(\x01\x12\r\n\x05\x63olor\x18\x02 \x02(\r\x12\x1e\n\x07\x64\x61shdot\x18\x03 \x01(\x0b\x32\r.DashDotProto\x12\x10\n\x08priority\x18\x04 \x02(\x05\x12\x1e\n\x07pathsym\x18\x05 \x01(\x0b\x32\r.PathSymProto\x12\x17\n\x04join\x18\x06 \x01(\x0e\x32\t.LineJoin\x12\x15\n\x03\x63\x61p\x18\x07 \x01(\x0e\x32\x08.LineCap\"\x9c\x01\n\x0cLineDefProto\x12\r\n\x05width\x18\x01 \x02(\x01\x12\r\n\x05\x63olor\x18\x02 \x02(\r\x12\x1e\n\x07\x64\x61shdot\x18\x03 \x01(\x0b\x32\r.DashDotProto\x12\x1e\n\x07pathsym\x18\x04 \x01(\x0b\x32\r.PathSymProto\x12\x17\n\x04join\x18\x06 \x01(\x0e\x32\t.LineJoin\x12\x15\n\x03\x63\x61p\x18\x07 \x01(\x0e\x32\x08.LineCap\"O\n\rAreaRuleProto\x12\r\n\x05\x63olor\x18\x01 \x02(\r\x12\x1d\n\x06\x62order\x18\x02 \x01(\x0b\x32\r.LineDefProto\x12\x10\n\x08priority\x18\x03 \x02(\x05\"I\n\x0fSymbolRuleProto\x12\x0c\n\x04name\x18\x01 \x02(\t\x12\x16\n\x0e\x61pply_for_type\x18\x02 \x01(\x05\x12\x10\n\x08priority\x18\x03 \x02(\x05\"j\n\x0f\x43\x61ptionDefProto\x12\x0e\n\x06height\x18\x01 \x02(\x05\x12\r\n\x05\x63olor\x18\x02 \x02(\r\x12\x14\n\x0cstroke_color\x18\x03 \x01(\r\x12\x10\n\x08offset_x\x18\x04 \x01(\x05\x12\x10\n\x08offset_y\x18\x05 \x01(\x05\"l\n\x10\x43\x61ptionRuleProto\x12!\n\x07primary\x18\x01 \x02(\x0b\x32\x10.CaptionDefProto\x12#\n\tsecondary\x18\x02 \x01(\x0b\x32\x10.CaptionDefProto\x12\x10\n\x08priority\x18\x03 \x02(\x05\"a\n\x0f\x43ircleRuleProto\x12\x0e\n\x06radius\x18\x01 \x02(\x01\x12\r\n\x05\x63olor\x18\x02 \x02(\r\x12\x1d\n\x06\x62order\x18\x03 \x01(\x0b\x32\r.LineDefProto\x12\x10\n\x08priority\x18\x04 \x02(\x05\"m\n\x11PathTextRuleProto\x12!\n\x07primary\x18\x01 \x02(\x0b\x32\x10.CaptionDefProto\x12#\n\tsecondary\x18\x02 \x01(\x0b\x32\x10.CaptionDefProto\x12\x10\n\x08priority\x18\x03 \x02(\x05\"\xed\x01\n\x10\x44rawElementProto\x12\r\n\x05scale\x18\x01 \x02(\x05\x12\x1d\n\x05lines\x18\x02 \x03(\x0b\x32\x0e.LineRuleProto\x12\x1c\n\x04\x61rea\x18\x03 \x01(\x0b\x32\x0e.AreaRuleProto\x12 \n\x06symbol\x18\x04 \x01(\x0b\x32\x10.SymbolRuleProto\x12\"\n\x07\x63\x61ption\x18\x05 \x01(\x0b\x32\x11.CaptionRuleProto\x12 \n\x06\x63ircle\x18\x06 \x01(\x0b\x32\x10.CircleRuleProto\x12%\n\tpath_text\x18\x07 \x01(\x0b\x32\x12.PathTextRuleProto\"G\n\x13\x43lassifElementProto\x12\x0c\n\x04name\x18\x01 \x02(\t\x12\"\n\x07\x65lement\x18\x02 \x03(\x0b\x32\x11.DrawElementProto\"4\n\x0e\x43ontainerProto\x12\"\n\x04\x63ont\x18\x01 \x03(\x0b\x32\x14.ClassifElementProto*4\n\x08LineJoin\x12\r\n\tROUNDJOIN\x10\x00\x12\r\n\tBEVELJOIN\x10\x01\x12\n\n\x06NOJOIN\x10\x02*3\n\x07LineCap\x12\x0c\n\x08ROUNDCAP\x10\x00\x12\x0b\n\x07\x42UTTCAP\x10\x01\x12\r\n\tSQUARECAP\x10\x02\x42\x02H\x03') + serialized_pb=_b('\n\x13\x64rules_struct.proto\"*\n\x0c\x44\x61shDotProto\x12\n\n\x02\x64\x64\x18\x01 \x03(\x01\x12\x0e\n\x06offset\x18\x02 \x01(\x01\":\n\x0cPathSymProto\x12\x0c\n\x04name\x18\x01 \x02(\t\x12\x0c\n\x04step\x18\x02 \x02(\x01\x12\x0e\n\x06offset\x18\x03 \x01(\x01\"\xaf\x01\n\rLineRuleProto\x12\r\n\x05width\x18\x01 \x02(\x01\x12\r\n\x05\x63olor\x18\x02 \x02(\r\x12\x1e\n\x07\x64\x61shdot\x18\x03 \x01(\x0b\x32\r.DashDotProto\x12\x10\n\x08priority\x18\x04 \x02(\x05\x12\x1e\n\x07pathsym\x18\x05 \x01(\x0b\x32\r.PathSymProto\x12\x17\n\x04join\x18\x06 \x01(\x0e\x32\t.LineJoin\x12\x15\n\x03\x63\x61p\x18\x07 \x01(\x0e\x32\x08.LineCap\"\x9c\x01\n\x0cLineDefProto\x12\r\n\x05width\x18\x01 \x02(\x01\x12\r\n\x05\x63olor\x18\x02 \x02(\r\x12\x1e\n\x07\x64\x61shdot\x18\x03 \x01(\x0b\x32\r.DashDotProto\x12\x1e\n\x07pathsym\x18\x04 \x01(\x0b\x32\r.PathSymProto\x12\x17\n\x04join\x18\x06 \x01(\x0e\x32\t.LineJoin\x12\x15\n\x03\x63\x61p\x18\x07 \x01(\x0e\x32\x08.LineCap\"O\n\rAreaRuleProto\x12\r\n\x05\x63olor\x18\x01 \x02(\r\x12\x1d\n\x06\x62order\x18\x02 \x01(\x0b\x32\r.LineDefProto\x12\x10\n\x08priority\x18\x03 \x02(\x05\"I\n\x0fSymbolRuleProto\x12\x0c\n\x04name\x18\x01 \x02(\t\x12\x16\n\x0e\x61pply_for_type\x18\x02 \x01(\x05\x12\x10\n\x08priority\x18\x03 \x02(\x05\"j\n\x0f\x43\x61ptionDefProto\x12\x0e\n\x06height\x18\x01 \x02(\x05\x12\r\n\x05\x63olor\x18\x02 \x02(\r\x12\x14\n\x0cstroke_color\x18\x03 \x01(\r\x12\x10\n\x08offset_x\x18\x04 \x01(\x05\x12\x10\n\x08offset_y\x18\x05 \x01(\x05\"l\n\x10\x43\x61ptionRuleProto\x12!\n\x07primary\x18\x01 \x02(\x0b\x32\x10.CaptionDefProto\x12#\n\tsecondary\x18\x02 \x01(\x0b\x32\x10.CaptionDefProto\x12\x10\n\x08priority\x18\x03 \x02(\x05\"a\n\x0f\x43ircleRuleProto\x12\x0e\n\x06radius\x18\x01 \x02(\x01\x12\r\n\x05\x63olor\x18\x02 \x02(\r\x12\x1d\n\x06\x62order\x18\x03 \x01(\x0b\x32\r.LineDefProto\x12\x10\n\x08priority\x18\x04 \x02(\x05\"m\n\x11PathTextRuleProto\x12!\n\x07primary\x18\x01 \x02(\x0b\x32\x10.CaptionDefProto\x12#\n\tsecondary\x18\x02 \x01(\x0b\x32\x10.CaptionDefProto\x12\x10\n\x08priority\x18\x03 \x02(\x05\"X\n\x0fShieldRuleProto\x12\x0e\n\x06height\x18\x01 \x02(\x05\x12\r\n\x05\x63olor\x18\x02 \x02(\r\x12\x14\n\x0cstroke_color\x18\x03 \x01(\r\x12\x10\n\x08priority\x18\x04 \x02(\x05\"\x8f\x02\n\x10\x44rawElementProto\x12\r\n\x05scale\x18\x01 \x02(\x05\x12\x1d\n\x05lines\x18\x02 \x03(\x0b\x32\x0e.LineRuleProto\x12\x1c\n\x04\x61rea\x18\x03 \x01(\x0b\x32\x0e.AreaRuleProto\x12 \n\x06symbol\x18\x04 \x01(\x0b\x32\x10.SymbolRuleProto\x12\"\n\x07\x63\x61ption\x18\x05 \x01(\x0b\x32\x11.CaptionRuleProto\x12 \n\x06\x63ircle\x18\x06 \x01(\x0b\x32\x10.CircleRuleProto\x12%\n\tpath_text\x18\x07 \x01(\x0b\x32\x12.PathTextRuleProto\x12 \n\x06shield\x18\x08 \x01(\x0b\x32\x10.ShieldRuleProto\"G\n\x13\x43lassifElementProto\x12\x0c\n\x04name\x18\x01 \x02(\t\x12\"\n\x07\x65lement\x18\x02 \x03(\x0b\x32\x11.DrawElementProto\"4\n\x0e\x43ontainerProto\x12\"\n\x04\x63ont\x18\x01 \x03(\x0b\x32\x14.ClassifElementProto*4\n\x08LineJoin\x12\r\n\tROUNDJOIN\x10\x00\x12\r\n\tBEVELJOIN\x10\x01\x12\n\n\x06NOJOIN\x10\x02*3\n\x07LineCap\x12\x0c\n\x08ROUNDCAP\x10\x00\x12\x0b\n\x07\x42UTTCAP\x10\x01\x12\r\n\tSQUARECAP\x10\x02\x42\x02H\x03') +) +_sym_db.RegisterFileDescriptor(DESCRIPTOR) -_LINEJOIN = descriptor.EnumDescriptor( +_LINEJOIN = _descriptor.EnumDescriptor( name='LineJoin', full_name='LineJoin', filename=None, file=DESCRIPTOR, values=[ - descriptor.EnumValueDescriptor( + _descriptor.EnumValueDescriptor( name='ROUNDJOIN', index=0, number=0, options=None, type=None), - descriptor.EnumValueDescriptor( + _descriptor.EnumValueDescriptor( name='BEVELJOIN', index=1, number=1, options=None, type=None), - descriptor.EnumValueDescriptor( + _descriptor.EnumValueDescriptor( name='NOJOIN', index=2, number=2, options=None, type=None), ], containing_type=None, options=None, - serialized_start=1415, - serialized_end=1467, + serialized_start=1539, + serialized_end=1591, ) +_sym_db.RegisterEnumDescriptor(_LINEJOIN) - -_LINECAP = descriptor.EnumDescriptor( +LineJoin = enum_type_wrapper.EnumTypeWrapper(_LINEJOIN) +_LINECAP = _descriptor.EnumDescriptor( name='LineCap', full_name='LineCap', filename=None, file=DESCRIPTOR, values=[ - descriptor.EnumValueDescriptor( + _descriptor.EnumValueDescriptor( name='ROUNDCAP', index=0, number=0, options=None, type=None), - descriptor.EnumValueDescriptor( + _descriptor.EnumValueDescriptor( name='BUTTCAP', index=1, number=1, options=None, type=None), - descriptor.EnumValueDescriptor( + _descriptor.EnumValueDescriptor( name='SQUARECAP', index=2, number=2, options=None, type=None), ], containing_type=None, options=None, - serialized_start=1469, - serialized_end=1520, + serialized_start=1593, + serialized_end=1644, ) +_sym_db.RegisterEnumDescriptor(_LINECAP) - +LineCap = enum_type_wrapper.EnumTypeWrapper(_LINECAP) ROUNDJOIN = 0 BEVELJOIN = 1 NOJOIN = 2 @@ -74,21 +86,21 @@ SQUARECAP = 2 -_DASHDOTPROTO = descriptor.Descriptor( +_DASHDOTPROTO = _descriptor.Descriptor( name='DashDotProto', full_name='DashDotProto', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='dd', full_name='DashDotProto.dd', index=0, number=1, type=1, cpp_type=5, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='offset', full_name='DashDotProto.offset', index=1, number=2, type=1, cpp_type=5, label=1, has_default_value=False, default_value=0, @@ -104,33 +116,35 @@ _DASHDOTPROTO = descriptor.Descriptor( options=None, is_extendable=False, extension_ranges=[], + oneofs=[ + ], serialized_start=23, serialized_end=65, ) -_PATHSYMPROTO = descriptor.Descriptor( +_PATHSYMPROTO = _descriptor.Descriptor( name='PathSymProto', full_name='PathSymProto', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='name', full_name='PathSymProto.name', index=0, number=1, type=9, cpp_type=9, label=2, - has_default_value=False, default_value=unicode("", "utf-8"), + has_default_value=False, default_value=_b("").decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='step', full_name='PathSymProto.step', index=1, number=2, type=1, cpp_type=5, label=2, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='offset', full_name='PathSymProto.offset', index=2, number=3, type=1, cpp_type=5, label=1, has_default_value=False, default_value=0, @@ -146,61 +160,63 @@ _PATHSYMPROTO = descriptor.Descriptor( options=None, is_extendable=False, extension_ranges=[], + oneofs=[ + ], serialized_start=67, serialized_end=125, ) -_LINERULEPROTO = descriptor.Descriptor( +_LINERULEPROTO = _descriptor.Descriptor( name='LineRuleProto', full_name='LineRuleProto', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='width', full_name='LineRuleProto.width', index=0, number=1, type=1, cpp_type=5, label=2, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='color', full_name='LineRuleProto.color', index=1, number=2, type=13, cpp_type=3, label=2, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='dashdot', full_name='LineRuleProto.dashdot', index=2, number=3, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='priority', full_name='LineRuleProto.priority', index=3, number=4, type=5, cpp_type=1, label=2, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='pathsym', full_name='LineRuleProto.pathsym', index=4, number=5, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='join', full_name='LineRuleProto.join', index=5, number=6, type=14, cpp_type=8, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='cap', full_name='LineRuleProto.cap', index=6, number=7, type=14, cpp_type=8, label=1, has_default_value=False, default_value=0, @@ -216,54 +232,56 @@ _LINERULEPROTO = descriptor.Descriptor( options=None, is_extendable=False, extension_ranges=[], + oneofs=[ + ], serialized_start=128, serialized_end=303, ) -_LINEDEFPROTO = descriptor.Descriptor( +_LINEDEFPROTO = _descriptor.Descriptor( name='LineDefProto', full_name='LineDefProto', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='width', full_name='LineDefProto.width', index=0, number=1, type=1, cpp_type=5, label=2, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='color', full_name='LineDefProto.color', index=1, number=2, type=13, cpp_type=3, label=2, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='dashdot', full_name='LineDefProto.dashdot', index=2, number=3, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='pathsym', full_name='LineDefProto.pathsym', index=3, number=4, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='join', full_name='LineDefProto.join', index=4, number=6, type=14, cpp_type=8, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='cap', full_name='LineDefProto.cap', index=5, number=7, type=14, cpp_type=8, label=1, has_default_value=False, default_value=0, @@ -279,33 +297,35 @@ _LINEDEFPROTO = descriptor.Descriptor( options=None, is_extendable=False, extension_ranges=[], + oneofs=[ + ], serialized_start=306, serialized_end=462, ) -_AREARULEPROTO = descriptor.Descriptor( +_AREARULEPROTO = _descriptor.Descriptor( name='AreaRuleProto', full_name='AreaRuleProto', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='color', full_name='AreaRuleProto.color', index=0, number=1, type=13, cpp_type=3, label=2, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='border', full_name='AreaRuleProto.border', index=1, number=2, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='priority', full_name='AreaRuleProto.priority', index=2, number=3, type=5, cpp_type=1, label=2, has_default_value=False, default_value=0, @@ -321,33 +341,35 @@ _AREARULEPROTO = descriptor.Descriptor( options=None, is_extendable=False, extension_ranges=[], + oneofs=[ + ], serialized_start=464, serialized_end=543, ) -_SYMBOLRULEPROTO = descriptor.Descriptor( +_SYMBOLRULEPROTO = _descriptor.Descriptor( name='SymbolRuleProto', full_name='SymbolRuleProto', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='name', full_name='SymbolRuleProto.name', index=0, number=1, type=9, cpp_type=9, label=2, - has_default_value=False, default_value=unicode("", "utf-8"), + has_default_value=False, default_value=_b("").decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='apply_for_type', full_name='SymbolRuleProto.apply_for_type', 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, options=None), - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='priority', full_name='SymbolRuleProto.priority', index=2, number=3, type=5, cpp_type=1, label=2, has_default_value=False, default_value=0, @@ -363,47 +385,49 @@ _SYMBOLRULEPROTO = descriptor.Descriptor( options=None, is_extendable=False, extension_ranges=[], + oneofs=[ + ], serialized_start=545, serialized_end=618, ) -_CAPTIONDEFPROTO = descriptor.Descriptor( +_CAPTIONDEFPROTO = _descriptor.Descriptor( name='CaptionDefProto', full_name='CaptionDefProto', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='height', full_name='CaptionDefProto.height', index=0, number=1, type=5, cpp_type=1, label=2, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='color', full_name='CaptionDefProto.color', index=1, number=2, type=13, cpp_type=3, label=2, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='stroke_color', full_name='CaptionDefProto.stroke_color', index=2, number=3, type=13, cpp_type=3, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='offset_x', full_name='CaptionDefProto.offset_x', index=3, number=4, 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, options=None), - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='offset_y', full_name='CaptionDefProto.offset_y', index=4, number=5, type=5, cpp_type=1, label=1, has_default_value=False, default_value=0, @@ -419,33 +443,35 @@ _CAPTIONDEFPROTO = descriptor.Descriptor( options=None, is_extendable=False, extension_ranges=[], + oneofs=[ + ], serialized_start=620, serialized_end=726, ) -_CAPTIONRULEPROTO = descriptor.Descriptor( +_CAPTIONRULEPROTO = _descriptor.Descriptor( name='CaptionRuleProto', full_name='CaptionRuleProto', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='primary', full_name='CaptionRuleProto.primary', index=0, number=1, type=11, cpp_type=10, label=2, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='secondary', full_name='CaptionRuleProto.secondary', index=1, number=2, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='priority', full_name='CaptionRuleProto.priority', index=2, number=3, type=5, cpp_type=1, label=2, has_default_value=False, default_value=0, @@ -461,40 +487,42 @@ _CAPTIONRULEPROTO = descriptor.Descriptor( options=None, is_extendable=False, extension_ranges=[], + oneofs=[ + ], serialized_start=728, serialized_end=836, ) -_CIRCLERULEPROTO = descriptor.Descriptor( +_CIRCLERULEPROTO = _descriptor.Descriptor( name='CircleRuleProto', full_name='CircleRuleProto', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='radius', full_name='CircleRuleProto.radius', index=0, number=1, type=1, cpp_type=5, label=2, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='color', full_name='CircleRuleProto.color', index=1, number=2, type=13, cpp_type=3, label=2, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='border', full_name='CircleRuleProto.border', index=2, number=3, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='priority', full_name='CircleRuleProto.priority', index=3, number=4, type=5, cpp_type=1, label=2, has_default_value=False, default_value=0, @@ -510,33 +538,35 @@ _CIRCLERULEPROTO = descriptor.Descriptor( options=None, is_extendable=False, extension_ranges=[], + oneofs=[ + ], serialized_start=838, serialized_end=935, ) -_PATHTEXTRULEPROTO = descriptor.Descriptor( +_PATHTEXTRULEPROTO = _descriptor.Descriptor( name='PathTextRuleProto', full_name='PathTextRuleProto', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='primary', full_name='PathTextRuleProto.primary', index=0, number=1, type=11, cpp_type=10, label=2, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='secondary', full_name='PathTextRuleProto.secondary', index=1, number=2, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='priority', full_name='PathTextRuleProto.priority', index=2, number=3, type=5, cpp_type=1, label=2, has_default_value=False, default_value=0, @@ -552,67 +582,127 @@ _PATHTEXTRULEPROTO = descriptor.Descriptor( options=None, is_extendable=False, extension_ranges=[], + oneofs=[ + ], serialized_start=937, serialized_end=1046, ) -_DRAWELEMENTPROTO = descriptor.Descriptor( +_SHIELDRULEPROTO = _descriptor.Descriptor( + name='ShieldRuleProto', + full_name='ShieldRuleProto', + filename=None, + file=DESCRIPTOR, + containing_type=None, + fields=[ + _descriptor.FieldDescriptor( + name='height', full_name='ShieldRuleProto.height', index=0, + number=1, type=5, cpp_type=1, label=2, + has_default_value=False, default_value=0, + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + options=None), + _descriptor.FieldDescriptor( + name='color', full_name='ShieldRuleProto.color', index=1, + number=2, type=13, cpp_type=3, label=2, + has_default_value=False, default_value=0, + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + options=None), + _descriptor.FieldDescriptor( + name='stroke_color', full_name='ShieldRuleProto.stroke_color', index=2, + number=3, type=13, cpp_type=3, label=1, + has_default_value=False, default_value=0, + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + options=None), + _descriptor.FieldDescriptor( + name='priority', full_name='ShieldRuleProto.priority', index=3, + number=4, type=5, cpp_type=1, label=2, + has_default_value=False, default_value=0, + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + options=None), + ], + extensions=[ + ], + nested_types=[], + enum_types=[ + ], + options=None, + is_extendable=False, + extension_ranges=[], + oneofs=[ + ], + serialized_start=1048, + serialized_end=1136, +) + + +_DRAWELEMENTPROTO = _descriptor.Descriptor( name='DrawElementProto', full_name='DrawElementProto', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='scale', full_name='DrawElementProto.scale', index=0, number=1, type=5, cpp_type=1, label=2, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='lines', full_name='DrawElementProto.lines', index=1, number=2, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='area', full_name='DrawElementProto.area', index=2, number=3, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='symbol', full_name='DrawElementProto.symbol', index=3, number=4, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='caption', full_name='DrawElementProto.caption', index=4, number=5, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='circle', full_name='DrawElementProto.circle', index=5, number=6, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='path_text', full_name='DrawElementProto.path_text', index=6, number=7, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), + _descriptor.FieldDescriptor( + name='shield', full_name='DrawElementProto.shield', index=7, + number=8, type=11, cpp_type=10, label=1, + has_default_value=False, default_value=None, + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + options=None), ], extensions=[ ], @@ -622,26 +712,28 @@ _DRAWELEMENTPROTO = descriptor.Descriptor( options=None, is_extendable=False, extension_ranges=[], - serialized_start=1049, - serialized_end=1286, + oneofs=[ + ], + serialized_start=1139, + serialized_end=1410, ) -_CLASSIFELEMENTPROTO = descriptor.Descriptor( +_CLASSIFELEMENTPROTO = _descriptor.Descriptor( name='ClassifElementProto', full_name='ClassifElementProto', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='name', full_name='ClassifElementProto.name', index=0, number=1, type=9, cpp_type=9, label=2, - has_default_value=False, default_value=unicode("", "utf-8"), + has_default_value=False, default_value=_b("").decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='element', full_name='ClassifElementProto.element', index=1, number=2, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], @@ -657,19 +749,21 @@ _CLASSIFELEMENTPROTO = descriptor.Descriptor( options=None, is_extendable=False, extension_ranges=[], - serialized_start=1288, - serialized_end=1359, + oneofs=[ + ], + serialized_start=1412, + serialized_end=1483, ) -_CONTAINERPROTO = descriptor.Descriptor( +_CONTAINERPROTO = _descriptor.Descriptor( name='ContainerProto', full_name='ContainerProto', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ - descriptor.FieldDescriptor( + _descriptor.FieldDescriptor( name='cont', full_name='ContainerProto.cont', index=0, number=1, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], @@ -685,8 +779,10 @@ _CONTAINERPROTO = descriptor.Descriptor( options=None, is_extendable=False, extension_ranges=[], - serialized_start=1361, - serialized_end=1413, + oneofs=[ + ], + serialized_start=1485, + serialized_end=1537, ) _LINERULEPROTO.fields_by_name['dashdot'].message_type = _DASHDOTPROTO @@ -709,6 +805,7 @@ _DRAWELEMENTPROTO.fields_by_name['symbol'].message_type = _SYMBOLRULEPROTO _DRAWELEMENTPROTO.fields_by_name['caption'].message_type = _CAPTIONRULEPROTO _DRAWELEMENTPROTO.fields_by_name['circle'].message_type = _CIRCLERULEPROTO _DRAWELEMENTPROTO.fields_by_name['path_text'].message_type = _PATHTEXTRULEPROTO +_DRAWELEMENTPROTO.fields_by_name['shield'].message_type = _SHIELDRULEPROTO _CLASSIFELEMENTPROTO.fields_by_name['element'].message_type = _DRAWELEMENTPROTO _CONTAINERPROTO.fields_by_name['cont'].message_type = _CLASSIFELEMENTPROTO DESCRIPTOR.message_types_by_name['DashDotProto'] = _DASHDOTPROTO @@ -721,86 +818,112 @@ DESCRIPTOR.message_types_by_name['CaptionDefProto'] = _CAPTIONDEFPROTO DESCRIPTOR.message_types_by_name['CaptionRuleProto'] = _CAPTIONRULEPROTO DESCRIPTOR.message_types_by_name['CircleRuleProto'] = _CIRCLERULEPROTO DESCRIPTOR.message_types_by_name['PathTextRuleProto'] = _PATHTEXTRULEPROTO +DESCRIPTOR.message_types_by_name['ShieldRuleProto'] = _SHIELDRULEPROTO DESCRIPTOR.message_types_by_name['DrawElementProto'] = _DRAWELEMENTPROTO DESCRIPTOR.message_types_by_name['ClassifElementProto'] = _CLASSIFELEMENTPROTO DESCRIPTOR.message_types_by_name['ContainerProto'] = _CONTAINERPROTO +DESCRIPTOR.enum_types_by_name['LineJoin'] = _LINEJOIN +DESCRIPTOR.enum_types_by_name['LineCap'] = _LINECAP -class DashDotProto(message.Message): - __metaclass__ = reflection.GeneratedProtocolMessageType - DESCRIPTOR = _DASHDOTPROTO - +DashDotProto = _reflection.GeneratedProtocolMessageType('DashDotProto', (_message.Message,), dict( + DESCRIPTOR = _DASHDOTPROTO, + __module__ = 'drules_struct_pb2' # @@protoc_insertion_point(class_scope:DashDotProto) + )) +_sym_db.RegisterMessage(DashDotProto) -class PathSymProto(message.Message): - __metaclass__ = reflection.GeneratedProtocolMessageType - DESCRIPTOR = _PATHSYMPROTO - +PathSymProto = _reflection.GeneratedProtocolMessageType('PathSymProto', (_message.Message,), dict( + DESCRIPTOR = _PATHSYMPROTO, + __module__ = 'drules_struct_pb2' # @@protoc_insertion_point(class_scope:PathSymProto) + )) +_sym_db.RegisterMessage(PathSymProto) -class LineRuleProto(message.Message): - __metaclass__ = reflection.GeneratedProtocolMessageType - DESCRIPTOR = _LINERULEPROTO - +LineRuleProto = _reflection.GeneratedProtocolMessageType('LineRuleProto', (_message.Message,), dict( + DESCRIPTOR = _LINERULEPROTO, + __module__ = 'drules_struct_pb2' # @@protoc_insertion_point(class_scope:LineRuleProto) + )) +_sym_db.RegisterMessage(LineRuleProto) -class LineDefProto(message.Message): - __metaclass__ = reflection.GeneratedProtocolMessageType - DESCRIPTOR = _LINEDEFPROTO - +LineDefProto = _reflection.GeneratedProtocolMessageType('LineDefProto', (_message.Message,), dict( + DESCRIPTOR = _LINEDEFPROTO, + __module__ = 'drules_struct_pb2' # @@protoc_insertion_point(class_scope:LineDefProto) + )) +_sym_db.RegisterMessage(LineDefProto) -class AreaRuleProto(message.Message): - __metaclass__ = reflection.GeneratedProtocolMessageType - DESCRIPTOR = _AREARULEPROTO - +AreaRuleProto = _reflection.GeneratedProtocolMessageType('AreaRuleProto', (_message.Message,), dict( + DESCRIPTOR = _AREARULEPROTO, + __module__ = 'drules_struct_pb2' # @@protoc_insertion_point(class_scope:AreaRuleProto) + )) +_sym_db.RegisterMessage(AreaRuleProto) -class SymbolRuleProto(message.Message): - __metaclass__ = reflection.GeneratedProtocolMessageType - DESCRIPTOR = _SYMBOLRULEPROTO - +SymbolRuleProto = _reflection.GeneratedProtocolMessageType('SymbolRuleProto', (_message.Message,), dict( + DESCRIPTOR = _SYMBOLRULEPROTO, + __module__ = 'drules_struct_pb2' # @@protoc_insertion_point(class_scope:SymbolRuleProto) + )) +_sym_db.RegisterMessage(SymbolRuleProto) -class CaptionDefProto(message.Message): - __metaclass__ = reflection.GeneratedProtocolMessageType - DESCRIPTOR = _CAPTIONDEFPROTO - +CaptionDefProto = _reflection.GeneratedProtocolMessageType('CaptionDefProto', (_message.Message,), dict( + DESCRIPTOR = _CAPTIONDEFPROTO, + __module__ = 'drules_struct_pb2' # @@protoc_insertion_point(class_scope:CaptionDefProto) + )) +_sym_db.RegisterMessage(CaptionDefProto) -class CaptionRuleProto(message.Message): - __metaclass__ = reflection.GeneratedProtocolMessageType - DESCRIPTOR = _CAPTIONRULEPROTO - +CaptionRuleProto = _reflection.GeneratedProtocolMessageType('CaptionRuleProto', (_message.Message,), dict( + DESCRIPTOR = _CAPTIONRULEPROTO, + __module__ = 'drules_struct_pb2' # @@protoc_insertion_point(class_scope:CaptionRuleProto) + )) +_sym_db.RegisterMessage(CaptionRuleProto) -class CircleRuleProto(message.Message): - __metaclass__ = reflection.GeneratedProtocolMessageType - DESCRIPTOR = _CIRCLERULEPROTO - +CircleRuleProto = _reflection.GeneratedProtocolMessageType('CircleRuleProto', (_message.Message,), dict( + DESCRIPTOR = _CIRCLERULEPROTO, + __module__ = 'drules_struct_pb2' # @@protoc_insertion_point(class_scope:CircleRuleProto) + )) +_sym_db.RegisterMessage(CircleRuleProto) -class PathTextRuleProto(message.Message): - __metaclass__ = reflection.GeneratedProtocolMessageType - DESCRIPTOR = _PATHTEXTRULEPROTO - +PathTextRuleProto = _reflection.GeneratedProtocolMessageType('PathTextRuleProto', (_message.Message,), dict( + DESCRIPTOR = _PATHTEXTRULEPROTO, + __module__ = 'drules_struct_pb2' # @@protoc_insertion_point(class_scope:PathTextRuleProto) + )) +_sym_db.RegisterMessage(PathTextRuleProto) -class DrawElementProto(message.Message): - __metaclass__ = reflection.GeneratedProtocolMessageType - DESCRIPTOR = _DRAWELEMENTPROTO - +ShieldRuleProto = _reflection.GeneratedProtocolMessageType('ShieldRuleProto', (_message.Message,), dict( + DESCRIPTOR = _SHIELDRULEPROTO, + __module__ = 'drules_struct_pb2' + # @@protoc_insertion_point(class_scope:ShieldRuleProto) + )) +_sym_db.RegisterMessage(ShieldRuleProto) + +DrawElementProto = _reflection.GeneratedProtocolMessageType('DrawElementProto', (_message.Message,), dict( + DESCRIPTOR = _DRAWELEMENTPROTO, + __module__ = 'drules_struct_pb2' # @@protoc_insertion_point(class_scope:DrawElementProto) + )) +_sym_db.RegisterMessage(DrawElementProto) -class ClassifElementProto(message.Message): - __metaclass__ = reflection.GeneratedProtocolMessageType - DESCRIPTOR = _CLASSIFELEMENTPROTO - +ClassifElementProto = _reflection.GeneratedProtocolMessageType('ClassifElementProto', (_message.Message,), dict( + DESCRIPTOR = _CLASSIFELEMENTPROTO, + __module__ = 'drules_struct_pb2' # @@protoc_insertion_point(class_scope:ClassifElementProto) + )) +_sym_db.RegisterMessage(ClassifElementProto) -class ContainerProto(message.Message): - __metaclass__ = reflection.GeneratedProtocolMessageType - DESCRIPTOR = _CONTAINERPROTO - +ContainerProto = _reflection.GeneratedProtocolMessageType('ContainerProto', (_message.Message,), dict( + DESCRIPTOR = _CONTAINERPROTO, + __module__ = 'drules_struct_pb2' # @@protoc_insertion_point(class_scope:ContainerProto) + )) +_sym_db.RegisterMessage(ContainerProto) + +DESCRIPTOR.has_options = True +DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('H\003')) # @@protoc_insertion_point(module_scope) diff --git a/tools/unix/generate_proto.sh b/tools/unix/generate_proto.sh new file mode 100755 index 0000000000..0eb334b5b1 --- /dev/null +++ b/tools/unix/generate_proto.sh @@ -0,0 +1,33 @@ +#!/bin/bash +set -e -u -x + +MY_PATH=`pwd` + +cd ../.. + +rm indexer/drules_struct.pb.* || true +rm tools/python/stylesheet/drules_struct_pb2.* || true +rm tools/kothic/drules_struct_pb2.* || true + +protoc --proto_path=indexer --cpp_out=indexer indexer/drules_struct.proto +if [ $? -ne 0 ]; then + echo "Error" + exit 1 # error +fi + +protoc --proto_path=indexer --python_out=./tools/python/stylesheet indexer/drules_struct.proto +if [ $? -ne 0 ]; then + echo "Error" + exit 1 # error +fi + +protoc --proto_path=indexer --python_out=./tools/kothic indexer/drules_struct.proto +if [ $? -ne 0 ]; then + echo "Error" + exit 1 # error +fi + +cd $MY_PATH + +echo "Done" +exit 0 # ok