Git_Mirror/Terminal.Gui
1
0
Fork 0
mirror of https://github.com/gui-cs/Terminal.Gui.git synced 2026-01-02 01:03:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed label positions to begin at Margins not just bottom left of screen (#1488)

Browse Source 
* Fixed label positions to begin at Margins not just bottom left of screen

* Tidied up Axis GetLabels and added margin control to GraphViewExample

* Added tests for very large margins
This commit is contained in:
Thomas Nind
2021-10-25 20:30:39 +01:00
committed by GitHub
parent 9d767a4171
commit b5799c3ded
4 changed files with 185 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

132
UnitTests/GraphViewTests.cs
View File

@@ -1398,6 +1398,138 @@ namespace Terminal.Gui.Views {
Application.Shutdown ();
}
[Fact]
public void YAxisLabels_With_MarginBottom ()
{
GraphViewTests.InitFakeDriver ();
var gv = new GraphView {
ColorScheme = new ColorScheme (),
Bounds = new Rect (0, 0, 10, 7)
};
gv.CellSize = new PointF (1, 0.5f);
gv.AxisY.Increment = 1;
gv.AxisY.ShowLabelsEvery = 1;
gv.Series.Add (new ScatterSeries {
Points = { new PointF (1, 1), new PointF (5, 0) }
});
// reserve 3 cells of the console for the margin
gv.MarginBottom = 3;
gv.MarginLeft = 1;
gv.Redraw (gv.Bounds);
var expected =
@"
│
1┤x
│
0┼┬┬┬┬x┬┬┬
0 5
";
GraphViewTests.AssertDriverContentsAre (expected, output);
// Shutdown must be called to safely clean up Application if Init has been called
Application.Shutdown ();
}
[Fact]
public void XAxisLabels_With_MarginLeft()
{
GraphViewTests.InitFakeDriver ();
var gv = new GraphView {
ColorScheme = new ColorScheme (),
Bounds = new Rect (0, 0, 10, 7)
};
gv.CellSize = new PointF (1, 0.5f);
gv.AxisY.Increment = 1;
gv.AxisY.ShowLabelsEvery = 1;
gv.Series.Add (new ScatterSeries {
Points = { new PointF (1, 1), new PointF (5, 0) }
});
// reserve 3 cells of the left for the margin
gv.MarginLeft = 3;
gv.MarginBottom = 1;
gv.Redraw (gv.Bounds);
var expected =
@"
│
2┤
│
1┤x
│
0┼┬┬┬┬x┬
0 5
";
GraphViewTests.AssertDriverContentsAre (expected, output);
// Shutdown must be called to safely clean up Application if Init has been called
Application.Shutdown ();
}
[Fact]
public void MarginBottom_BiggerThanHeight_ExpectBlankGraph ()
{
var gv = GraphViewTests.GetGraph ();
gv.Height = 10;
gv.MarginBottom = 20;
gv.Series.Add (new ScatterSeries {
Points = { new PointF (1, 1), new PointF (5, 0) }
});
gv.Redraw (gv.Bounds);
var expected =
@"
";
GraphViewTests.AssertDriverContentsAre (expected, output);
// Shutdown must be called to safely clean up Application if Init has been called
Application.Shutdown ();
}
[Fact]
public void MarginLeft_BiggerThanWidth_ExpectBlankGraph ()
{
var gv = GraphViewTests.GetGraph ();
gv.Width = 10;
gv.MarginLeft = 20;
gv.Series.Add (new ScatterSeries {
Points = { new PointF (1, 1), new PointF (5, 0) }
});
gv.Redraw (gv.Bounds);
var expected =
@"
";
GraphViewTests.AssertDriverContentsAre (expected, output);
// Shutdown must be called to safely clean up Application if Init has been called
Application.Shutdown ();
}
[Fact]
public void PathAnnotation_Diamond ()
{