diff --git a/src/cctv_graphic_data.proto b/src/cctv_graphic_data.proto index 3f99058..293e63d 100644 --- a/src/cctv_graphic_data.proto +++ b/src/cctv_graphic_data.proto @@ -8,6 +8,7 @@ message CCTVGraphicStorage { repeated CCTVButton cctvButtons = 2; repeated iscsGraphicData.Arrow arrows = 3; repeated iscsGraphicData.IscsText iscsTexts = 4; + repeated iscsGraphicData.Rect rects = 5; } diff --git a/src/fire_alarm_graphic_data.proto b/src/fire_alarm_graphic_data.proto index 28ff4c2..53ce2e7 100644 --- a/src/fire_alarm_graphic_data.proto +++ b/src/fire_alarm_graphic_data.proto @@ -7,4 +7,5 @@ message FireAlarmGraphicStorage { iscsGraphicData.Canvas canvas = 1; repeated iscsGraphicData.Arrow arrows = 2; repeated iscsGraphicData.IscsText iscsTexts = 3; + repeated iscsGraphicData.Rect rects = 4; } diff --git a/src/iscs_graphic_data.proto b/src/iscs_graphic_data.proto index a140a5f..e2df557 100644 --- a/src/iscs_graphic_data.proto +++ b/src/iscs_graphic_data.proto @@ -1,13 +1,6 @@ syntax = "proto3"; package iscsGraphicData; -message IscsGraphicStorage { - Canvas canvas = 1; - UniqueIdOfStationLayout UniqueIdPrefix = 2;//地图唯一信息 - repeated Arrow arrows = 3; - repeated IscsText iscsTexts = 4; -} - message Canvas { // 画布宽 int32 width = 1; @@ -83,3 +76,14 @@ message IscsText { string color = 4; int32 fontSize = 5; } + +message Rect { + CommonInfo common = 1; + string code = 2; + int32 lineWidth = 3; // 线宽 + string lineColor = 4; // 线色 + float width = 5; //宽度 + float height = 6; //高度 + int32 radius = 7; //圆角半径 + Point point = 8; // 画第一个点的坐标 +}