Skip to content

Commit f9df77d

Browse files
committed
some bugfix
1 parent d442eb5 commit f9df77d

File tree

4 files changed

+4636
-5508
lines changed

4 files changed

+4636
-5508
lines changed

AboutForm.Designer.cs

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

FormMain.cs

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,8 @@ private void btnAbout_Click(object sender, EventArgs e)
6262

6363
private void btnViewGraph_Click(object sender, EventArgs e)
6464
{
65+
if (data_g == null)
66+
return;
6567
PlotModel myModel = new PlotModel();
6668
myModel.Series.Add(new FunctionSeries());
6769

@@ -219,7 +221,9 @@ private void loadFiles()
219221
string[] log = File.ReadAllLines(logFileName);
220222
string[] data = File.ReadAllLines(hvFileName);
221223

222-
numberOfWindows = Convert.ToInt32(data[1].Split(' ')[5]);
224+
this.Text = "SESAME Criteria - HV TEST : " + hvFileName;
225+
var nw = data[1].Split('=').Last();
226+
numberOfWindows = Convert.ToInt32(nw);
223227
timeWin = new TimeWindows[numberOfWindows];
224228
nc = new double[numberOfWindows];
225229
data_g = new DataGeopsy[data.Length-7];
@@ -248,7 +252,18 @@ private void loadFiles()
248252
nc[j] = timeWin[j].WindowLengh * numberOfWindows * f0;
249253
}
250254

251-
for (int q = 7, n=0; q < data.Length; q++,n++)
255+
int pos = 0;
256+
257+
for (int i = 0; i < data.Length; i++)
258+
{
259+
if(data[i].ToString().Contains("# Frequency Average Min Max"))
260+
{
261+
pos = i + 1;
262+
break;
263+
}
264+
}
265+
266+
for (int q = pos, n=0; q < data.Length; q++,n++)
252267
{
253268
data_g[n].Frequency = double.Parse(data[q].Split(Convert.ToChar('\t'))[0], CultureInfo.InvariantCulture);
254269
data_g[n].Average = double.Parse(data[q].Split(Convert.ToChar('\t'))[1], CultureInfo.InvariantCulture);

0 commit comments

Comments
 (0)