diff --git a/VectoCore/VectoCoreTest/Integration/ADAS/ADASTests.cs b/VectoCore/VectoCoreTest/Integration/ADAS/ADASTests.cs index 1c52efd1777ffc5639226c7c959c472002eb8a11..6255d8384337f4c6a9d096396b05cdd1feacc801 100644 --- a/VectoCore/VectoCoreTest/Integration/ADAS/ADASTests.cs +++ b/VectoCore/VectoCoreTest/Integration/ADAS/ADASTests.cs @@ -43,13 +43,14 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS //#else //GraphWriter.Disable(); //#endif - GraphWriter.Xfields = new[] { ModalResultField.time, ModalResultField.dist }; + GraphWriter.Xfields = new[] { ModalResultField.dist }; GraphWriter.Yfields = new[] { - ModalResultField.v_act, ModalResultField.acc, ModalResultField.n_eng_avg, ModalResultField.Gear, - ModalResultField.P_eng_out, ModalResultField.P_eng_drag, ModalResultField.FCMap + ModalResultField.v_act, ModalResultField.altitude, ModalResultField.acc, ModalResultField.Gear, + ModalResultField.P_eng_out, ModalResultField.FCMap }; - GraphWriter.Series1Label = "EcoRoll"; + GraphWriter.Series1Label = "ADAS PCC"; + GraphWriter.PlotIgnitionState = true; } diff --git a/VectoCore/VectoCoreTest/Utils/GraphWriter.cs b/VectoCore/VectoCoreTest/Utils/GraphWriter.cs index aecbcd5fc35279519710c4950ddb258b47fad2da..59375e734506b6bd2dafda4d4add9f7c7cd1e23d 100644 --- a/VectoCore/VectoCoreTest/Utils/GraphWriter.cs +++ b/VectoCore/VectoCoreTest/Utils/GraphWriter.cs @@ -65,6 +65,8 @@ namespace TUGraz.VectoCore.Tests.Utils public static bool PlotDrivingMode = false; + public static bool PlotIgnitionState = false; + public static void Enable() { _enabled = true; @@ -119,7 +121,11 @@ namespace TUGraz.VectoCore.Tests.Utils if (yfield == ModalResultField.v_act) { var y3 = LoadData(modDataV3, ModalResultField.v_targ.GetName()); var series3 = CreateSeries("v_target", legend, chartArea, chart, Color.Green, x, y3); + } + if ((Yfields.Contains(ModalResultField.altitude) && yfield == ModalResultField.altitude) || + (!Yfields.Contains(ModalResultField.altitude) && yfield == ModalResultField.v_act)) { + var grad = LoadData(modDataV3, ModalResultField.grad.GetName()); chartArea.AxisY2.Enabled = AxisEnabled.True; @@ -167,6 +173,20 @@ namespace TUGraz.VectoCore.Tests.Utils //seriesAction.YAxisType = AxisType; } } + if (PlotIgnitionState && yfield == ModalResultField.P_eng_out) { + var ignition = LoadData(modDataV3, ModalResultField.IgnitionOn.GetName()); + + chartArea.AxisY2.Enabled = AxisEnabled.True; + chartArea.AxisY2.Title = "Engine On [0/1]"; + chartArea.AxisY2.TitleFont = AxisTitleFont; + chartArea.AxisY2.LabelStyle.Font = AxisLabelFont; + chartArea.AxisY2.LabelAutoFitStyle = LabelAutoFitStyles.None; + chartArea.AxisY2.MinorGrid.Enabled = false; + chartArea.AxisY2.MajorGrid.Enabled = false; + + var seriesIgnition = CreateSeries("Engine On", legend, chartArea, chart, Color.Crimson, x, ignition); + seriesIgnition.YAxisType = AxisType.Secondary; + } var series1 = CreateSeries(string.Format("{1} - {0}", yfield, Series1Label), legend, chartArea, chart, Color.Blue, x, y);