From 98119374d607fbde1f3f2c77982fdab0927d2693 Mon Sep 17 00:00:00 2001 From: "r.kuznetsov" Date: Thu, 9 Feb 2017 14:35:32 +0300 Subject: [PATCH] Updated drules --- indexer/drules_struct.pb.cc | 144 +++++++++++---- indexer/drules_struct.pb.h | 174 +++++++++++++------ indexer/drules_struct.proto | 6 +- tools/python/stylesheet/drules_struct_pb2.py | 40 +++-- 4 files changed, 262 insertions(+), 102 deletions(-) diff --git a/indexer/drules_struct.pb.cc b/indexer/drules_struct.pb.cc index b7c96ee865..34c5852614 100644 --- a/indexer/drules_struct.pb.cc +++ b/indexer/drules_struct.pb.cc @@ -4536,7 +4536,9 @@ void ClassifElementProto::Swap(ClassifElementProto* other) { #ifndef _MSC_VER const int ColorElementProto::kNameFieldNumber; -const int ColorElementProto::kValueFieldNumber; +const int ColorElementProto::kColorFieldNumber; +const int ColorElementProto::kXFieldNumber; +const int ColorElementProto::kYFieldNumber; #endif // !_MSC_VER ColorElementProto::ColorElementProto() @@ -4559,7 +4561,9 @@ void ColorElementProto::SharedCtor() { ::google::protobuf::internal::GetEmptyString(); _cached_size_ = 0; name_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - value_ = 0u; + color_ = 0u; + x_ = 0; + y_ = 0; ::memset(_has_bits_, 0, sizeof(_has_bits_)); } @@ -4601,14 +4605,28 @@ ColorElementProto* ColorElementProto::New() const { } void ColorElementProto::Clear() { - if (_has_bits_[0 / 32] & 3) { +#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) + + if (_has_bits_[0 / 32] & 15) { + ZR_(color_, y_); if (has_name()) { if (name_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { name_->clear(); } } - value_ = 0u; } + +#undef OFFSET_OF_FIELD_ +#undef ZR_ + ::memset(_has_bits_, 0, sizeof(_has_bits_)); mutable_unknown_fields()->clear(); } @@ -4635,18 +4653,48 @@ bool ColorElementProto::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(16)) goto parse_value; + if (input->ExpectTag(16)) goto parse_color; break; } - // required uint32 value = 2; + // required uint32 color = 2; case 2: { if (tag == 16) { - parse_value: + parse_color: DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>( - input, &value_))); - set_has_value(); + input, &color_))); + set_has_color(); + } else { + goto handle_unusual; + } + if (input->ExpectTag(29)) goto parse_x; + break; + } + + // optional float x = 3; + case 3: { + if (tag == 29) { + parse_x: + DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< + float, ::google::protobuf::internal::WireFormatLite::TYPE_FLOAT>( + input, &x_))); + set_has_x(); + } else { + goto handle_unusual; + } + if (input->ExpectTag(37)) goto parse_y; + break; + } + + // optional float y = 4; + case 4: { + if (tag == 37) { + parse_y: + DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< + float, ::google::protobuf::internal::WireFormatLite::TYPE_FLOAT>( + input, &y_))); + set_has_y(); } else { goto handle_unusual; } @@ -4685,9 +4733,19 @@ void ColorElementProto::SerializeWithCachedSizes( 1, this->name(), output); } - // required uint32 value = 2; - if (has_value()) { - ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->value(), output); + // required uint32 color = 2; + if (has_color()) { + ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->color(), output); + } + + // optional float x = 3; + if (has_x()) { + ::google::protobuf::internal::WireFormatLite::WriteFloat(3, this->x(), output); + } + + // optional float y = 4; + if (has_y()) { + ::google::protobuf::internal::WireFormatLite::WriteFloat(4, this->y(), output); } output->WriteRaw(unknown_fields().data(), @@ -4706,11 +4764,21 @@ int ColorElementProto::ByteSize() const { this->name()); } - // required uint32 value = 2; - if (has_value()) { + // required uint32 color = 2; + if (has_color()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::UInt32Size( - this->value()); + this->color()); + } + + // optional float x = 3; + if (has_x()) { + total_size += 1 + 4; + } + + // optional float y = 4; + if (has_y()) { + total_size += 1 + 4; } } @@ -4733,8 +4801,14 @@ void ColorElementProto::MergeFrom(const ColorElementProto& from) { if (from.has_name()) { set_name(from.name()); } - if (from.has_value()) { - set_value(from.value()); + if (from.has_color()) { + set_color(from.color()); + } + if (from.has_x()) { + set_x(from.x()); + } + if (from.has_y()) { + set_y(from.y()); } } mutable_unknown_fields()->append(from.unknown_fields()); @@ -4755,7 +4829,9 @@ bool ColorElementProto::IsInitialized() const { void ColorElementProto::Swap(ColorElementProto* other) { if (other != this) { std::swap(name_, other->name_); - std::swap(value_, other->value_); + std::swap(color_, other->color_); + std::swap(x_, other->x_); + std::swap(y_, other->y_); std::swap(_has_bits_[0], other->_has_bits_[0]); _unknown_fields_.swap(other->_unknown_fields_); std::swap(_cached_size_, other->_cached_size_); @@ -4770,7 +4846,7 @@ void ColorElementProto::Swap(ColorElementProto* other) { // =================================================================== #ifndef _MSC_VER -const int ColorsElementProto::kColorFieldNumber; +const int ColorsElementProto::kValueFieldNumber; #endif // !_MSC_VER ColorsElementProto::ColorsElementProto() @@ -4829,7 +4905,7 @@ ColorsElementProto* ColorsElementProto::New() const { } void ColorsElementProto::Clear() { - color_.Clear(); + value_.Clear(); ::memset(_has_bits_, 0, sizeof(_has_bits_)); mutable_unknown_fields()->clear(); } @@ -4848,16 +4924,16 @@ bool ColorsElementProto::MergePartialFromCodedStream( tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // repeated .ColorElementProto color = 1; + // repeated .ColorElementProto value = 1; case 1: { if (tag == 10) { - parse_color: + parse_value: DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( - input, add_color())); + input, add_value())); } else { goto handle_unusual; } - if (input->ExpectTag(10)) goto parse_color; + if (input->ExpectTag(10)) goto parse_value; if (input->ExpectAtEnd()) goto success; break; } @@ -4887,10 +4963,10 @@ failure: void ColorsElementProto::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { // @@protoc_insertion_point(serialize_start:ColorsElementProto) - // repeated .ColorElementProto color = 1; - for (int i = 0; i < this->color_size(); i++) { + // repeated .ColorElementProto value = 1; + for (int i = 0; i < this->value_size(); i++) { ::google::protobuf::internal::WireFormatLite::WriteMessage( - 1, this->color(i), output); + 1, this->value(i), output); } output->WriteRaw(unknown_fields().data(), @@ -4901,12 +4977,12 @@ void ColorsElementProto::SerializeWithCachedSizes( int ColorsElementProto::ByteSize() const { int total_size = 0; - // repeated .ColorElementProto color = 1; - total_size += 1 * this->color_size(); - for (int i = 0; i < this->color_size(); i++) { + // repeated .ColorElementProto value = 1; + total_size += 1 * this->value_size(); + for (int i = 0; i < this->value_size(); i++) { total_size += ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->color(i)); + this->value(i)); } total_size += unknown_fields().size(); @@ -4924,7 +5000,7 @@ void ColorsElementProto::CheckTypeAndMergeFrom( void ColorsElementProto::MergeFrom(const ColorsElementProto& from) { GOOGLE_CHECK_NE(&from, this); - color_.MergeFrom(from.color_); + value_.MergeFrom(from.value_); mutable_unknown_fields()->append(from.unknown_fields()); } @@ -4936,13 +5012,13 @@ void ColorsElementProto::CopyFrom(const ColorsElementProto& from) { bool ColorsElementProto::IsInitialized() const { - if (!::google::protobuf::internal::AllAreInitialized(this->color())) return false; + if (!::google::protobuf::internal::AllAreInitialized(this->value())) return false; return true; } void ColorsElementProto::Swap(ColorsElementProto* other) { if (other != this) { - color_.Swap(&other->color_); + value_.Swap(&other->value_); 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 02d6b96b30..2f43d57516 100644 --- a/indexer/drules_struct.pb.h +++ b/indexer/drules_struct.pb.h @@ -1863,26 +1863,46 @@ class ColorElementProto : public ::google::protobuf::MessageLite { inline ::std::string* release_name(); inline void set_allocated_name(::std::string* name); - // required uint32 value = 2; - inline bool has_value() const; - inline void clear_value(); - static const int kValueFieldNumber = 2; - inline ::google::protobuf::uint32 value() const; - inline void set_value(::google::protobuf::uint32 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 float x = 3; + inline bool has_x() const; + inline void clear_x(); + static const int kXFieldNumber = 3; + inline float x() const; + inline void set_x(float value); + + // optional float y = 4; + inline bool has_y() const; + inline void clear_y(); + static const int kYFieldNumber = 4; + inline float y() const; + inline void set_y(float value); // @@protoc_insertion_point(class_scope:ColorElementProto) private: inline void set_has_name(); inline void clear_has_name(); - inline void set_has_value(); - inline void clear_has_value(); + inline void set_has_color(); + inline void clear_has_color(); + inline void set_has_x(); + inline void clear_has_x(); + inline void set_has_y(); + inline void clear_has_y(); ::std::string _unknown_fields_; ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; ::std::string* name_; - ::google::protobuf::uint32 value_; + ::google::protobuf::uint32 color_; + float x_; + float y_; #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER friend void protobuf_AddDesc_drules_5fstruct_2eproto_impl(); #else @@ -1957,17 +1977,17 @@ class ColorsElementProto : public ::google::protobuf::MessageLite { // accessors ------------------------------------------------------- - // repeated .ColorElementProto color = 1; - inline int color_size() const; - inline void clear_color(); - static const int kColorFieldNumber = 1; - inline const ::ColorElementProto& color(int index) const; - inline ::ColorElementProto* mutable_color(int index); - inline ::ColorElementProto* add_color(); + // repeated .ColorElementProto value = 1; + inline int value_size() const; + inline void clear_value(); + static const int kValueFieldNumber = 1; + inline const ::ColorElementProto& value(int index) const; + inline ::ColorElementProto* mutable_value(int index); + inline ::ColorElementProto* add_value(); inline const ::google::protobuf::RepeatedPtrField< ::ColorElementProto >& - color() const; + value() const; inline ::google::protobuf::RepeatedPtrField< ::ColorElementProto >* - mutable_color(); + mutable_value(); // @@protoc_insertion_point(class_scope:ColorsElementProto) private: @@ -1976,7 +1996,7 @@ class ColorsElementProto : public ::google::protobuf::MessageLite { ::google::protobuf::uint32 _has_bits_[1]; mutable int _cached_size_; - ::google::protobuf::RepeatedPtrField< ::ColorElementProto > color_; + ::google::protobuf::RepeatedPtrField< ::ColorElementProto > value_; #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER friend void protobuf_AddDesc_drules_5fstruct_2eproto_impl(); #else @@ -4265,62 +4285,110 @@ inline void ColorElementProto::set_allocated_name(::std::string* name) { // @@protoc_insertion_point(field_set_allocated:ColorElementProto.name) } -// required uint32 value = 2; -inline bool ColorElementProto::has_value() const { +// required uint32 color = 2; +inline bool ColorElementProto::has_color() const { return (_has_bits_[0] & 0x00000002u) != 0; } -inline void ColorElementProto::set_has_value() { +inline void ColorElementProto::set_has_color() { _has_bits_[0] |= 0x00000002u; } -inline void ColorElementProto::clear_has_value() { +inline void ColorElementProto::clear_has_color() { _has_bits_[0] &= ~0x00000002u; } -inline void ColorElementProto::clear_value() { - value_ = 0u; - clear_has_value(); +inline void ColorElementProto::clear_color() { + color_ = 0u; + clear_has_color(); } -inline ::google::protobuf::uint32 ColorElementProto::value() const { - // @@protoc_insertion_point(field_get:ColorElementProto.value) - return value_; +inline ::google::protobuf::uint32 ColorElementProto::color() const { + // @@protoc_insertion_point(field_get:ColorElementProto.color) + return color_; } -inline void ColorElementProto::set_value(::google::protobuf::uint32 value) { - set_has_value(); - value_ = value; - // @@protoc_insertion_point(field_set:ColorElementProto.value) +inline void ColorElementProto::set_color(::google::protobuf::uint32 value) { + set_has_color(); + color_ = value; + // @@protoc_insertion_point(field_set:ColorElementProto.color) +} + +// optional float x = 3; +inline bool ColorElementProto::has_x() const { + return (_has_bits_[0] & 0x00000004u) != 0; +} +inline void ColorElementProto::set_has_x() { + _has_bits_[0] |= 0x00000004u; +} +inline void ColorElementProto::clear_has_x() { + _has_bits_[0] &= ~0x00000004u; +} +inline void ColorElementProto::clear_x() { + x_ = 0; + clear_has_x(); +} +inline float ColorElementProto::x() const { + // @@protoc_insertion_point(field_get:ColorElementProto.x) + return x_; +} +inline void ColorElementProto::set_x(float value) { + set_has_x(); + x_ = value; + // @@protoc_insertion_point(field_set:ColorElementProto.x) +} + +// optional float y = 4; +inline bool ColorElementProto::has_y() const { + return (_has_bits_[0] & 0x00000008u) != 0; +} +inline void ColorElementProto::set_has_y() { + _has_bits_[0] |= 0x00000008u; +} +inline void ColorElementProto::clear_has_y() { + _has_bits_[0] &= ~0x00000008u; +} +inline void ColorElementProto::clear_y() { + y_ = 0; + clear_has_y(); +} +inline float ColorElementProto::y() const { + // @@protoc_insertion_point(field_get:ColorElementProto.y) + return y_; +} +inline void ColorElementProto::set_y(float value) { + set_has_y(); + y_ = value; + // @@protoc_insertion_point(field_set:ColorElementProto.y) } // ------------------------------------------------------------------- // ColorsElementProto -// repeated .ColorElementProto color = 1; -inline int ColorsElementProto::color_size() const { - return color_.size(); +// repeated .ColorElementProto value = 1; +inline int ColorsElementProto::value_size() const { + return value_.size(); } -inline void ColorsElementProto::clear_color() { - color_.Clear(); +inline void ColorsElementProto::clear_value() { + value_.Clear(); } -inline const ::ColorElementProto& ColorsElementProto::color(int index) const { - // @@protoc_insertion_point(field_get:ColorsElementProto.color) - return color_.Get(index); +inline const ::ColorElementProto& ColorsElementProto::value(int index) const { + // @@protoc_insertion_point(field_get:ColorsElementProto.value) + return value_.Get(index); } -inline ::ColorElementProto* ColorsElementProto::mutable_color(int index) { - // @@protoc_insertion_point(field_mutable:ColorsElementProto.color) - return color_.Mutable(index); +inline ::ColorElementProto* ColorsElementProto::mutable_value(int index) { + // @@protoc_insertion_point(field_mutable:ColorsElementProto.value) + return value_.Mutable(index); } -inline ::ColorElementProto* ColorsElementProto::add_color() { - // @@protoc_insertion_point(field_add:ColorsElementProto.color) - return color_.Add(); +inline ::ColorElementProto* ColorsElementProto::add_value() { + // @@protoc_insertion_point(field_add:ColorsElementProto.value) + return value_.Add(); } inline const ::google::protobuf::RepeatedPtrField< ::ColorElementProto >& -ColorsElementProto::color() const { - // @@protoc_insertion_point(field_list:ColorsElementProto.color) - return color_; +ColorsElementProto::value() const { + // @@protoc_insertion_point(field_list:ColorsElementProto.value) + return value_; } inline ::google::protobuf::RepeatedPtrField< ::ColorElementProto >* -ColorsElementProto::mutable_color() { - // @@protoc_insertion_point(field_mutable_list:ColorsElementProto.color) - return &color_; +ColorsElementProto::mutable_value() { + // @@protoc_insertion_point(field_mutable_list:ColorsElementProto.value) + return &value_; } // ------------------------------------------------------------------- diff --git a/indexer/drules_struct.proto b/indexer/drules_struct.proto index 5fb232ddef..e9dac947c4 100644 --- a/indexer/drules_struct.proto +++ b/indexer/drules_struct.proto @@ -129,12 +129,14 @@ message ClassifElementProto message ColorElementProto { required string name = 1; - required uint32 value = 2; + required uint32 color = 2; + optional float x = 3; + optional float y = 4; } message ColorsElementProto { - repeated ColorElementProto color = 1; + repeated ColorElementProto value = 1; } message ContainerProto diff --git a/tools/python/stylesheet/drules_struct_pb2.py b/tools/python/stylesheet/drules_struct_pb2.py index 9a5cf11e11..de4f8b62d2 100644 --- a/tools/python/stylesheet/drules_struct_pb2.py +++ b/tools/python/stylesheet/drules_struct_pb2.py @@ -19,7 +19,7 @@ _sym_db = _symbol_database.Default() 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\"_\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\x12\x14\n\x0cmin_distance\x18\x04 \x01(\x05\"\x8d\x01\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\x12\x0c\n\x04text\x18\x06 \x01(\t\x12\x13\n\x0bis_optional\x18\x07 \x01(\x08\"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\"\x9d\x01\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\x12\x14\n\x0cmin_distance\x18\x05 \x01(\x05\x12\x12\n\ntext_color\x18\x06 \x02(\r\x12\x19\n\x11text_stroke_color\x18\x07 \x01(\r\"\xa1\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\x12\x10\n\x08\x61pply_if\x18\t \x03(\t\"G\n\x13\x43lassifElementProto\x12\x0c\n\x04name\x18\x01 \x02(\t\x12\"\n\x07\x65lement\x18\x02 \x03(\x0b\x32\x11.DrawElementProto\"0\n\x11\x43olorElementProto\x12\x0c\n\x04name\x18\x01 \x02(\t\x12\r\n\x05value\x18\x02 \x02(\r\"7\n\x12\x43olorsElementProto\x12!\n\x05\x63olor\x18\x01 \x03(\x0b\x32\x12.ColorElementProto\"Y\n\x0e\x43ontainerProto\x12\"\n\x04\x63ont\x18\x01 \x03(\x0b\x32\x14.ClassifElementProto\x12#\n\x06\x63olors\x18\x02 \x01(\x0b\x32\x13.ColorsElementProto*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\"_\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\x12\x14\n\x0cmin_distance\x18\x04 \x01(\x05\"\x8d\x01\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\x12\x0c\n\x04text\x18\x06 \x01(\t\x12\x13\n\x0bis_optional\x18\x07 \x01(\x08\"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\"\x9d\x01\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\x12\x14\n\x0cmin_distance\x18\x05 \x01(\x05\x12\x12\n\ntext_color\x18\x06 \x02(\r\x12\x19\n\x11text_stroke_color\x18\x07 \x01(\r\"\xa1\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\x12\x10\n\x08\x61pply_if\x18\t \x03(\t\"G\n\x13\x43lassifElementProto\x12\x0c\n\x04name\x18\x01 \x02(\t\x12\"\n\x07\x65lement\x18\x02 \x03(\x0b\x32\x11.DrawElementProto\"F\n\x11\x43olorElementProto\x12\x0c\n\x04name\x18\x01 \x02(\t\x12\r\n\x05\x63olor\x18\x02 \x02(\r\x12\t\n\x01x\x18\x03 \x01(\x02\x12\t\n\x01y\x18\x04 \x01(\x02\"7\n\x12\x43olorsElementProto\x12!\n\x05value\x18\x01 \x03(\x0b\x32\x12.ColorElementProto\"Y\n\x0e\x43ontainerProto\x12\"\n\x04\x63ont\x18\x01 \x03(\x0b\x32\x14.ClassifElementProto\x12#\n\x06\x63olors\x18\x02 \x01(\x0b\x32\x13.ColorsElementProto*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) @@ -44,8 +44,8 @@ _LINEJOIN = _descriptor.EnumDescriptor( ], containing_type=None, options=None, - serialized_start=1829, - serialized_end=1881, + serialized_start=1851, + serialized_end=1903, ) _sym_db.RegisterEnumDescriptor(_LINEJOIN) @@ -71,8 +71,8 @@ _LINECAP = _descriptor.EnumDescriptor( ], containing_type=None, options=None, - serialized_start=1883, - serialized_end=1934, + serialized_start=1905, + serialized_end=1956, ) _sym_db.RegisterEnumDescriptor(_LINECAP) @@ -820,12 +820,26 @@ _COLORELEMENTPROTO = _descriptor.Descriptor( is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='value', full_name='ColorElementProto.value', index=1, + name='color', full_name='ColorElementProto.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='x', full_name='ColorElementProto.x', index=2, + number=3, type=2, cpp_type=6, 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='y', full_name='ColorElementProto.y', index=3, + number=4, type=2, cpp_type=6, 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=[ ], @@ -838,7 +852,7 @@ _COLORELEMENTPROTO = _descriptor.Descriptor( oneofs=[ ], serialized_start=1631, - serialized_end=1679, + serialized_end=1701, ) @@ -850,7 +864,7 @@ _COLORSELEMENTPROTO = _descriptor.Descriptor( containing_type=None, fields=[ _descriptor.FieldDescriptor( - name='color', full_name='ColorsElementProto.color', index=0, + name='value', full_name='ColorsElementProto.value', index=0, number=1, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, @@ -867,8 +881,8 @@ _COLORSELEMENTPROTO = _descriptor.Descriptor( extension_ranges=[], oneofs=[ ], - serialized_start=1681, - serialized_end=1736, + serialized_start=1703, + serialized_end=1758, ) @@ -904,8 +918,8 @@ _CONTAINERPROTO = _descriptor.Descriptor( extension_ranges=[], oneofs=[ ], - serialized_start=1738, - serialized_end=1827, + serialized_start=1760, + serialized_end=1849, ) _LINERULEPROTO.fields_by_name['dashdot'].message_type = _DASHDOTPROTO @@ -930,7 +944,7 @@ _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 -_COLORSELEMENTPROTO.fields_by_name['color'].message_type = _COLORELEMENTPROTO +_COLORSELEMENTPROTO.fields_by_name['value'].message_type = _COLORELEMENTPROTO _CONTAINERPROTO.fields_by_name['cont'].message_type = _CLASSIFELEMENTPROTO _CONTAINERPROTO.fields_by_name['colors'].message_type = _COLORSELEMENTPROTO DESCRIPTOR.message_types_by_name['DashDotProto'] = _DASHDOTPROTO