From f33749551cded1f81ddef7aabc4be9e5b75af8f3 Mon Sep 17 00:00:00 2001 From: joylink_zhaoerwei Date: Fri, 17 Nov 2023 16:53:35 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=9B=86=E4=B8=AD?= =?UTF-8?q?=E7=AB=99=E7=AE=A1=E7=90=86=E7=9A=84=E8=BD=A6=E7=AB=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/stationLayoutGraphics.proto | 1 + 1 file changed, 1 insertion(+) diff --git a/protos/stationLayoutGraphics.proto b/protos/stationLayoutGraphics.proto index 70244a5..c7ba984 100644 --- a/protos/stationLayoutGraphics.proto +++ b/protos/stationLayoutGraphics.proto @@ -166,6 +166,7 @@ message Station { string stationName = 9; //车站名 string stationNameAcronym = 10; // 车站名缩写 bool depots = 11; //是否车辆段 + repeated string manageStations = 12; // 如果是集中站——管理的车站-id } message TrainWindow { From 9f81f7f60b336d0ad16549545ce14d457fb5b2c4 Mon Sep 17 00:00:00 2001 From: dong <58670809@qq.com> Date: Mon, 20 Nov 2023 15:16:29 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=88=97=E8=BD=A6=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/stationLayoutGraphics.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/protos/stationLayoutGraphics.proto b/protos/stationLayoutGraphics.proto index c7ba984..a584b3b 100644 --- a/protos/stationLayoutGraphics.proto +++ b/protos/stationLayoutGraphics.proto @@ -12,7 +12,7 @@ message RtssGraphicStorage { repeated Platform Platforms = 4; repeated Station stations = 5; // repeated Rect rects = 6; - // repeated Train train = 7; + repeated Train train = 7; repeated Signal signals = 8; repeated Turnout turnouts = 9; repeated Section section = 10; From c9dbe041d1a46f710b32ed7f0a5f577e20fdc2bf Mon Sep 17 00:00:00 2001 From: dong <58670809@qq.com> Date: Tue, 21 Nov 2023 14:46:49 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=BF=90=E8=A1=8C?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/picture.proto | 2 ++ 1 file changed, 2 insertions(+) diff --git a/protos/picture.proto b/protos/picture.proto index b21b4e1..ef3b28c 100644 --- a/protos/picture.proto +++ b/protos/picture.proto @@ -11,4 +11,6 @@ enum PictureType { RelayCabinetLayout = 2; /** IBP盘 */ IBP = 3; + /** 运行数据 */ + RunData= 4; } From 6f4ba349bcfc4a5b47afcbf0ac1a7a1ed6447a2a Mon Sep 17 00:00:00 2001 From: dong <58670809@qq.com> Date: Tue, 21 Nov 2023 14:48:17 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/picture.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/protos/picture.proto b/protos/picture.proto index ef3b28c..647505f 100644 --- a/protos/picture.proto +++ b/protos/picture.proto @@ -12,5 +12,5 @@ enum PictureType { /** IBP盘 */ IBP = 3; /** 运行数据 */ - RunData= 4; + RunData = 4; } From 2eb395a90c8a7c72e50a1d55cb099ae4fcac322f Mon Sep 17 00:00:00 2001 From: dong <58670809@qq.com> Date: Tue, 21 Nov 2023 14:49:42 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/picture.proto | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/protos/picture.proto b/protos/picture.proto index 647505f..1c8a068 100644 --- a/protos/picture.proto +++ b/protos/picture.proto @@ -11,6 +11,6 @@ enum PictureType { RelayCabinetLayout = 2; /** IBP盘 */ IBP = 3; - /** 运行数据 */ - RunData = 4; + /** 列车数据 */ + TrainData = 4; } From e530b21a10f13096f688e3e1a02d7a3718e35d45 Mon Sep 17 00:00:00 2001 From: Yuan Date: Tue, 21 Nov 2023 15:15:26 +0800 Subject: [PATCH 6/7] =?UTF-8?q?ibp=E8=BD=A6=E7=AB=99=E6=96=87=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/ibpGraphics.proto | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/protos/ibpGraphics.proto b/protos/ibpGraphics.proto index 486cf5a..ec444f2 100644 --- a/protos/ibpGraphics.proto +++ b/protos/ibpGraphics.proto @@ -13,6 +13,7 @@ message IBPGraphicStorage { // UniqueIdType UniqueIdPrefix = 7; repeated IbpRelatedDevice ibpRelatedDevices = 8; repeated IbpLight ibpLights = 9; + repeated IbpStationText ibpStationTexts = 10; } message IBPButton { @@ -73,3 +74,21 @@ message IbpRelatedDevice { repeated graphicData.DeviceCombinationtype combinationtypes = 2; //组合类型 // graphicData.RelatedRef.DeviceType deviceType = 3; //设备类型 } + +message IbpStationText { + enum IbpStationTextType { + CURRENT = 0; + UP = 1; + DOWN = 2; + } + enum IbpStationTextAlign { + LEFT = 0; + RIGHT = 1; + CENTER = 2; + } + graphicData.CommonInfo common = 1; + IbpStationTextType type = 2; + string color = 4; + int32 fontSize = 5; + IbpStationTextAlign align = 6; +} From 2851f537ebd3149d831d0e066bfbffc49de8da6a Mon Sep 17 00:00:00 2001 From: xzb <223@qq.com> Date: Wed, 22 Nov 2023 13:21:39 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E6=97=A0=E6=BA=90=E5=BA=94=E7=AD=94?= =?UTF-8?q?=E5=99=A8=E5=9B=BA=E5=AE=9A=E6=8A=A5=E6=96=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/stationLayoutGraphics.proto | 1 + 1 file changed, 1 insertion(+) diff --git a/protos/stationLayoutGraphics.proto b/protos/stationLayoutGraphics.proto index 5509476..5e60d1f 100644 --- a/protos/stationLayoutGraphics.proto +++ b/protos/stationLayoutGraphics.proto @@ -336,6 +336,7 @@ message Transponder { // 应答器 KilometerSystem kilometerSystem = 5; //公里标 RelatedRef TransponderRef = 6; //关联关系 repeated string centralizedStations = 7; // 集中站列表 + string fixedTelegram = 8;//无源应答器固定报文 } message SimpleRef {