Skip to content

Update Form1.cs #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
flamy0 wants to merge 2 commits into
base: master
Choose a base branch
from
+6 −6
Open

Update Form1.cs #7

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc6a959
Update Form1.cs
flamy0 Nov 24, 2020
115d490
Update Form1.cs
flamy0 Nov 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions VisualME7Logger/Form1.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
Expand Down Expand Up @@ -459,7 +459,7 @@ void BuildChart()
SessionVariable var = session.Variables[graphVariable.Variable];
if (var != null)
{
Series s = new Series(string.Format("{0} {1}-{2} {3}", graphVariable.Name, graphVariable.Min.ToString("0.##"), graphVariable.Max.ToString("0.##"), var.Unit));
Series s = new Series(string.Format("{0} {1}-{2} {3}", String.IsNullOrEmpty(graphVariable.Name) ? graphVariable.Variable : graphVariable.Name, graphVariable.Min.ToString("0.##"), graphVariable.Max.ToString("0.##"), var.Unit));
s.Color = graphVariable.LineColor;
s.ChartType = (SeriesChartType)cmbChartType.SelectedItem;
s.BorderWidth = graphVariable.LineThickness;
Expand Down Expand Up @@ -570,7 +570,7 @@ void PlotLineOnChart(LogLine line)
decimal percent = (v.Value - graphVariable.Min) / (graphVariable.Max - graphVariable.Min) * this.DisplayOptions.GraphVRes;
DataPoint p = s.Points.Add((double)percent);
p.AxisLabel = decimal.Round(line.TimeStamp, 1).ToString();
p.ToolTip = string.Format("{0}: {1} {2}\r\nMin: {3} {2}\r\nMax: {4} {2}", graphVariable.Name, v.Value, v.SessionVariable.Unit, v.CurrentMinValue, v.CurrentMaxValue);
p.ToolTip = string.Format("{0}: {1} {2}\r\nMin: {3} {2}\r\nMax: {4} {2}", String.IsNullOrEmpty(graphVariable.Name) ? graphVariable.Variable : graphVariable.Name, v.Value, v.SessionVariable.Unit, v.CurrentMinValue, v.CurrentMaxValue);
p.Tag = v;

s.Points.RemoveAt(0);
Expand Down Expand Up @@ -765,7 +765,7 @@ void HighlightPoints(bool highlight = true)
if (v != null)
{
GraphVariable graphVar = this.DisplayOptions.GraphVariables.FirstOrDefault(gv => gv.Variable.Equals(v.SessionVariable.Name, StringComparison.InvariantCultureIgnoreCase));
lowest.Label = string.Format("{0}: {1} {2}", graphVar != null ? graphVar.Name : v.SessionVariable.Name, v.Value, v.SessionVariable.Unit);
lowest.Label = string.Format("{0}: {1} {2}", graphVar != null ? (String.IsNullOrEmpty(graphVar.Name) ? graphVar.Variable : graphVar.Name) : v.SessionVariable.Name, v.Value, v.SessionVariable.Unit);
lowest.LabelForeColor = Color.White;
}
}
Expand All @@ -776,7 +776,7 @@ void HighlightPoints(bool highlight = true)
if (v != null)
{
GraphVariable graphVar = this.DisplayOptions.GraphVariables.FirstOrDefault(gv => gv.Variable.Equals(v.SessionVariable.Name, StringComparison.InvariantCultureIgnoreCase));
highest.Label = string.Format("{0}: {1} {2}", graphVar != null ? graphVar.Name : v.SessionVariable.Name, v.Value, v.SessionVariable.Unit);
highest.Label = string.Format("{0}: {1} {2}", graphVar != null ? (String.IsNullOrEmpty(graphVar.Name) ? graphVar.Variable : graphVar.Name) : v.SessionVariable.Name, v.Value, v.SessionVariable.Unit);
highest.LabelForeColor = Color.White;
}
}
Expand Down Expand Up @@ -1219,4 +1219,4 @@ public override DataObject GetClipboardContent()
return obj;
}
}
}
}