diff --git a/src/client/spark/AW2/ViewModel/Graph/VolSurfaceGraphVM.cs b/src/client/spark/AW2/ViewModel/Graph/VolSurfaceGraphVM.cs index a09fdc0aa..1b3d881b4 100644 --- a/src/client/spark/AW2/ViewModel/Graph/VolSurfaceGraphVM.cs +++ b/src/client/spark/AW2/ViewModel/Graph/VolSurfaceGraphVM.cs @@ -217,15 +217,15 @@ namespace mbts.spark { if (disp_graph != null) { return type switch { VolSurfaceGraphSeriesType.CandidateCallWing => disp_graph.all_points - .Where(t => t.Item1 >= disp_graph.call_wing_start) + .Where(t => t.Item1 <= disp_graph.call_wing_start) .Select(t => new GraphPointVM(t.Item1, t.Item2)) .ToList(), VolSurfaceGraphSeriesType.CandidatePutWing => disp_graph.all_points - .Where(t => t.Item1 <= disp_graph.put_wing_start) + .Where(t => t.Item1 >= disp_graph.put_wing_start) .Select(t => new GraphPointVM(t.Item1, t.Item2)) .ToList(), VolSurfaceGraphSeriesType.CandidateInnerCurve => disp_graph.all_points - .Where(t => t.Item1 >= disp_graph.put_wing_start && t.Item1 <= disp_graph.call_wing_start) + .Where(t => t.Item1.is_within_range(disp_graph.call_wing_start, disp_graph.put_wing_start)) .Select(t => new GraphPointVM(t.Item1, t.Item2)) .ToList(), VolSurfaceGraphSeriesType.CandidateControlPoints => Enumerable.Empty(), @@ -254,15 +254,15 @@ namespace mbts.spark { if (disp_graph != null) { return type switch { VolSurfaceGraphSeriesType.CommittedCallWing => disp_graph.all_points - .Where(t => t.Item1 >= disp_graph.call_wing_start) + .Where(t => t.Item1 <= disp_graph.call_wing_start) .Select(t => new GraphPointVM(t.Item1, t.Item2)) .ToList(), VolSurfaceGraphSeriesType.CommittedPutWing => disp_graph.all_points - .Where(t => t.Item1 <= disp_graph.put_wing_start) + .Where(t => t.Item1 >= disp_graph.put_wing_start) .Select(t => new GraphPointVM(t.Item1, t.Item2)) .ToList(), VolSurfaceGraphSeriesType.CommittedInnerCurve => disp_graph.all_points - .Where(t => t.Item1 >= disp_graph.put_wing_start && t.Item1 <= disp_graph.call_wing_start) + .Where(t => t.Item1.is_within_range(disp_graph.call_wing_start, disp_graph.put_wing_start)) .Select(t => new GraphPointVM(t.Item1, t.Item2)) .ToList(), VolSurfaceGraphSeriesType.CommittedControlPoints => Enumerable.Empty(),