michal/tbf
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Results.Output.WMChart : MarkerSize for printer = 1, MarkerStyle = Circle, ver. 2.18.1259

Browse Source
This commit is contained in:
Milan Hanajik
2019-06-30 13:15:25 +02:00
parent 9fa7079dc0
commit b57d22e276
4 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Results/Forms/MoreWMResultsDlg.cs
+1 -1
View File
@@ -111,7 +111,7 @@ namespace Results.Forms
//chart.ChartAreas[0].AxisX.Interval = 1; //chart.ChartAreas[0].AxisX.Interval = 1;
//chart.ChartAreas[0].AxisX.IntervalType = ; //chart.ChartAreas[0].AxisX.IntervalType = ;
tabControl1.TabPages[1].Controls.Add(Results.Output.WMChart.GetChart(wm)); tabControl1.TabPages[1].Controls.Add(Results.Output.WMChart.GetChart(wm, false));
} }
Results/Output/Printers/OnePerMeter/OnePerMeterPrintDocument.cs
+1 -1
View File
@@ -155,7 +155,7 @@ namespace Results.Output.Printers.OnePerMeter
if ((cfg.GraphHgh != 0) && (cfg.GraphWid != 0)) if ((cfg.GraphHgh != 0) && (cfg.GraphWid != 0))
{ {
Rectangle pos = new Rectangle(cfg.GraphLeft, cfg.GraphTop, cfg.GraphWid, cfg.GraphHgh); Rectangle pos = new Rectangle(cfg.GraphLeft, cfg.GraphTop, cfg.GraphWid, cfg.GraphHgh);
WMChart.GetChart(wm).Printing.PrintPaint(e.Graphics, pos); WMChart.GetChart(wm, true).Printing.PrintPaint(e.Graphics, pos);
} }
float tableTop = cfg.TopMargin; float tableTop = cfg.TopMargin;
Results/Output/WMChart.cs
+6 -4
View File
@@ -12,12 +12,12 @@ namespace Results.Output
{ {
public class WMChart public class WMChart
{ {
public static Chart GetChart(WaterMeter wm) public static Chart GetChart(WaterMeter wm, bool isPrinter)
{ {
return GetChart(wm, Config.Unit.lph, false); return GetChart(wm, isPrinter, Config.Unit.lph, false);
} }
public static Chart GetChart(WaterMeter wm, Config.Unit flowUnit, bool isQ4) public static Chart GetChart(WaterMeter wm, bool isPrinter, Config.Unit flowUnit, bool isQ4)
{ {
IList<PointF> unsortedPoints = new List<PointF>(); IList<PointF> unsortedPoints = new List<PointF>();
foreach (var mtr in wm.MeterTestRslts) foreach (var mtr in wm.MeterTestRslts)
@@ -97,7 +97,9 @@ namespace Results.Output
Series line = new Series { Name = Strings.Relative_error, ChartArea = "ChartArea1", ChartType = SeriesChartType.Line, Color = Color.DeepSkyBlue }; Series line = new Series { Name = Strings.Relative_error, ChartArea = "ChartArea1", ChartType = SeriesChartType.Line, Color = Color.DeepSkyBlue };
Series dots = new Series { Name = Strings.Relative_error + " ", ChartArea = "ChartArea1", ChartType = SeriesChartType.Point, Color = Color.RoyalBlue }; Series dots = new Series { Name = Strings.Relative_error + " ", ChartArea = "ChartArea1", ChartType = SeriesChartType.Point, Color = Color.RoyalBlue };
foreach (var point in sortedPoints) dots.MarkerStyle = MarkerStyle.Circle;
if (isPrinter) dots.MarkerSize = 1;
foreach (var point in sortedPoints)
{ {
line.Points.AddXY(point.X, point.Y); line.Points.AddXY(point.X, point.Y);
dots.Points.AddXY(point.X, point.Y); dots.Points.AddXY(point.X, point.Y);
TBF/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number // Build Number
// Revision // Revision
// //
[assembly: AssemblyVersion("2.18.1258.0")] [assembly: AssemblyVersion("2.18.1259.0")]
[assembly: AssemblyFileVersion("2.18.1258.0")] [assembly: AssemblyFileVersion("2.18.1259.0")]