diff --git a/src/drules_struct_pb2.py b/src/drules_struct_pb2.py index de4f8b6..ac627d0 100644 --- a/src/drules_struct_pb2.py +++ b/src/drules_struct_pb2.py @@ -1,5 +1,5 @@ # Generated by the protocol buffer compiler. DO NOT EDIT! -# source: drules_struct.proto +# source: indexer/drules_struct.proto import sys _b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1')) @@ -17,11 +17,11 @@ _sym_db = _symbol_database.Default() DESCRIPTOR = _descriptor.FileDescriptor( - name='drules_struct.proto', + name='indexer/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\"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') + syntax='proto3', + serialized_pb=_b('\n\x1bindexer/drules_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 \x01(\t\x12\x0c\n\x04step\x18\x02 \x01(\x01\x12\x0e\n\x06offset\x18\x03 \x01(\x01\"\xaf\x01\n\rLineRuleProto\x12\r\n\x05width\x18\x01 \x01(\x01\x12\r\n\x05\x63olor\x18\x02 \x01(\r\x12\x1e\n\x07\x64\x61shdot\x18\x03 \x01(\x0b\x32\r.DashDotProto\x12\x10\n\x08priority\x18\x04 \x01(\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 \x01(\x01\x12\r\n\x05\x63olor\x18\x02 \x01(\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 \x01(\r\x12\x1d\n\x06\x62order\x18\x02 \x01(\x0b\x32\r.LineDefProto\x12\x10\n\x08priority\x18\x03 \x01(\x05\"_\n\x0fSymbolRuleProto\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x16\n\x0e\x61pply_for_type\x18\x02 \x01(\x05\x12\x10\n\x08priority\x18\x03 \x01(\x05\x12\x14\n\x0cmin_distance\x18\x04 \x01(\x05\"\x8d\x01\n\x0f\x43\x61ptionDefProto\x12\x0e\n\x06height\x18\x01 \x01(\x05\x12\r\n\x05\x63olor\x18\x02 \x01(\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 \x01(\x0b\x32\x10.CaptionDefProto\x12#\n\tsecondary\x18\x02 \x01(\x0b\x32\x10.CaptionDefProto\x12\x10\n\x08priority\x18\x03 \x01(\x05\"a\n\x0f\x43ircleRuleProto\x12\x0e\n\x06radius\x18\x01 \x01(\x01\x12\r\n\x05\x63olor\x18\x02 \x01(\r\x12\x1d\n\x06\x62order\x18\x03 \x01(\x0b\x32\r.LineDefProto\x12\x10\n\x08priority\x18\x04 \x01(\x05\"m\n\x11PathTextRuleProto\x12!\n\x07primary\x18\x01 \x01(\x0b\x32\x10.CaptionDefProto\x12#\n\tsecondary\x18\x02 \x01(\x0b\x32\x10.CaptionDefProto\x12\x10\n\x08priority\x18\x03 \x01(\x05\"\x9d\x01\n\x0fShieldRuleProto\x12\x0e\n\x06height\x18\x01 \x01(\x05\x12\r\n\x05\x63olor\x18\x02 \x01(\r\x12\x14\n\x0cstroke_color\x18\x03 \x01(\r\x12\x10\n\x08priority\x18\x04 \x01(\x05\x12\x14\n\x0cmin_distance\x18\x05 \x01(\x05\x12\x12\n\ntext_color\x18\x06 \x01(\r\x12\x19\n\x11text_stroke_color\x18\x07 \x01(\r\"\xa1\x02\n\x10\x44rawElementProto\x12\r\n\x05scale\x18\x01 \x01(\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 \x01(\t\x12\"\n\x07\x65lement\x18\x02 \x03(\x0b\x32\x11.DrawElementProto\"F\n\x11\x43olorElementProto\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\r\n\x05\x63olor\x18\x02 \x01(\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\x62\x06proto3') ) -_sym_db.RegisterFileDescriptor(DESCRIPTOR) _LINEJOIN = _descriptor.EnumDescriptor( name='LineJoin', @@ -44,8 +44,8 @@ _LINEJOIN = _descriptor.EnumDescriptor( ], containing_type=None, options=None, - serialized_start=1851, - serialized_end=1903, + serialized_start=1859, + serialized_end=1911, ) _sym_db.RegisterEnumDescriptor(_LINEJOIN) @@ -71,8 +71,8 @@ _LINECAP = _descriptor.EnumDescriptor( ], containing_type=None, options=None, - serialized_start=1905, - serialized_end=1956, + serialized_start=1913, + serialized_end=1964, ) _sym_db.RegisterEnumDescriptor(_LINECAP) @@ -103,7 +103,7 @@ _DASHDOTPROTO = _descriptor.Descriptor( _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, + has_default_value=False, default_value=float(0), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), @@ -115,11 +115,12 @@ _DASHDOTPROTO = _descriptor.Descriptor( ], options=None, is_extendable=False, + syntax='proto3', extension_ranges=[], oneofs=[ ], - serialized_start=23, - serialized_end=65, + serialized_start=31, + serialized_end=73, ) @@ -132,22 +133,22 @@ _PATHSYMPROTO = _descriptor.Descriptor( fields=[ _descriptor.FieldDescriptor( name='name', full_name='PathSymProto.name', index=0, - number=1, type=9, cpp_type=9, label=2, + number=1, type=9, cpp_type=9, label=1, 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, + number=2, type=1, cpp_type=5, label=1, + has_default_value=False, default_value=float(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, + has_default_value=False, default_value=float(0), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), @@ -159,11 +160,12 @@ _PATHSYMPROTO = _descriptor.Descriptor( ], options=None, is_extendable=False, + syntax='proto3', extension_ranges=[], oneofs=[ ], - serialized_start=67, - serialized_end=125, + serialized_start=75, + serialized_end=133, ) @@ -176,14 +178,14 @@ _LINERULEPROTO = _descriptor.Descriptor( fields=[ _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, + number=1, type=1, cpp_type=5, label=1, + has_default_value=False, default_value=float(0), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( name='color', full_name='LineRuleProto.color', index=1, - number=2, type=13, cpp_type=3, label=2, + number=2, 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, @@ -197,7 +199,7 @@ _LINERULEPROTO = _descriptor.Descriptor( options=None), _descriptor.FieldDescriptor( name='priority', full_name='LineRuleProto.priority', index=3, - number=4, type=5, cpp_type=1, label=2, + 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, @@ -231,11 +233,12 @@ _LINERULEPROTO = _descriptor.Descriptor( ], options=None, is_extendable=False, + syntax='proto3', extension_ranges=[], oneofs=[ ], - serialized_start=128, - serialized_end=303, + serialized_start=136, + serialized_end=311, ) @@ -248,14 +251,14 @@ _LINEDEFPROTO = _descriptor.Descriptor( fields=[ _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, + number=1, type=1, cpp_type=5, label=1, + has_default_value=False, default_value=float(0), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( name='color', full_name='LineDefProto.color', index=1, - number=2, type=13, cpp_type=3, label=2, + number=2, 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, @@ -296,11 +299,12 @@ _LINEDEFPROTO = _descriptor.Descriptor( ], options=None, is_extendable=False, + syntax='proto3', extension_ranges=[], oneofs=[ ], - serialized_start=306, - serialized_end=462, + serialized_start=314, + serialized_end=470, ) @@ -313,7 +317,7 @@ _AREARULEPROTO = _descriptor.Descriptor( fields=[ _descriptor.FieldDescriptor( name='color', full_name='AreaRuleProto.color', index=0, - number=1, type=13, cpp_type=3, label=2, + number=1, 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, @@ -327,7 +331,7 @@ _AREARULEPROTO = _descriptor.Descriptor( options=None), _descriptor.FieldDescriptor( name='priority', full_name='AreaRuleProto.priority', index=2, - number=3, type=5, cpp_type=1, label=2, + number=3, type=5, cpp_type=1, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, @@ -340,11 +344,12 @@ _AREARULEPROTO = _descriptor.Descriptor( ], options=None, is_extendable=False, + syntax='proto3', extension_ranges=[], oneofs=[ ], - serialized_start=464, - serialized_end=543, + serialized_start=472, + serialized_end=551, ) @@ -357,7 +362,7 @@ _SYMBOLRULEPROTO = _descriptor.Descriptor( fields=[ _descriptor.FieldDescriptor( name='name', full_name='SymbolRuleProto.name', index=0, - number=1, type=9, cpp_type=9, label=2, + number=1, type=9, cpp_type=9, label=1, 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, @@ -371,7 +376,7 @@ _SYMBOLRULEPROTO = _descriptor.Descriptor( options=None), _descriptor.FieldDescriptor( name='priority', full_name='SymbolRuleProto.priority', index=2, - number=3, type=5, cpp_type=1, label=2, + number=3, type=5, cpp_type=1, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, @@ -391,11 +396,12 @@ _SYMBOLRULEPROTO = _descriptor.Descriptor( ], options=None, is_extendable=False, + syntax='proto3', extension_ranges=[], oneofs=[ ], - serialized_start=545, - serialized_end=640, + serialized_start=553, + serialized_end=648, ) @@ -408,14 +414,14 @@ _CAPTIONDEFPROTO = _descriptor.Descriptor( fields=[ _descriptor.FieldDescriptor( name='height', full_name='CaptionDefProto.height', index=0, - number=1, type=5, cpp_type=1, label=2, + number=1, 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( name='color', full_name='CaptionDefProto.color', index=1, - number=2, type=13, cpp_type=3, label=2, + number=2, 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, @@ -463,11 +469,12 @@ _CAPTIONDEFPROTO = _descriptor.Descriptor( ], options=None, is_extendable=False, + syntax='proto3', extension_ranges=[], oneofs=[ ], - serialized_start=643, - serialized_end=784, + serialized_start=651, + serialized_end=792, ) @@ -480,7 +487,7 @@ _CAPTIONRULEPROTO = _descriptor.Descriptor( fields=[ _descriptor.FieldDescriptor( name='primary', full_name='CaptionRuleProto.primary', index=0, - number=1, type=11, cpp_type=10, label=2, + number=1, 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, @@ -494,7 +501,7 @@ _CAPTIONRULEPROTO = _descriptor.Descriptor( options=None), _descriptor.FieldDescriptor( name='priority', full_name='CaptionRuleProto.priority', index=2, - number=3, type=5, cpp_type=1, label=2, + number=3, type=5, cpp_type=1, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, @@ -507,11 +514,12 @@ _CAPTIONRULEPROTO = _descriptor.Descriptor( ], options=None, is_extendable=False, + syntax='proto3', extension_ranges=[], oneofs=[ ], - serialized_start=786, - serialized_end=894, + serialized_start=794, + serialized_end=902, ) @@ -524,14 +532,14 @@ _CIRCLERULEPROTO = _descriptor.Descriptor( fields=[ _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, + number=1, type=1, cpp_type=5, label=1, + has_default_value=False, default_value=float(0), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( name='color', full_name='CircleRuleProto.color', index=1, - number=2, type=13, cpp_type=3, label=2, + number=2, 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, @@ -545,7 +553,7 @@ _CIRCLERULEPROTO = _descriptor.Descriptor( options=None), _descriptor.FieldDescriptor( name='priority', full_name='CircleRuleProto.priority', index=3, - number=4, type=5, cpp_type=1, label=2, + 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, @@ -558,11 +566,12 @@ _CIRCLERULEPROTO = _descriptor.Descriptor( ], options=None, is_extendable=False, + syntax='proto3', extension_ranges=[], oneofs=[ ], - serialized_start=896, - serialized_end=993, + serialized_start=904, + serialized_end=1001, ) @@ -575,7 +584,7 @@ _PATHTEXTRULEPROTO = _descriptor.Descriptor( fields=[ _descriptor.FieldDescriptor( name='primary', full_name='PathTextRuleProto.primary', index=0, - number=1, type=11, cpp_type=10, label=2, + number=1, 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, @@ -589,7 +598,7 @@ _PATHTEXTRULEPROTO = _descriptor.Descriptor( options=None), _descriptor.FieldDescriptor( name='priority', full_name='PathTextRuleProto.priority', index=2, - number=3, type=5, cpp_type=1, label=2, + number=3, type=5, cpp_type=1, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, @@ -602,11 +611,12 @@ _PATHTEXTRULEPROTO = _descriptor.Descriptor( ], options=None, is_extendable=False, + syntax='proto3', extension_ranges=[], oneofs=[ ], - serialized_start=995, - serialized_end=1104, + serialized_start=1003, + serialized_end=1112, ) @@ -619,14 +629,14 @@ _SHIELDRULEPROTO = _descriptor.Descriptor( fields=[ _descriptor.FieldDescriptor( name='height', full_name='ShieldRuleProto.height', index=0, - number=1, type=5, cpp_type=1, label=2, + number=1, 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( name='color', full_name='ShieldRuleProto.color', index=1, - number=2, type=13, cpp_type=3, label=2, + number=2, 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, @@ -640,7 +650,7 @@ _SHIELDRULEPROTO = _descriptor.Descriptor( options=None), _descriptor.FieldDescriptor( name='priority', full_name='ShieldRuleProto.priority', index=3, - number=4, type=5, cpp_type=1, label=2, + 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, @@ -654,7 +664,7 @@ _SHIELDRULEPROTO = _descriptor.Descriptor( options=None), _descriptor.FieldDescriptor( name='text_color', full_name='ShieldRuleProto.text_color', index=5, - number=6, type=13, cpp_type=3, label=2, + number=6, 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, @@ -674,11 +684,12 @@ _SHIELDRULEPROTO = _descriptor.Descriptor( ], options=None, is_extendable=False, + syntax='proto3', extension_ranges=[], oneofs=[ ], - serialized_start=1107, - serialized_end=1264, + serialized_start=1115, + serialized_end=1272, ) @@ -691,7 +702,7 @@ _DRAWELEMENTPROTO = _descriptor.Descriptor( fields=[ _descriptor.FieldDescriptor( name='scale', full_name='DrawElementProto.scale', index=0, - number=1, type=5, cpp_type=1, label=2, + number=1, 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, @@ -760,11 +771,12 @@ _DRAWELEMENTPROTO = _descriptor.Descriptor( ], options=None, is_extendable=False, + syntax='proto3', extension_ranges=[], oneofs=[ ], - serialized_start=1267, - serialized_end=1556, + serialized_start=1275, + serialized_end=1564, ) @@ -777,7 +789,7 @@ _CLASSIFELEMENTPROTO = _descriptor.Descriptor( fields=[ _descriptor.FieldDescriptor( name='name', full_name='ClassifElementProto.name', index=0, - number=1, type=9, cpp_type=9, label=2, + number=1, type=9, cpp_type=9, label=1, 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, @@ -797,11 +809,12 @@ _CLASSIFELEMENTPROTO = _descriptor.Descriptor( ], options=None, is_extendable=False, + syntax='proto3', extension_ranges=[], oneofs=[ ], - serialized_start=1558, - serialized_end=1629, + serialized_start=1566, + serialized_end=1637, ) @@ -814,14 +827,14 @@ _COLORELEMENTPROTO = _descriptor.Descriptor( fields=[ _descriptor.FieldDescriptor( name='name', full_name='ColorElementProto.name', index=0, - number=1, type=9, cpp_type=9, label=2, + number=1, type=9, cpp_type=9, label=1, 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='color', full_name='ColorElementProto.color', index=1, - number=2, type=13, cpp_type=3, label=2, + number=2, 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, @@ -829,14 +842,14 @@ _COLORELEMENTPROTO = _descriptor.Descriptor( _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, + has_default_value=False, default_value=float(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, + has_default_value=False, default_value=float(0), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), @@ -848,11 +861,12 @@ _COLORELEMENTPROTO = _descriptor.Descriptor( ], options=None, is_extendable=False, + syntax='proto3', extension_ranges=[], oneofs=[ ], - serialized_start=1631, - serialized_end=1701, + serialized_start=1639, + serialized_end=1709, ) @@ -878,11 +892,12 @@ _COLORSELEMENTPROTO = _descriptor.Descriptor( ], options=None, is_extendable=False, + syntax='proto3', extension_ranges=[], oneofs=[ ], - serialized_start=1703, - serialized_end=1758, + serialized_start=1711, + serialized_end=1766, ) @@ -915,11 +930,12 @@ _CONTAINERPROTO = _descriptor.Descriptor( ], options=None, is_extendable=False, + syntax='proto3', extension_ranges=[], oneofs=[ ], - serialized_start=1760, - serialized_end=1849, + serialized_start=1768, + serialized_end=1857, ) _LINERULEPROTO.fields_by_name['dashdot'].message_type = _DASHDOTPROTO @@ -965,115 +981,116 @@ DESCRIPTOR.message_types_by_name['ColorsElementProto'] = _COLORSELEMENTPROTO DESCRIPTOR.message_types_by_name['ContainerProto'] = _CONTAINERPROTO DESCRIPTOR.enum_types_by_name['LineJoin'] = _LINEJOIN DESCRIPTOR.enum_types_by_name['LineCap'] = _LINECAP +_sym_db.RegisterFileDescriptor(DESCRIPTOR) DashDotProto = _reflection.GeneratedProtocolMessageType('DashDotProto', (_message.Message,), dict( DESCRIPTOR = _DASHDOTPROTO, - __module__ = 'drules_struct_pb2' + __module__ = 'indexer.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' + __module__ = 'indexer.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' + __module__ = 'indexer.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' + __module__ = 'indexer.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' + __module__ = 'indexer.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' + __module__ = 'indexer.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' + __module__ = 'indexer.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' + __module__ = 'indexer.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' + __module__ = 'indexer.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' + __module__ = 'indexer.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' + __module__ = 'indexer.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' + __module__ = 'indexer.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' + __module__ = 'indexer.drules_struct_pb2' # @@protoc_insertion_point(class_scope:ClassifElementProto) )) _sym_db.RegisterMessage(ClassifElementProto) ColorElementProto = _reflection.GeneratedProtocolMessageType('ColorElementProto', (_message.Message,), dict( DESCRIPTOR = _COLORELEMENTPROTO, - __module__ = 'drules_struct_pb2' + __module__ = 'indexer.drules_struct_pb2' # @@protoc_insertion_point(class_scope:ColorElementProto) )) _sym_db.RegisterMessage(ColorElementProto) ColorsElementProto = _reflection.GeneratedProtocolMessageType('ColorsElementProto', (_message.Message,), dict( DESCRIPTOR = _COLORSELEMENTPROTO, - __module__ = 'drules_struct_pb2' + __module__ = 'indexer.drules_struct_pb2' # @@protoc_insertion_point(class_scope:ColorsElementProto) )) _sym_db.RegisterMessage(ColorsElementProto) ContainerProto = _reflection.GeneratedProtocolMessageType('ContainerProto', (_message.Message,), dict( DESCRIPTOR = _CONTAINERPROTO, - __module__ = 'drules_struct_pb2' + __module__ = 'indexer.drules_struct_pb2' # @@protoc_insertion_point(class_scope:ContainerProto) )) _sym_db.RegisterMessage(ContainerProto) diff --git a/src/libkomwm.py b/src/libkomwm.py index b783e0e..a9407ac 100644 --- a/src/libkomwm.py +++ b/src/libkomwm.py @@ -454,6 +454,8 @@ def komap_mapswithme(options): is_valid, value = to_boolean(sp.get('text-optional', '')) if is_valid: dr_cur_subtext.is_optional = value + else: + dr_cur_subtext.is_optional = True has_text.pop() if '-x-me-text-priority' in st: dr_text.priority = int(st.get('-x-me-text-priority'))