diff --git a/src/iscs_graphic_data.proto b/src/iscs_graphic_data.proto index 285244e..c491a5f 100644 --- a/src/iscs_graphic_data.proto +++ b/src/iscs_graphic_data.proto @@ -20,6 +20,7 @@ message CommonGraphicStorage { repeated Rect rects = 3; repeated Line lines = 4; repeated Circle circles = 5; + repeated Button buttons = 6; } message Arrow { @@ -70,16 +71,24 @@ message Circle { float alpha = 8; } -//CCTV按钮 -message CCTVButton { +message Button { enum ButtonType { - rect = 0; - monitor = 1; //监控样子的按钮 - semicircle = 2; //半圆样子的按钮 + noIcon = 0;//没有Icon + cctvRect = 1;//监控方形 + cctvMonitor = 2; //监控样子的按钮 + cctvSemicircle = 3; //半圆样子的按钮 } common.CommonInfo common = 1; string code = 2; - ButtonType buttonType = 3; + string codeColor = 3; + int32 codeFontSize = 4; + string belongSubMenu = 5;//所属ISCS子菜单 + ButtonType buttonType = 6;//类似icon + float width = 7; //宽度 + float height = 8; //高度 + int32 radius = 9; //圆角半径_可变圆 + string fillColor = 10; // 填充色 + float alpha = 11; // 透明度 } //手动报警按钮 @@ -117,7 +126,6 @@ message CCTVOfStationControlStorage { string stationName = 1; common.Canvas canvas = 2; CommonGraphicStorage commonGraphicStorage = 3; - repeated CCTVButton cctvButtons = 4; } message FASOfPlatformAlarmStorage {