From b57d22e276e60978b3cddcd94889024223413a34 Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Sun, 30 Jun 2019 13:15:25 +0200 Subject: [PATCH] Results.Output.WMChart : MarkerSize for printer = 1, MarkerStyle = Circle, ver. 2.18.1259 --- Results/Forms/MoreWMResultsDlg.cs | 2 +- .../Printers/OnePerMeter/OnePerMeterPrintDocument.cs | 2 +- Results/Output/WMChart.cs | 10 ++++++---- TBF/Properties/AssemblyInfo.cs | 4 ++-- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Results/Forms/MoreWMResultsDlg.cs b/Results/Forms/MoreWMResultsDlg.cs index ba7dcde8e..727183457 100644 --- a/Results/Forms/MoreWMResultsDlg.cs +++ b/Results/Forms/MoreWMResultsDlg.cs @@ -111,7 +111,7 @@ namespace Results.Forms //chart.ChartAreas[0].AxisX.Interval = 1; //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)); } diff --git a/Results/Output/Printers/OnePerMeter/OnePerMeterPrintDocument.cs b/Results/Output/Printers/OnePerMeter/OnePerMeterPrintDocument.cs index f4b6fbdf3..2bea806ea 100644 --- a/Results/Output/Printers/OnePerMeter/OnePerMeterPrintDocument.cs +++ b/Results/Output/Printers/OnePerMeter/OnePerMeterPrintDocument.cs @@ -155,7 +155,7 @@ namespace Results.Output.Printers.OnePerMeter if ((cfg.GraphHgh != 0) && (cfg.GraphWid != 0)) { 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; diff --git a/Results/Output/WMChart.cs b/Results/Output/WMChart.cs index 26ce4419a..1c84a5e21 100644 --- a/Results/Output/WMChart.cs +++ b/Results/Output/WMChart.cs @@ -12,12 +12,12 @@ namespace Results.Output { 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 unsortedPoints = new List(); 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 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); dots.Points.AddXY(point.X, point.Y); diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs index 438cee83a..d013cb4e5 100644 --- a/TBF/Properties/AssemblyInfo.cs +++ b/TBF/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("2.18.1258.0")] -[assembly: AssemblyFileVersion("2.18.1258.0")] +[assembly: AssemblyVersion("2.18.1259.0")] +[assembly: AssemblyFileVersion("2.18.1259.0")]