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

Refactorization : BenchControl -> Rig

Browse Source
This commit is contained in:
Milan Hanajik
2021-03-05 16:12:24 +01:00
parent 84c8ec26b6
commit 6cf3bd6160
1461 changed files with 6330 additions and 6330 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/UI/ResultsMI/PreviousResultsDlg.cs
+5 -5
View File
@@ -9,7 +9,7 @@ using log4net;
using Oracle.DataAccess.Client;
using Results;
using Results.Entities;
using TBF.BenchControl.Output.DB.SensusOracle;
using TBF.Rig.Output.DB.SensusOracle;
using TBF.Resources;
namespace TBF.UI.ResultsMI
@@ -225,8 +225,8 @@ namespace TBF.UI.ResultsMI
return;
}
TBF.BenchControl.Output.DB.SensusOracle.DatabaseCfg cfg = TBF.BenchControl.ComponentCfgBase.CreateFromDbEntity(DatabaseCfg.Serializer, cmpntEntities[0], null)
as TBF.BenchControl.Output.DB.SensusOracle.DatabaseCfg;
TBF.Rig.Output.DB.SensusOracle.DatabaseCfg cfg = TBF.Rig.ComponentCfgBase.CreateFromDbEntity(DatabaseCfg.Serializer, cmpntEntities[0], null)
as TBF.Rig.Output.DB.SensusOracle.DatabaseCfg;
/// TODO: Implement database selection
MessageBox.Show(string.Format("Výsledky budú zapísané do produkčnej databázy"),
@@ -250,8 +250,8 @@ namespace TBF.UI.ResultsMI
}
if ((TBF.BenchControl.Sequences.ProcessData.OracleDB != null) &&
(TBF.BenchControl.Sequences.ProcessData.OracleDB.WriteResultsToDB(conn, b, true) == Retv.OK))
if ((TBF.Rig.Sequences.ProcessData.OracleDB != null) &&
(TBF.Rig.Sequences.ProcessData.OracleDB.WriteResultsToDB(conn, b, true) == Retv.OK))
{
b.RsltsSent = true; /// Result was successfully sent
session.SaveOrUpdate(b); /// Update MySQL DB
TBF/UI/ResultsMI/ResultsTabPageCtrl.cs
+16 -16
View File
@@ -118,7 +118,7 @@ namespace TBF.UI.ResultsMI
void OnProcedureSelected(object sender, ProcedureSelectedEventArgs args)
{
BatchResults batchResults = TBF.BenchControl.Sequences.ProcessData.BatchRslts;
BatchResults batchResults = TBF.Rig.Sequences.ProcessData.BatchRslts;
metersKind = batchResults.Batch.Compound ? MetersKind.Combined : (batchResults.Batch.HeatMeter ? MetersKind.HeatMeter : MetersKind.Single);
UpdateItems(GetRsltItems(metersKind));
@@ -133,7 +133,7 @@ namespace TBF.UI.ResultsMI
void OnTestCompleted(object sender, TestCompletedEventArgs args)
{
BatchResults batchResults = TBF.BenchControl.Sequences.ProcessData.BatchRslts;
BatchResults batchResults = TBF.Rig.Sequences.ProcessData.BatchRslts;
if ((batchResults != null) && (Program.LocalSettings != null))
{
@@ -141,7 +141,7 @@ namespace TBF.UI.ResultsMI
}
if (IsLayoutChangedDueToData(batchResults)) CreateControlsAndFillPanel(batchResults);
UpdateResults(TBF.BenchControl.Sequences.ProcessData.BatchRslts);
UpdateResults(TBF.Rig.Sequences.ProcessData.BatchRslts);
}
void OnButtonsEtc(object sender, UiBridge.ButtonsEtcEventArgs args)
@@ -184,13 +184,13 @@ namespace TBF.UI.ResultsMI
label5.Text = "Vrátiť na predch. krok";
label5.Visible = true;
#endif
if ((TBF.BenchControl.Sequences.ProcessData.BatchRslts != null) && (Program.LocalSettings != null))
if ((TBF.Rig.Sequences.ProcessData.BatchRslts != null) && (Program.LocalSettings != null))
{
Results.Utils.GetCounterStates(TBF.BenchControl.Sequences.ProcessData.BatchRslts.Batch, Program.LocalSettings.Counters);
Results.Utils.GetCounterStates(TBF.Rig.Sequences.ProcessData.BatchRslts.Batch, Program.LocalSettings.Counters);
}
CreateControlsAndFillPanel(TBF.BenchControl.Sequences.ProcessData.BatchRslts);
UpdateResults(TBF.BenchControl.Sequences.ProcessData.BatchRslts);
CreateControlsAndFillPanel(TBF.Rig.Sequences.ProcessData.BatchRslts);
UpdateResults(TBF.Rig.Sequences.ProcessData.BatchRslts);
}
@@ -271,17 +271,17 @@ namespace TBF.UI.ResultsMI
Program.LocalSettings.Save();
if ((TBF.BenchControl.Sequences.ProcessData.BatchRslts != null) && (Program.LocalSettings != null))
if ((TBF.Rig.Sequences.ProcessData.BatchRslts != null) && (Program.LocalSettings != null))
{
Results.Utils.GetCounterStates(TBF.BenchControl.Sequences.ProcessData.BatchRslts.Batch, Program.LocalSettings.Counters);
Results.Utils.GetCounterStates(TBF.Rig.Sequences.ProcessData.BatchRslts.Batch, Program.LocalSettings.Counters);
}
if (isLayoutChangedDueToConfig)
{
CreateControlsAndFillPanel(TBF.BenchControl.Sequences.ProcessData.BatchRslts);
CreateControlsAndFillPanel(TBF.Rig.Sequences.ProcessData.BatchRslts);
}
UpdateResults(TBF.BenchControl.Sequences.ProcessData.BatchRslts);
UpdateResults(TBF.Rig.Sequences.ProcessData.BatchRslts);
}
}
@@ -300,9 +300,9 @@ namespace TBF.UI.ResultsMI
}
Program.LocalSettings.Save();
if ((TBF.BenchControl.Sequences.ProcessData.BatchRslts != null) && (Program.LocalSettings != null))
if ((TBF.Rig.Sequences.ProcessData.BatchRslts != null) && (Program.LocalSettings != null))
{
Results.Utils.GetCounterStates(TBF.BenchControl.Sequences.ProcessData.BatchRslts.Batch, Program.LocalSettings.Counters);
Results.Utils.GetCounterStates(TBF.Rig.Sequences.ProcessData.BatchRslts.Batch, Program.LocalSettings.Counters);
}
UpdateColumnWidths(Program.LocalSettings.RsltsClmnWidths);
@@ -329,10 +329,10 @@ namespace TBF.UI.ResultsMI
///
void OnDoubleClick(object sender, WaterMeterEventArgs args)
{
if (TBF.BenchControl.Sequences.ProcessData.BatchRslts.Batch != null &&
TBF.BenchControl.Sequences.ProcessData.BatchRslts.Batch.WaterMeters != null)
if (TBF.Rig.Sequences.ProcessData.BatchRslts.Batch != null &&
TBF.Rig.Sequences.ProcessData.BatchRslts.Batch.WaterMeters != null)
{
foreach (var wm in TBF.BenchControl.Sequences.ProcessData.BatchRslts.Batch.WaterMeters)
foreach (var wm in TBF.Rig.Sequences.ProcessData.BatchRslts.Batch.WaterMeters)
{
if (wm.WMPosition == args.WMPosition)
{