michal/tbf
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug fixes: (1) simulation, (2) when BenchInfo==null, (3) ProcessData.RefPulses updated, (4) ProcessTabPages, etc.

Browse Source
This commit is contained in:
Milan Hanajik
2016-02-15 22:48:44 +01:00
parent 92bcd46549
commit 462ed568de
21 changed files with 68 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TestBenchFramework/Screens/ProcessTabPageCtrl24.cs
+5 -4
View File
@@ -415,8 +415,9 @@ namespace TBF.Screens
///
/// Available only during a test
///
refPulsesLabel.Text = ProcessData.RefCount.ToString();
double refVolume = ProcessData.LtrPerRefPulse * (double)ProcessData.RefCount.Val;
refPulsesLabel.Text = ProcessData.RefPulses.ToString();
double refVolume = ProcessData.LtrPerRefPulse * (double)ProcessData.RefPulses;
refVolumeLabel.Text = refVolume.ToString("F2");
float massDiff = ProcessData.Mass.Val - ProcessData.StartMass.Val;
massDiffLabel.Text = massDiff.ToString("F3");
@@ -435,7 +436,7 @@ namespace TBF.Screens
pulses[i].Text = rr.WMPulses.ToString();
refPulses[i].Text = rr.WMRefPulses.ToString();
volume[i].Text = rr.WMVolume.ToString("F1");
error[i].Text = BenchControl.Formulas.ErrorFromVolumes(rr.WMVolume, refVolume).ToString("F1");
error[i].Text = BenchControl.Formulas.ErrorFromVolumes(rr.WMVolume, rr.WMRefPulses * ProcessData.LtrPerRefPulse).ToString("F1");
}
}
}
@@ -454,7 +455,7 @@ namespace TBF.Screens
pulses[i].Text = rr.WMPulses.ToString();
refPulses[i].Text = rr.WMRefPulses.ToString();
volume[i].Text = rr.WMVolume.ToString("F1");
error[i].Text = BenchControl.Formulas.ErrorFromVolumes(rr.WMVolume, refVolume).ToString("F1");
error[i].Text = BenchControl.Formulas.ErrorFromVolumes(rr.WMVolume, rr.WMRefPulses * ProcessData.LtrPerRefPulse).ToString("F1");
compoundVolume += rr.WMVolume;
}
}