Skip to content

Commit 66f9626

Browse files
committed
asymmetry: fix travel times and name overlapping
We could also reduce the font size for travel times and name texts: $LINE_FONT_SIZE: 16px; -> $LINE_FONT_SIZE_REDUCED: 14px; Signed-off-by: Louis Greiner <[email protected]>
1 parent ceb5ac7 commit 66f9626

File tree

4 files changed

+13
-3
lines changed

4 files changed

+13
-3
lines changed

src/app/view/editor-main-view/data-views/trainrunsections.view.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
::ng-deep text.edge_text.TrainrunSectionName {
1616
text-anchor: end;
1717
text-align: right;
18+
font-size: $LINE_FONT_SIZE_REDUCED;
1819
}
1920

2021
::ng-deep text.edge_text.SourceArrival.OddFrequency {
@@ -36,11 +37,13 @@
3637
::ng-deep text.edge_text.TrainrunSectionTravelTime {
3738
text-anchor: start;
3839
text-align: left;
40+
font-size: $LINE_FONT_SIZE_REDUCED;
3941
}
4042

4143
::ng-deep text.edge_text.TrainrunSectionBackwardTravelTime {
4244
text-anchor: start;
4345
text-align: left;
46+
font-size: $LINE_FONT_SIZE_REDUCED;
4447
}
4548

4649
::ng-deep text.edge_text.warning {

src/app/view/editor-main-view/data-views/trainrunsections.view.spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1063,7 +1063,7 @@ describe("TrainrunSection-View", () => {
10631063
dataService.loadNetzgrafikDto(NetzgrafikUnitTesting.getUnitTestNetzgrafik());
10641064
const ts = trainrunSectionService.getTrainrunSectionFromId(2);
10651065
const v1 = TrainrunSectionsView.getPositionX(ts, TrainrunSectionText.TrainrunSectionTravelTime);
1066-
expect(v1).toBe(8);
1066+
expect(v1).toBe(16);
10671067
});
10681068

10691069
it("TrainrunSectionsView.getPositionX - TargetDeparture", () => {
@@ -1087,7 +1087,7 @@ describe("TrainrunSection-View", () => {
10871087
dataService.loadNetzgrafikDto(NetzgrafikUnitTesting.getUnitTestNetzgrafik());
10881088
const ts = trainrunSectionService.getTrainrunSectionFromId(2);
10891089
const v1 = TrainrunSectionsView.getPositionY(ts, TrainrunSectionText.TrainrunSectionName);
1090-
expect(v1).toBe(0);
1090+
expect(v1).toBe(4);
10911091
});
10921092

10931093
it("TrainrunSectionsView.getPositionY - TrainrunSectionName", () => {
@@ -1101,7 +1101,7 @@ describe("TrainrunSection-View", () => {
11011101
dataService.loadNetzgrafikDto(NetzgrafikUnitTesting.getUnitTestNetzgrafik());
11021102
const ts = trainrunSectionService.getTrainrunSectionFromId(2);
11031103
const v1 = TrainrunSectionsView.getPositionX(ts, TrainrunSectionText.TrainrunSectionTravelTime);
1104-
expect(v1).toBe(8);
1104+
expect(v1).toBe(16);
11051105
});
11061106

11071107
it("TrainrunSectionsView.getPositionY - TargetDeparture", () => {

src/app/view/editor-main-view/data-views/trainrunsections.view.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -331,6 +331,7 @@ export class TrainrunSectionsView {
331331
case TrainrunSectionText.TargetArrival:
332332
return trainrunSection.getTextPositionX(textElement);
333333
case TrainrunSectionText.TrainrunSectionTravelTime:
334+
return RASTERING_BASIC_GRID_SIZE / 2;
334335
case TrainrunSectionText.TrainrunSectionBackwardTravelTime:
335336
return RASTERING_BASIC_GRID_SIZE / 4;
336337
case TrainrunSectionText.TrainrunSectionName:
@@ -347,6 +348,11 @@ export class TrainrunSectionsView {
347348
case TrainrunSectionText.TargetDeparture:
348349
case TrainrunSectionText.TargetArrival:
349350
return trainrunSection.getTextPositionY(textElement);
351+
case TrainrunSectionText.TrainrunSectionName:
352+
case TrainrunSectionText.TrainrunSectionTravelTime:
353+
return 3;
354+
case TrainrunSectionText.TrainrunSectionBackwardTravelTime:
355+
return 0;
350356
default:
351357
return 0;
352358
}

src/app/view/rastering/definitions.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ $COLOR_Default_Selection: #3367d1;
33
$NODE_ROUND_EDGE_SIZE: 4px;
44

55
$LINE_FONT_SIZE: 16px;
6+
$LINE_FONT_SIZE_REDUCED: 14px;
67
$LINE_STOP_FONT_SIZE: 12px;
78
$BP_LABEL_FONT_SIZE: 16px;
89

0 commit comments

Comments
 (0)