From 7435e2b169e4c30548212384cd5bc89380dee650 Mon Sep 17 00:00:00 2001 From: fan Date: Thu, 16 Nov 2023 15:51:58 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8F=91=E8=BD=A6?= =?UTF-8?q?=E8=AE=A1=E6=97=B6=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/stationLayoutGraphics.proto | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/protos/stationLayoutGraphics.proto b/protos/stationLayoutGraphics.proto index 2b99379..0d51866 100644 --- a/protos/stationLayoutGraphics.proto +++ b/protos/stationLayoutGraphics.proto @@ -42,8 +42,9 @@ message RtssGraphicStorage { repeated StationRelateDevice stationRelateDeviceList = 34; // 关联设备列表 repeated SectionCodePoint sectionCodePointList = 35; // 物理区段码位表 ScreenDoorConfig screenDoorConfig = 36;//屏蔽门的配置--子屏蔽门的数量和编组列表 - repeated Beacon beacons = 37; + repeated Beacon beacons = 37; // 信标 GenerateAxleCountingConfig generateAxleCountingConfig = 38;//一键生成计轴的配置 + repeated DepartureTimer departureTimers = 39; // 发车计时器 } message Canvas { @@ -504,6 +505,11 @@ message CalculateLink { string deviceType = 3; } } +/** 发车计时器 */ +message DepartureTimer { + CommonInfo common = 1; + string code = 2; +} message UniqueIdOfStationLayout { string city = 1;//城市 From 2f39506cf65c9b9d9c69f5d9be60f5b1693ad9a5 Mon Sep 17 00:00:00 2001 From: weizhihong Date: Thu, 16 Nov 2023 15:59:17 +0800 Subject: [PATCH 02/13] =?UTF-8?q?=E3=80=90=E5=88=97=E8=BD=A6=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/stationLayoutGraphics.proto | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/protos/stationLayoutGraphics.proto b/protos/stationLayoutGraphics.proto index 5509476..06ba229 100644 --- a/protos/stationLayoutGraphics.proto +++ b/protos/stationLayoutGraphics.proto @@ -533,3 +533,19 @@ message SectionCodePoint { string centralizedStation = 1; repeated string sectionIds = 2; //物理区段id列表 } + +// 列车信息 +message Train { + enum TrainModel { // 车型 + A = 0; + B = 1; + C = 2; + D = 3; + } + TrainModel trainModel = 1; // 车型 + int32 carriageLength = 2; // 列车车厢长度 + int32 totalLength = 3; // 总长度 + int32 minDiameter = 4; // 车轮的最小直径 + int32 maxDiameter = 5; // 车轮的最大直径 + string trainSets = 6; // 编组 +} \ No newline at end of file From 7aa3851130e47c52f91580d4c9d7bc70ec87f128 Mon Sep 17 00:00:00 2001 From: joylink_zhaoerwei Date: Thu, 16 Nov 2023 16:22:35 +0800 Subject: [PATCH 03/13] =?UTF-8?q?=E8=BD=A6=E7=AB=99=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E8=BD=A6=E8=BE=86=E6=AE=B5=E5=92=8C=E7=AB=99=E5=90=8D=E7=AE=80?= =?UTF-8?q?=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/stationLayoutGraphics.proto | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/protos/stationLayoutGraphics.proto b/protos/stationLayoutGraphics.proto index 68a6d75..cb8fcae 100644 --- a/protos/stationLayoutGraphics.proto +++ b/protos/stationLayoutGraphics.proto @@ -163,6 +163,8 @@ message Station { int32 index = 7; string refIbpMapCode = 8; // 关联IBP地图Code string stationName = 9; //车站名 + string stationNameAcronym = 10; // 车站名缩写 + bool depots = 11; //是否车辆段 } message TrainWindow { @@ -554,4 +556,4 @@ message Train { int32 minDiameter = 4; // 车轮的最小直径 int32 maxDiameter = 5; // 车轮的最大直径 string trainSets = 6; // 编组 -} \ No newline at end of file +} From 05b24269a892b11c9f8d9c055b9edde03b8260cf Mon Sep 17 00:00:00 2001 From: fan Date: Thu, 16 Nov 2023 16:54:29 +0800 Subject: [PATCH 04/13] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BF=A1=E5=8F=B7?= =?UTF-8?q?=E6=9C=BA=E6=89=80=E5=B1=9E=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 c64e66b..b9a5319 100644 --- a/protos/stationLayoutGraphics.proto +++ b/protos/stationLayoutGraphics.proto @@ -267,6 +267,7 @@ message Signal { } // 信号机模型类型 Model mt = 10; + string belongStation = 11; // 所属车站 } /** 物理区段(包含岔区和非岔区) */ From 68bb38dfe563e6e76e998e3097b38d9d88c1901d Mon Sep 17 00:00:00 2001 From: fan Date: Thu, 16 Nov 2023 16:57:47 +0800 Subject: [PATCH 05/13] =?UTF-8?q?=E7=BC=A9=E5=86=99?= 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 9a005d0..215b11b 100644 --- a/protos/stationLayoutGraphics.proto +++ b/protos/stationLayoutGraphics.proto @@ -269,7 +269,7 @@ message Signal { } // 信号机模型类型 Model mt = 10; - string belongStation = 11; // 所属车站 + string belongStation = 11; // 所属车站(缩写) } /** 物理区段(包含岔区和非岔区) */ From 19896dc3d67de77d2d52c3067f90ea4b92770d6d Mon Sep 17 00:00:00 2001 From: dong <58670809@qq.com> Date: Thu, 16 Nov 2023 18:06:00 +0800 Subject: [PATCH 06/13] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=8A=98=E8=BF=94?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E7=AE=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/stationLayoutGraphics.proto | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/protos/stationLayoutGraphics.proto b/protos/stationLayoutGraphics.proto index 215b11b..006bab7 100644 --- a/protos/stationLayoutGraphics.proto +++ b/protos/stationLayoutGraphics.proto @@ -45,6 +45,7 @@ message RtssGraphicStorage { repeated Beacon beacons = 37; // 信标 GenerateAxleCountingConfig generateAxleCountingConfig = 38;//一键生成计轴的配置 repeated DepartureTimer departureTimers = 39; // 发车计时器 + repeated AutoReturnBox autoReturnBoxs = 40; // 自动折返按钮箱 } message Canvas { @@ -514,6 +515,14 @@ message DepartureTimer { string code = 2; } +message AutoReturnBox { + CommonInfo common = 1; + string code = 2; + bool flip = 3; // 是否翻转（前端显示） + int32 index = 4; //索引 + string refStand = 5; // 关联站台 +} + message UniqueIdOfStationLayout { string city = 1;//城市 string lineId = 2;//线路号 From af06865fd017fbc9f13cd12286027e83805d403a Mon Sep 17 00:00:00 2001 From: fan Date: Fri, 17 Nov 2023 10:40:08 +0800 Subject: [PATCH 07/13] =?UTF-8?q?=E5=8F=96=E6=B6=88=E8=AE=BE=E5=A4=87index?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/stationLayoutGraphics.proto | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/protos/stationLayoutGraphics.proto b/protos/stationLayoutGraphics.proto index 215b11b..540d338 100644 --- a/protos/stationLayoutGraphics.proto +++ b/protos/stationLayoutGraphics.proto @@ -126,7 +126,7 @@ message Platform { string code = 2; //bool hasdoor = 3; // 是否有屏蔽门 //string direction = 4; // 屏蔽门上下 - int32 index = 5; //索引 + // int32 index = 5; //索引 //int32 refStationIndex = 6; //关联车站索引 // repeated string centralizedStations = 7; // 集中站列表 //repeated RelatedRef platformRef = 8; //站台关联的车站和物理区段 @@ -160,7 +160,7 @@ message Station { bool concentrationStations = 4; //是否集中站 // string kilometerCode = 5; //公里标 KilometerSystem kilometerSystem = 6; //公里标 - int32 index = 7; + // int32 index = 7; string refIbpMapCode = 8; // 关联IBP地图Code string stationName = 9; //车站名 string stationNameAcronym = 10; // 车站名缩写 @@ -183,7 +183,7 @@ message AxleCounting { KilometerSystem kilometerSystem = 3; //公里标 repeated RelatedRef axleCountingRef = 4; // 计轴关联的非岔区物理区段和道岔，设备id和端口 - int32 index = 5; //计轴的索引编号 + // int32 index = 5; //计轴的索引编号 //bool invent = 6; //是否虚拟计轴--一般是最末端 TypeDetectionPoint type = 7; //检测点的类型：计轴、区段边界 repeated string centralizedStations = 8; // 集中站列表 @@ -222,7 +222,7 @@ message Turnout { //(后端不关注) RelatedRef pcRef = 11; // 道岔C端关联的设备 // KilometerSystem kilometerSystem = 12; // 道岔公里标 repeated KilometerSystem kilometerSystem = 13; // 道岔公里标 - int32 index = 14; //索引 + // int32 index = 14; //索引 string paTrackSectionId = 15; // A端轨道区段id string pbTrackSectionId = 16; // B端轨道区段id string pcTrackSectionId = 17; // C端轨道区段id @@ -249,7 +249,7 @@ message Signal { // int64 kilometer = 4; // string coordinateSystem = 5; KilometerSystem kilometerSystem = 6; - int32 index = 7; //索引 + // int32 index = 7; //索引 RelatedRef refDev = 8; //关联设备（区段/道岔） repeated string centralizedStations = 9; // 集中站列表 // 信号机模型类型枚举 @@ -286,7 +286,7 @@ message Section { RelatedRef pbRef = 5; // 区段B端关联的设备(非岔区)(后端不关注) SectionType sectionType = 6; // 区段类型 repeated string axleCountings = 7; // 区段对应的计轴 - int32 index = 8; // 索引 + // int32 index = 8; // 索引 string trackSectionId = 9; // 下属轨道区段id bool isCurve = 10; // 是否曲线 int32 segmentsCount = 12; // 曲线分段数 @@ -336,7 +336,7 @@ message Transponder { // 应答器 CommonInfo common = 1; string code = 2; int32 transponderType = 3; - int32 index = 4; // 索引编号 + // int32 index = 4; // 索引编号 KilometerSystem kilometerSystem = 5; //公里标 RelatedRef TransponderRef = 6; //关联关系 repeated string centralizedStations = 7; // 集中站列表 @@ -364,7 +364,7 @@ message SectionLink { 7; // SectionLink A端连接设备（端口关系 SectionLink/Turnout） RelatedRef bRef = 8; // SectionLink B端连接设备（端口关系 // SectionLink/Turnout） - int32 index = 9; // 索引编号 + // int32 index = 9; // 索引编号 } message AxleCountingSection { // 计轴区段 @@ -374,7 +374,7 @@ message AxleCountingSection { // 计轴区段 RelatedRef paRef = 4; // 计轴区段A端关联的计轴 RelatedRef pbRef = 5; // 计轴区段B端关联的计轴 repeated TurnoutPosRef turnoutPos = 6; //关联道岔的正反位--0是定位，1是反位 - int32 index = 7; //计轴区段的索引编号 + // int32 index = 7; //计轴区段的索引编号 } message LogicSection { // 逻辑区段 @@ -382,7 +382,7 @@ message LogicSection { // 逻辑区段 string code = 2; // 名称 repeated Point points = 3; string axleSectionId = 4; // 关联的计轴区段Id - int32 index = 5; // 索引编号 + // int32 index = 5; // 索引编号 string turnoutId = 6; // 关联的岔芯对应的道岔id，此时该逻辑区段为该道岔C端关联的轨道link } @@ -394,7 +394,7 @@ message TrackSection { //轨道区段 CommonInfo common = 1; repeated Point points = 2; string code = 3; //名称 - int32 index = 4; //索引 + // int32 index = 4; //索引 TrackSectionType type = 5; //类型 string destinationCode = 6; //目的地码 repeated string trackLogicSection = 7; //下属的逻辑区段id(非岔区) @@ -420,7 +420,7 @@ message StopPosition { string code = 2; bool flip = 3; // 是否翻转（前端显示） CoachNum coachNum = 4; //编组数量 - int32 index = 5; //索引 + // int32 index = 5; //索引 KilometerSystem kilometerSystem = 6; RelatedRef refDev = 7; // 关联设备（区段） } @@ -429,7 +429,7 @@ message SpksSwitch { CommonInfo common = 1; string code = 2; bool flip = 3; // 是否翻转（前端显示） - int32 index = 4; //索引 + // int32 index = 4; //索引 // int32 refStand = 5; //关联站台索引 repeated string refSections = 6; // 关联物理区段id string refStand = 7; // 关联站台 @@ -439,7 +439,7 @@ message EsbButton { CommonInfo common = 1; string code = 2; bool flip = 3; // 是否翻转（前端显示） - int32 index = 4; //索引 + // int32 index = 4; //索引 // int32 refStand = 5; // 关联站台索引 string refStand = 6; // 关联站台 } @@ -448,7 +448,7 @@ message GatedBox { CommonInfo common = 1; string code = 2; bool flip = 3; // 是否翻转（前端显示） - int32 index = 4; //索引 + // int32 index = 4; //索引 string refScreenDoor = 5; // 关联屏蔽门 string refGatedBoxMapCode = 6; // 关联门控箱地图Code } From f33749551cded1f81ddef7aabc4be9e5b75af8f3 Mon Sep 17 00:00:00 2001 From: joylink_zhaoerwei Date: Fri, 17 Nov 2023 16:53:35 +0800 Subject: [PATCH 08/13] =?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 09/13] =?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 10/13] =?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 11/13] =?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 12/13] =?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 13/13] =?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; +}