merge

protos/stationLayoutGraphics.proto

@@ -10,7 +10,11 @@ message RtssGraphicStorage {
   repeated Station stations = 5;
   repeated Rect Rects = 6;
   repeated Train train = 7;
+<<<<<<< HEAD
   repeated Turnout turnouts = 8;
+=======
+  repeated Signal signals = 8;
+>>>>>>> 86de0cff9ee560f0c7e670184d5baccfdb28ee44
 }
 
 message Canvas {
@@ -134,3 +138,12 @@ message Turnout {
   Point pointB = 7;    // B端坐标
   Point pointC = 8;    // C端坐标
 }
+
+message Signal {
+  CommonInfo common = 1;
+  string code = 2;
+  string codeColor = 3;   // 信号机字体颜色
+  int32 codeFontSize = 4; // 信号机字体大小
+  Point point = 5;        // 位置坐标
+  string direction = 6;   //信号机朝向
+}