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

Reconfigured for iPerlST, ProcessDataEventArgs related modifictions.

Browse Source
This commit is contained in:
Milan Hanajik
2016-02-10 16:52:59 +01:00
parent 42a9ecda27
commit 3775913a33
6 changed files with 75 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TestBenchFramework/BenchControl/DB/SensusOracle/Database.cs
+3 -13
View File
@@ -66,19 +66,9 @@ namespace TBF.BenchControl.DB.SensusOracle
public void Initialize() public void Initialize()
{ {
if (DBCfg.DBUsed == DBUsed.Test) connection = (DBCfg.DBUsed == DBUsed.Production)
{ ? new OracleConnection("Data Source=STARA01.WORLD;User Id=deltachef;Password=deltachef;")
connection = new OracleConnection("Data Source=STARA_TEST.WORLD;User Id=deltachef;Password=deltachef;"); : new OracleConnection("Data Source=STARA_TEST.WORLD;User Id=deltachef;Password=deltachef;");
}
else if (DBCfg.DBUsed == DBUsed.Production)
{
connection = new OracleConnection("Data Source=STARA01.WORLD;User Id=deltachef;Password=deltachef;");
}
else if (DBCfg.DBUsed == DBUsed.Quality)
{
/// Temporarily use test database
connection = new OracleConnection("Data Source=STARA_TEST.WORLD;User Id=deltachef;Password=deltachef;");
}
if (DBCfg.DebugLevel == DebugMode.Simulate) return; if (DBCfg.DebugLevel == DebugMode.Simulate) return;
TestBenchFramework/Screens/ProcessTabPageCtrl24.cs
+4 -4
View File
@@ -100,12 +100,12 @@ namespace TBF.Screens
else else
OnTestSelected(sender, args); OnTestSelected(sender, args);
}; };
Bridge.TestProgressHandler += delegate(object sender, TestProgressEventArgs args) Bridge.ProcessDataHandler += delegate(object sender, ProcessDataEventArgs args)
{ {
if (InvokeRequired) if (InvokeRequired)
Invoke(new EventHandler<TestProgressEventArgs>(OnTestProgress), sender, args); Invoke(new EventHandler<ProcessDataEventArgs>(OnProcessDataChanged), sender, args);
else else
OnTestProgress(sender, args); OnProcessDataChanged(sender, args);
}; };
Bridge.TestCompletedHandler += delegate(object sender, TestCompletedEventArgs args) Bridge.TestCompletedHandler += delegate(object sender, TestCompletedEventArgs args)
{ {
@@ -381,7 +381,7 @@ namespace TBF.Screens
} }
} }
void OnTestProgress(object sender, TestProgressEventArgs args) void OnProcessDataChanged(object sender, ProcessDataEventArgs args)
{ {
/// Top part /// Top part
//airTempLabel.Text = args.AmbientTemp.ToString(); //airTempLabel.Text = args.AmbientTemp.ToString();
TestBenchFramework/Screens/ProcessTabPageCtrl48.cs
+51 -51
View File
@@ -130,12 +130,12 @@ namespace TBF.Screens
else else
OnTestSelected(sender, args); OnTestSelected(sender, args);
}; };
Bridge.TestProgressHandler += delegate(object sender, TestProgressEventArgs args) Bridge.ProcessDataHandler += delegate(object sender, ProcessDataEventArgs args)
{ {
if (InvokeRequired) if (InvokeRequired)
Invoke(new EventHandler<TestProgressEventArgs>(OnTestProgress), sender, args); Invoke(new EventHandler<ProcessDataEventArgs>(OnProcessDataChanged), sender, args);
else else
OnTestProgress(sender, args); OnProcessDataChanged(sender, args);
}; };
Bridge.TestCompletedHandler += delegate(object sender, TestCompletedEventArgs args) Bridge.TestCompletedHandler += delegate(object sender, TestCompletedEventArgs args)
{ {
@@ -411,7 +411,7 @@ namespace TBF.Screens
} }
} }
void OnTestProgress(object sender, TestProgressEventArgs args) void OnProcessDataChanged(object sender, ProcessDataEventArgs args)
{ {
airTempLabel.Text = ProcessData.AmbientTemp.ToString(); airTempLabel.Text = ProcessData.AmbientTemp.ToString();
airPressLabel.Text = ProcessData.AmbientPressure.ToString(); airPressLabel.Text = ProcessData.AmbientPressure.ToString();
@@ -426,59 +426,59 @@ namespace TBF.Screens
refFreqLabel.Text = ProcessData.RefFreq.ToString(); refFreqLabel.Text = ProcessData.RefFreq.ToString();
refFlowLabel.Text = Utils.FloatToStr(ProcessData.RefFlow.Val, 4); refFlowLabel.Text = Utils.FloatToStr(ProcessData.RefFlow.Val, 4);
if (args.Phase == Config.Entities.Progress.Test) //if (args.Phase == Config.Entities.Progress.Test)
{ {
///// Top part /// Top part
//refVolumeLabel.Text = args.Volume.ToString(); refVolumeLabel.Text = args.Volume.ToString();
////regValvePosLabel.Text = args.RegValvePos.ToString(); //regValvePosLabel.Text = args.RegValvePos.ToString();
//tDivLabel.Text = args.Tdiv.ToString(); tDivLabel.Text = args.Tdiv.ToString();
///// Bottom part /// Bottom part
//if (currentMetersKind == MetersKind.Single) if (currentMetersKind == MetersKind.Single)
//{ {
// for (int i = 0; i < textBoxesCount; i++) for (int i = 0; i < textBoxesCount; i++)
// { {
// /// TODO: Reimplement /// TODO: Reimplement
// //pulses[i].Text = args.TestResult.Meters[i].PulsesMeter.ToString(); //pulses[i].Text = args.TestResult.Meters[i].PulsesMeter.ToString();
// //refPulses[i].Text = args.TestResult.Meters[i].PulsesMaster.ToString(); //refPulses[i].Text = args.TestResult.Meters[i].PulsesMaster.ToString();
// //volume[i].Text = args.TestResult.Meters[i].VolumeMeter.ToString(); //volume[i].Text = args.TestResult.Meters[i].VolumeMeter.ToString();
// //error[i].Text = args.TestResult.Meters[i].VolumeErrorPct.ToString("F2"); //error[i].Text = args.TestResult.Meters[i].VolumeErrorPct.ToString("F2");
// } }
//} }
//else if (currentMetersKind == MetersKind.Combined) else if (currentMetersKind == MetersKind.Combined)
//{ {
// for (int i = 0; i < 2; i++) for (int i = 0; i < 2; i++)
// { {
// /// TODO: Reimplement /// TODO: Reimplement
// //pulses[i].Text = args.TestResult.Meters[i].PulsesMeter.ToString(); //pulses[i].Text = args.TestResult.Meters[i].PulsesMeter.ToString();
// //refPulses[i].Text = args.TestResult.Meters[i].PulsesMaster.ToString(); //refPulses[i].Text = args.TestResult.Meters[i].PulsesMaster.ToString();
// //volume[i].Text = args.TestResult.Meters[i].VolumeMeter.ToString(); //volume[i].Text = args.TestResult.Meters[i].VolumeMeter.ToString();
// //error[i].Text = args.TestResult.Meters[i].VolumeErrorPct.ToString("F2"); //error[i].Text = args.TestResult.Meters[i].VolumeErrorPct.ToString("F2");
// } }
// /// TODO: Reimplement /// TODO: Reimplement
// //volume1zLabel.Text = args.TestResult.CombinedMeters[0].VolumeMeter.ToString(); //volume1zLabel.Text = args.TestResult.CombinedMeters[0].VolumeMeter.ToString();
// //error1zLabel.Text = args.TestResult.CombinedMeters[0].VolumeErrorPct.ToString("F2"); //error1zLabel.Text = args.TestResult.CombinedMeters[0].VolumeErrorPct.ToString("F2");
//} }
//massLabel.Text = args.Mass.ToString(); massLabel.Text = args.Mass.ToString();
//if (args.Mass.Valid && args.StartMass.Valid) if (args.Mass.Valid && args.StartMass.Valid)
//{ {
// massDiffLabel.Text = (args.Mass.Val - args.StartMass.Val).ToString(args.Mass.Format); massDiffLabel.Text = (args.Mass.Val - args.StartMass.Val).ToString(args.Mass.Format);
//} }
//if (pumpOn != args.PumpOn || diverterToTank != args.DivToTank) if (pumpOn != args.PumpOn || diverterToTank != args.DivToTank)
//{ {
// //if (pumpOn != args.PumpOn) //if (pumpOn != args.PumpOn)
// //{ //{
// // if (pumpOn) pumpPictureBox.Image = System.Resources. // if (pumpOn) pumpPictureBox.Image = System.Resources.
// // else pumpPictureBox.Image = System.Resources. // else pumpPictureBox.Image = System.Resources.
// //} //}
// pumpOn = args.PumpOn; pumpOn = args.PumpOn;
// diverterToTank = args.DivToTank; diverterToTank = args.DivToTank;
// Invalidate(); Invalidate();
//} }
} }
} }
TestBenchFramework/Screens/ProcessTabPageCtrl6.cs
+4 -4
View File
@@ -45,12 +45,12 @@ namespace TBF.Screens
else else
OnTestSelected(sender, args); OnTestSelected(sender, args);
}; };
Bridge.TestProgressHandler += delegate(object sender, TestProgressEventArgs args) Bridge.ProcessDataHandler += delegate(object sender, ProcessDataEventArgs args)
{ {
if (InvokeRequired) if (InvokeRequired)
Invoke(new EventHandler<TestProgressEventArgs>(OnTestProgress), sender, args); Invoke(new EventHandler<ProcessDataEventArgs>(OnProcessDataChanged), sender, args);
else else
OnTestProgress(sender, args); OnProcessDataChanged(sender, args);
}; };
Bridge.TestCompletedHandler += delegate(object sender, TestCompletedEventArgs args) Bridge.TestCompletedHandler += delegate(object sender, TestCompletedEventArgs args)
{ {
@@ -352,7 +352,7 @@ namespace TBF.Screens
} }
} }
void OnTestProgress(object sender, TestProgressEventArgs args) void OnProcessDataChanged(object sender, ProcessDataEventArgs args)
{ {
/// Top part /// Top part
//airTempLabel.Text = args.AmbientTemp.ToString(); //airTempLabel.Text = args.AmbientTemp.ToString();
TestBenchFramework/UiBridge/Bridge.cs
+13 -1
View File
@@ -81,7 +81,19 @@ namespace TBF.UiBridge
/// <summary> /// <summary>
/// Called from the state machine when test process data change and UI needs to be updated. /// Called from the state machine when process data changed and UI needs to be updated.
/// </summary>
public static void OnProcessData(object sender, ProcessDataEventArgs data)
{
if (ProcessDataHandler == null) return;
try { ProcessDataHandler(sender, data); }
catch (Exception e) { log.Error("ProcessDataHandler(...) failed", e); }
}
public static event EventHandler<ProcessDataEventArgs> ProcessDataHandler;
/// <summary>
/// Called from the state machine when progress bars need to be updated.
/// </summary> /// </summary>
public static void OnTestProgress(object sender, TestProgressEventArgs data) public static void OnTestProgress(object sender, TestProgressEventArgs data)
{ {
TestBenchFramework/UiBridge/ProcessDataEventArgs.cs
-5
View File
@@ -13,11 +13,6 @@ namespace TBF.UiBridge
public int Repeats; public int Repeats;
public int RepetitionNr; public int RepetitionNr;
public Config.Entities.Progress Phase;
public int Progress; /// value in the range 0..100
public float OveralProgress;
public int RefPulses; /// Reference pulses count since the test start public int RefPulses; /// Reference pulses count since the test start
public FloatBox RegValvePos; /// Current regulation valve position in [%] (0 .. 100.0) public FloatBox RegValvePos; /// Current regulation valve position in [%] (0 .. 100.0)
public FloatBox FlowMtrFreq; /// Current reference flowmeter frequency in [Hz] (0 .. 2000.0 in case within range) public FloatBox FlowMtrFreq; /// Current reference flowmeter frequency in [Hz] (0 .. 2000.0 in case within range)