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

More DataEntry.iPerl changes, Oracle DB uses testResult.PurchaseOrder, opto-data logging creates ProcessData folder correctly.

Browse Source
This commit is contained in:
Milan Hanajik 2015-08-24 09:33:13 +02:00
parent 217ceffa67
commit 31fc49485a
6 changed files with 9 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
TestBenchFramework/BenchControl/DB/SensusOracle/Database.cs
View File

@ -358,9 +358,10 @@ namespace TBF.BenchControl.DB.SensusOracle
if (passed)
{
string pOrder = string.IsNullOrEmpty(unsortedResults[0].PurchaseOrder) ? string.Empty : unsortedResults[0].PurchaseOrder;
OracleParameter parm1 = new OracleParameter();
parm1.OracleDbType = OracleDbType.Varchar2;
parm1.Value = "BBAATMXX";
parm1.Value = pOrder;
OracleParameter parm2 = new OracleParameter();
parm2.OracleDbType = OracleDbType.Varchar2;

43
TestBenchFramework/BenchControl/DataEntry/iPerl/EntryForm.cs
View File

@ -186,52 +186,16 @@ namespace TBF.BenchControl.DataEntry.iPerl
if (dlg != null)
{
purchaseOrder = dlg.PurchaseOrder;
for (int i = 0; i < Math.Min(dlg.WaterMetersCount, waterMeters.Count); i++)
{
if (waterMeters[i] != null)
{
serialNr[i] = waterMeters[i].SerialNr = dlg.SNText[i];
disabled[i] = waterMeters[i].Disabled = dlg.Disabled[i];
}
}
}
}
else if (currentOp == CurrentOp.ShowFormAtCycleEnd)
{
CycleEndForm dlg = (modelessDlg as CycleEndForm);
int count = waterMeters.Count;
if ((dlg != null) && (count > dlg.WaterMetersCount)) count = dlg.WaterMetersCount;
for (int i = 0; i < count; i++)
{
if (waterMeters[i] != null)
{
/// In case entryFormCfg.ShowCycleEndForm == false dlg would be null, values would be string.Empty
wmCycleEndState[i] = waterMeters[i].EndState = (dlg != null) ? dlg.EndStateText[i] : string.Empty;
}
}
}
else if (modelessDlg is TestStartEndForm && currentOp == CurrentOp.EnterTestStartStates)
{
/// Fixed start test - start
TestStartEndForm dlg = (modelessDlg as TestStartEndForm);
for (int i = 0; i < dlg.WaterMetersCount; i++)
{
wmStartState[i] = dlg.WMStartState[i];
wmStartStateStr[i] = dlg.WMStartStateStr[i];
}
}
else if (modelessDlg is TestStartEndForm && currentOp == CurrentOp.EnterTestEndStates)
{
/// Fixed start test - end
TestStartEndForm dlg = (modelessDlg as TestStartEndForm);
for (int i = 0; i < dlg.WaterMetersCount; i++)
{
wmEndState[i] = dlg.WMEndState[i];
}
}
resultSaved = true;
modelessDlg = null;
@ -263,13 +227,6 @@ namespace TBF.BenchControl.DataEntry.iPerl
if (testRslt.MetersKind != Entities.MetersKind.Single) continue;
testRslt.PurchaseOrder = PurchaseOrder;
for (int i = 0; i < testRslt.Meters.Count; i++)
{
testRslt.Meters[i].SerialNr = SerialNr(i);
testRslt.Meters[i].Disabled = Disabled(i);
testRslt.Meters[i].EndState = WMCycleEndState(i);
}
}
}
}

2
TestBenchFramework/BenchControl/DataEntry/iPerl/EntryFormCfg.cs
View File

@ -22,7 +22,7 @@ namespace TBF.BenchControl.DataEntry.iPerl
/// Private parameterless constructor invoked by all other (public) constructors
EntryFormCfg()
{
Name = "DataEntry-Standard-24";
Name = "DataEntry-iPerl";
ParentName = string.Empty;
ShowCycleEndForm = false;
}

2
TestBenchFramework/BenchControl/DataEntry/iPerl/EntryFormFactory.cs
View File

@ -7,7 +7,7 @@ namespace TBF.BenchControl.DataEntry.iPerl
{
public class EntryFormFactory : IComponentFactory
{
public string ClassName { get { return "DataEntry-Standard-24"; } }
public string ClassName { get { return "DataEntry-iPerl"; } }
public void ResetStaticProperties() { EntryForm.ResetStaticProperties(); }

3
TestBenchFramework/BenchControl/TbfComponents.cs
View File

@ -28,7 +28,8 @@ namespace TBF.BenchControl
Factories.Add(new DataEntry.Munich3.EntryFormFactory());
Factories.Add(new DataEntry.Munich.EntryFormFactory());
#endif
Factories.Add(new DataEntry.Standard.EntryFormFactory());
Factories.Add(new DataEntry.iPerl.EntryFormFactory());
Factories.Add(new DataEntry.Standard.EntryFormFactory());
Factories.Add(new DataEntry.Standard24.EntryFormFactory());
Factories.Add(new Elde.Diverter.DiverterFactory());
Factories.Add(new TestMethods.FixedStartCombinedMeters.TestMethodFactory());

4
TestBenchFramework/BenchControl/WaterMeters/iPerl/WaterMeter.cs
View File

@ -412,7 +412,9 @@ namespace TBF.BenchControl.WaterMeters.iPerl
void SaveOptoData()
{
TextWriter optoLogFile = new StreamWriter("C:\\TBF\\ProcessData\\" + optoDataLogFileName + ".txt");
string directory = "C:\\TBF\\ProcessData\\"; /// TODO: determine correct relative path
Directory.CreateDirectory(directory);
TextWriter optoLogFile = new StreamWriter(directory + optoDataLogFileName + ".txt");
for (int i = 0; i < optoDataCount; i++) optoLogFile.WriteLine(optoData[i].ToString());
optoLogFile.Close();
}