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

Static counters added (not mapped to DB now), ver. 2.18.1213

Browse Source
This commit is contained in:
Milan Hanajik 2019-05-06 16:16:00 +02:00
parent f8a2126c90
commit d197629cdb
19 changed files with 250 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Results/Entities/Batch.cs
View File

@ -29,7 +29,17 @@ namespace Results.Entities
public virtual float DensityCorr { get; set; } /// Density correction in [kg/m3]
public virtual float Custom2 { get; set; }
public virtual float Custom3 { get; set; }
public virtual DateTime StartTime { get; set; }
public virtual int Counter1 { get; set; }
public virtual int Counter2 { get; set; }
public virtual int Counter3 { get; set; }
public virtual int Counter4 { get; set; }
public virtual int Counter5 { get; set; }
public virtual int Counter6 { get; set; }
public virtual int Counter7 { get; set; }
public virtual int Counter8 { get; set; }
public virtual int Counter9 { get; set; }
public virtual int Counter10 { get; set; }
public virtual DateTime StartTime { get; set; }
public virtual DateTime EndTime { get; set; }
public virtual bool Dirty { get; set; }
public virtual bool RsltsSent { get; set; }
@ -38,7 +48,7 @@ namespace Results.Entities
public virtual IList<WaterMeter> WaterMeters { get; set; }
public virtual IList<TestRslt> TestRslts { get; set; }
public virtual bool Compound { get; set; } /// Not mapped to DB now
public virtual bool HeatMeter { get; set; } /// Not mapped to DB now
public virtual bool HeatMeter { get; set; } /// Not mapped to DB now ///
public Batch()
{

11
Results/ItemID.cs
View File

@ -303,6 +303,17 @@ namespace Results
RefFlowmeter, /// 257
Test_Method_Elde, /// 258
Counter1, /// 259 counterIdx0 = 0
Counter2, /// 260 counterIdx0 = 1
Counter3, /// 261 counterIdx0 = 2
Counter4, /// 262 counterIdx0 = 3
Counter5, /// 263 counterIdx0 = 4
Counter6, /// 264 counterIdx0 = 5
Counter7, /// 265 counterIdx0 = 6
Counter8, /// 266 counterIdx0 = 7
Counter9, /// 267 counterIdx0 = 8
Counter10, /// 268 counterIdx0 = 9
Count,
}
}

4
Results/Properties/AssemblyInfo.cs
View File

@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.18.1209.0")]
[assembly: AssemblyFileVersion("2.18.1209.0")]
[assembly: AssemblyVersion("2.18.1213.0")]
[assembly: AssemblyFileVersion("2.18.1213.0")]

9
Results/Resources/Strings.Designer.cs generated
View File

@ -204,6 +204,15 @@ namespace Results.Resources {
}
}
/// <summary>
/// Looks up a localized string similar to Counter {0}.
/// </summary>
internal static string Counter_0 {
get {
return ResourceManager.GetString("Counter_0", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Density.
/// </summary>

3
Results/Resources/Strings.resx
View File

@ -765,4 +765,7 @@
<data name="Test_in_progress" xml:space="preserve">
<value>Test in progress</value>
</data>
<data name="Counter_0" xml:space="preserve">
<value>Counter {0}</value>
</data>
</root>

18
Results/Utils.cs
View File

@ -82,5 +82,23 @@ namespace Results
return (useRedGreenColor) ? (passed ? "OK|Green" : "NOK|Red") : (passed ? "OK|White" : "NOK|White");
#endif
}
public static void GetCounterStates(Results.Entities.Batch batch, int[] counters)
{
if (batch != null)
{
batch.Counter1 = ((counters != null) && (counters.Length >= 1)) ? counters[0] : 0;
batch.Counter2 = ((counters != null) && (counters.Length >= 2)) ? counters[1] : 0;
batch.Counter3 = ((counters != null) && (counters.Length >= 3)) ? counters[2] : 0;
batch.Counter4 = ((counters != null) && (counters.Length >= 4)) ? counters[3] : 0;
batch.Counter5 = ((counters != null) && (counters.Length >= 5)) ? counters[4] : 0;
batch.Counter6 = ((counters != null) && (counters.Length >= 6)) ? counters[5] : 0;
batch.Counter7 = ((counters != null) && (counters.Length >= 7)) ? counters[6] : 0;
batch.Counter8 = ((counters != null) && (counters.Length >= 8)) ? counters[7] : 0;
batch.Counter9 = ((counters != null) && (counters.Length >= 9)) ? counters[8] : 0;
batch.Counter10 = ((counters != null) && (counters.Length >= 10)) ? counters[9] : 0;
}
}
}
}

13
Results/WMeterRsltItemSpec.cs
View File

@ -480,7 +480,18 @@ namespace Results
AllItems.Add(new WMeterRsltItemSpec(ItemID.Table_row_nr, "Table row #", Quantity.Number, ItemCategory.Other, (w, t, u, f, p) => string.IsNullOrEmpty(f) ? TableRowNr.ToString() : string.Format(f, TableRowNr)));
AllItems.Add(new WMeterRsltItemSpec(ItemID.Table_column_nr, "Table column #", Quantity.Number, ItemCategory.Other, (w, t, u, f, p) => string.IsNullOrEmpty(f) ? TableColumnNr.ToString() : string.Format(f, TableColumnNr)));
AllItems.Add(new WMeterRsltItemSpec(ItemID.WMRemark, string.Format("{0} {1}", Strings.Water_Meter, Strings.Remark), Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.Remark)));
}
AllItems.Add(new WMeterRsltItemSpec(ItemID.Counter1, string.Format(Strings.Counter_0, 1), Quantity.Number, ItemCategory.Other, (w, t, u, f, p) => FormatInt(f, w.Batch.Counter1)));
AllItems.Add(new WMeterRsltItemSpec(ItemID.Counter2, string.Format(Strings.Counter_0, 2), Quantity.Number, ItemCategory.Other, (w, t, u, f, p) => FormatInt(f, w.Batch.Counter2)));
AllItems.Add(new WMeterRsltItemSpec(ItemID.Counter3, string.Format(Strings.Counter_0, 3), Quantity.Number, ItemCategory.Other, (w, t, u, f, p) => FormatInt(f, w.Batch.Counter3)));
AllItems.Add(new WMeterRsltItemSpec(ItemID.Counter4, string.Format(Strings.Counter_0, 4), Quantity.Number, ItemCategory.Other, (w, t, u, f, p) => FormatInt(f, w.Batch.Counter4)));
AllItems.Add(new WMeterRsltItemSpec(ItemID.Counter5, string.Format(Strings.Counter_0, 5), Quantity.Number, ItemCategory.Other, (w, t, u, f, p) => FormatInt(f, w.Batch.Counter5)));
AllItems.Add(new WMeterRsltItemSpec(ItemID.Counter6, string.Format(Strings.Counter_0, 6), Quantity.Number, ItemCategory.Other, (w, t, u, f, p) => FormatInt(f, w.Batch.Counter6)));
AllItems.Add(new WMeterRsltItemSpec(ItemID.Counter7, string.Format(Strings.Counter_0, 7), Quantity.Number, ItemCategory.Other, (w, t, u, f, p) => FormatInt(f, w.Batch.Counter7)));
AllItems.Add(new WMeterRsltItemSpec(ItemID.Counter8, string.Format(Strings.Counter_0, 8), Quantity.Number, ItemCategory.Other, (w, t, u, f, p) => FormatInt(f, w.Batch.Counter8)));
AllItems.Add(new WMeterRsltItemSpec(ItemID.Counter9, string.Format(Strings.Counter_0, 9), Quantity.Number, ItemCategory.Other, (w, t, u, f, p) => FormatInt(f, w.Batch.Counter9)));
AllItems.Add(new WMeterRsltItemSpec(ItemID.Counter10, string.Format(Strings.Counter_0, 10), Quantity.Number, ItemCategory.Other, (w, t, u, f, p) => FormatInt(f, w.Batch.Counter10)));
}
/// To be updated by Output.FileWriter or Output.Printer
public static int TableRowNr;

9
TBF/BenchControl/Sequences/MainSeq.cs
View File

@ -1187,8 +1187,13 @@ namespace TBF.BenchControl.Sequences
dataEntryCmpnt.UpdateTestResults(BatchRslts);
}
ProcessData.BatchRslts.Batch.EndTime = DateTime.Now;
ProcessData.BatchRslts.AddWaterMetersToBatch();
if (TBF.BenchControl.Sequences.ProcessData.BatchRslts != null && Program.LocalSettings != null)
{
Results.Utils.GetCounterStates(ProcessData.BatchRslts.Batch, Program.LocalSettings.Counters);
}
ProcessData.BatchRslts.Batch.EndTime = DateTime.Now;
ProcessData.BatchRslts.AddWaterMetersToBatch();
//------------------------------------------------------
Bridge.OnActivity(this, Strings.Saving_and_printing_results);

14
TBF/BenchControl/TestMethods/Counter/CounterSeq.cs
View File

@ -19,9 +19,21 @@ namespace TBF.BenchControl.TestMethods.Counter
/// <returns>
/// Event.Done . . . . . . . OK
/// </returns>
public IList<Event> Execute(Test test, int repetitionNr, bool isLastRepetition, DebugMode mode)
public IList<Event> Execute(Test test, int counterIdx0, int repetitionNr, bool isLastRepetition, DebugMode mode)
{
if (Program.LocalSettings.Counters == null || Program.LocalSettings.Counters.Length < counterIdx0 + 1)
{
int[] oriCounters = Program.LocalSettings.Counters;
Program.LocalSettings.Counters = new int[counterIdx0 + 1];
if (oriCounters != null)
{
for (int i = 0; i < oriCounters.Length; i++) Program.LocalSettings.Counters[i] = oriCounters[i];
}
}
Program.LocalSettings.Counters[counterIdx0] = Program.LocalSettings.Counters[counterIdx0] + 1;
TBF.UiBridge.Bridge.OnSaveSettings(this, null);
return new List<Event> { Event.Done };
}

29
TBF/BenchControl/TestMethods/Counter/TestMethod.cs
View File

@ -17,6 +17,21 @@ namespace TBF.BenchControl.TestMethods.Counter
public bool CanTest(MetersKind meters) { return true; }
public bool DoTransitions() { return false; }
/// <summary>
/// Enumeration of counters via static fields and methods
/// </summary>
static int nextCounterIdx = 0;
public static new void ResetStaticProperties()
{
nextCounterIdx = 0;
}
public static int CountersCount { get { return nextCounterIdx; } }
public static TestMethod[] Counters;
///
private int counterIdx0; /// 0-based index of this counter
public TestMethod()
{
}
@ -24,12 +39,22 @@ namespace TBF.BenchControl.TestMethods.Counter
public TestMethod(Generic.IComponentCfg cfg)
: base(cfg)
{
log.Debug(this.ToString());
counterIdx0 = nextCounterIdx++;
///
if (Counters == null || Counters.Length < nextCounterIdx)
{
TestMethod[] contersSoFar = Counters;
Counters = new TestMethod[nextCounterIdx];
if (contersSoFar != null) for (int i = 0; i < contersSoFar.Length; i++) Counters[i] = contersSoFar[i];
Counters[nextCounterIdx - 1] = this;
}
log.Debug(this.ToString());
}
public IList<Event> Execute(Test test, int repetNr, bool isLastRepetition)
{
return (new CounterSeq()).Execute(test, repetNr, isLastRepetition, DebugLevel);
return (new CounterSeq()).Execute(test, counterIdx0, repetNr, isLastRepetition, DebugLevel);
}
}
}

4
TBF/LocalSettings.cs
View File

@ -80,7 +80,9 @@ namespace TBF
public int PopupResultsHeight;
public Config.Entities.CameraDisplayResolution Resolution;
[XmlArrayAttribute("Counters")]
public int[] Counters;
[XmlArrayAttribute("ComponentsColumnWidths")]
public int[] ComponentsColumnWidths;

23
TBF/MainWnd.Designer.cs generated
View File

@ -54,7 +54,7 @@ namespace TBF
this.horizontalSplitContainer = new System.Windows.Forms.SplitContainer();
this.mainTabControl = new System.Windows.Forms.TabControl();
this.homeTabPage = new System.Windows.Forms.TabPage();
this.ctrlBrdComponent = new ControlComponent3Munich.UserControl1();
this.ctrlBrdComponent = new ControlComponent3Munich.UserControl1();
this.processTabPage = new System.Windows.Forms.TabPage();
this.processTabPageCtrl = new TBF.Screens.ProcessTabPageCtrl6();
this.insertTabPage = new System.Windows.Forms.TabPage();
@ -91,6 +91,7 @@ namespace TBF
this.databaseSettingsTSMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.passwortToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.upgradeTSMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.iPerlHeadsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.helpTSMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.aboutTSMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.mainMenuStrip = new System.Windows.Forms.MenuStrip();
@ -98,7 +99,7 @@ namespace TBF
this.processToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.resultsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.graphsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.iPerlHeadsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.clearCountersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
((System.ComponentModel.ISupportInitialize)(this.topVerticalSplitContainer)).BeginInit();
this.topVerticalSplitContainer.Panel1.SuspendLayout();
this.topVerticalSplitContainer.Panel2.SuspendLayout();
@ -496,7 +497,8 @@ namespace TBF
this.databaseSettingsTSMenuItem,
this.passwortToolStripMenuItem,
this.upgradeTSMenuItem,
this.iPerlHeadsToolStripMenuItem});
this.iPerlHeadsToolStripMenuItem,
this.clearCountersToolStripMenuItem});
this.editTSMenuItem.Name = "editTSMenuItem";
resources.ApplyResources(this.editTSMenuItem, "editTSMenuItem");
//
@ -529,6 +531,12 @@ namespace TBF
resources.ApplyResources(this.upgradeTSMenuItem, "upgradeTSMenuItem");
this.upgradeTSMenuItem.Click += new System.EventHandler(this.upgradeTSMenuItem_Click);
//
// iPerlHeadsToolStripMenuItem
//
this.iPerlHeadsToolStripMenuItem.Name = "iPerlHeadsToolStripMenuItem";
resources.ApplyResources(this.iPerlHeadsToolStripMenuItem, "iPerlHeadsToolStripMenuItem");
this.iPerlHeadsToolStripMenuItem.Click += new System.EventHandler(this.iPerlHeadsToolStripMenuItem_Click);
//
// helpTSMenuItem
//
this.helpTSMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@ -581,11 +589,11 @@ namespace TBF
resources.ApplyResources(this.graphsToolStripMenuItem, "graphsToolStripMenuItem");
this.graphsToolStripMenuItem.Click += new System.EventHandler(this.graphsToolStripMenuItem_Click);
//
// iPerlHeadsToolStripMenuItem
// clearCountersToolStripMenuItem
//
this.iPerlHeadsToolStripMenuItem.Name = "iPerlHeadsToolStripMenuItem";
resources.ApplyResources(this.iPerlHeadsToolStripMenuItem, "iPerlHeadsToolStripMenuItem");
this.iPerlHeadsToolStripMenuItem.Click += new System.EventHandler(this.iPerlHeadsToolStripMenuItem_Click);
this.clearCountersToolStripMenuItem.Name = "clearCountersToolStripMenuItem";
resources.ApplyResources(this.clearCountersToolStripMenuItem, "clearCountersToolStripMenuItem");
this.clearCountersToolStripMenuItem.Click += new System.EventHandler(this.clearCountersToolStripMenuItem_Click);
//
// MainWnd
//
@ -735,6 +743,7 @@ namespace TBF
private System.Windows.Forms.TabPage graphsTabPage;
private Screens.GraphsTabPageCtrl graphsTabPageCtrl;
private System.Windows.Forms.ToolStripMenuItem iPerlHeadsToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem clearCountersToolStripMenuItem;
}
}

33
TBF/MainWnd.cs
View File

@ -266,6 +266,12 @@ namespace TBF
if (InvokeRequired) { Invoke(new EventHandler<UiBridge.ProcedureSelectedEventArgs>(OnProcedureSelected), sndr, args); }
else OnProcedureSelected(sndr, args);
};
Bridge.SaveSettingsHandler += delegate(object sndr, UiBridge.SaveSettingsEventArgs args)
{
if (InvokeRequired) { Invoke(new EventHandler<UiBridge.SaveSettingsEventArgs>(OnSaveSettings), sndr, args); }
else OnSaveSettings(sndr, args);
};
}
catch (Exception exc)
{
@ -448,6 +454,11 @@ namespace TBF
IsShutdownDisabled = ((args.Flags & ButtonsEtc.ProcedureCmbBoxEn) == 0);
}
void OnSaveSettings(object sender, SaveSettingsEventArgs args)
{
if (Program.LocalSettings != null) Program.LocalSettings.Save();
}
public void UpdateUser()
{
userInfoStatusLabel.Text = string.Format("{0}: {1}{2}, ", Strings.User, Users.GlobalData.CurrentUser.UserName,
@ -792,5 +803,27 @@ namespace TBF
UpdateUser();
}
}
private void clearCountersToolStripMenuItem_Click(object sender, EventArgs e)
{
Users.Grp.GID[] reqGrpMembership = new Users.Grp.GID[]
{
Users.Grp.GID.TestingSpecialists,
Users.Grp.GID.Metrologists,
Users.Grp.GID.HeadOfLab,
Users.Grp.GID.Administrators,
};
if (new Users.Forms.LoginDlg(reqGrpMembership).ShowDialog() == DialogResult.OK)
{
if ((Program.LocalSettings != null) && (Program.LocalSettings.Counters != null))
{
for (int i = 0; i < Program.LocalSettings.Counters.Length; i++)
{
Program.LocalSettings.Counters[i] = 0;
}
}
}
}
}
}

52
TBF/MainWnd.resx
View File

@ -598,7 +598,7 @@
<value>ctrlBrdComponent</value>
</data>
<data name="&gt;&gt;ctrlBrdComponent.Type" xml:space="preserve">
<value>ControlComponent_Torino2015.UserControl1, ControlComponent3U, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
<value>ControlComponent3Munich.UserControl1, ControlComponent3Munich, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;ctrlBrdComponent.Parent" xml:space="preserve">
<value>homeTabPage</value>
@ -652,7 +652,7 @@
<value>processTabPageCtrl</value>
</data>
<data name="&gt;&gt;processTabPageCtrl.Type" xml:space="preserve">
<value>TBF.Screens.ProcessTabPageCtrl48, TBF, Version=2.18.933.0, Culture=neutral, PublicKeyToken=null</value>
<value>TBF.Screens.ProcessTabPageCtrl6, TBF, Version=2.18.1211.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;processTabPageCtrl.Parent" xml:space="preserve">
<value>processTabPage</value>
@ -730,7 +730,7 @@
<value>resultsTabPageCtrl</value>
</data>
<data name="&gt;&gt;resultsTabPageCtrl.Type" xml:space="preserve">
<value>TBF.Screens.ResultsTabPageCtrl, TBF, Version=2.18.933.0, Culture=neutral, PublicKeyToken=null</value>
<value>TBF.Screens.ResultsTabPageCtrl, TBF, Version=2.18.1211.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;resultsTabPageCtrl.Parent" xml:space="preserve">
<value>resultsTabPage</value>
@ -781,7 +781,7 @@
<value>graphsTabPageCtrl</value>
</data>
<data name="&gt;&gt;graphsTabPageCtrl.Type" xml:space="preserve">
<value>TBF.Screens.GraphsTabPageCtrl, TBF, Version=2.18.933.0, Culture=neutral, PublicKeyToken=null</value>
<value>TBF.Screens.GraphsTabPageCtrl, TBF, Version=2.18.1211.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;graphsTabPageCtrl.Parent" xml:space="preserve">
<value>graphsTabPage</value>
@ -835,7 +835,7 @@
<value>logsTabPageCtrl</value>
</data>
<data name="&gt;&gt;logsTabPageCtrl.Type" xml:space="preserve">
<value>TBF.Screens.LogsTabPageCtrl, TBF, Version=2.18.933.0, Culture=neutral, PublicKeyToken=null</value>
<value>TBF.Screens.LogsTabPageCtrl, TBF, Version=2.18.1211.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;logsTabPageCtrl.Parent" xml:space="preserve">
<value>logsTabPage</value>
@ -886,7 +886,7 @@
<value>picturesTabPageCtrl</value>
</data>
<data name="&gt;&gt;picturesTabPageCtrl.Type" xml:space="preserve">
<value>TBF.Screens.PicturesTabPageCtrl, TBF, Version=2.18.933.0, Culture=neutral, PublicKeyToken=null</value>
<value>TBF.Screens.PicturesTabPageCtrl, TBF, Version=2.18.1211.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;picturesTabPageCtrl.Parent" xml:space="preserve">
<value>picturesTabPage</value>
@ -1132,7 +1132,7 @@
<value>MeasurementTabPageCtrl</value>
</data>
<data name="&gt;&gt;MeasurementTabPageCtrl.Type" xml:space="preserve">
<value>TBF.Screens.MeasurementTabPageCtrl, TBF, Version=2.18.933.0, Culture=neutral, PublicKeyToken=null</value>
<value>TBF.Screens.MeasurementTabPageCtrl, TBF, Version=2.18.1211.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;MeasurementTabPageCtrl.Parent" xml:space="preserve">
<value>measurementTabPage</value>
@ -1198,34 +1198,34 @@
<value>1</value>
</data>
<data name="benchComponentsTSMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>143, 22</value>
<value>152, 22</value>
</data>
<data name="benchComponentsTSMenuItem.Text" xml:space="preserve">
<value>Components</value>
</data>
<data name="benchPathsTSMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>143, 22</value>
<value>152, 22</value>
</data>
<data name="benchPathsTSMenuItem.Text" xml:space="preserve">
<value>Paths</value>
</data>
<data name="benchTransitionsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>143, 22</value>
<value>152, 22</value>
</data>
<data name="benchTransitionsToolStripMenuItem.Text" xml:space="preserve">
<value>Transitions</value>
</data>
<data name="benchMetrologyTSMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>143, 22</value>
<value>152, 22</value>
</data>
<data name="benchMetrologyTSMenuItem.Text" xml:space="preserve">
<value>Metrology</value>
</data>
<data name="toolStripSeparator1.Size" type="System.Drawing.Size, System.Drawing">
<value>140, 6</value>
<value>149, 6</value>
</data>
<data name="exitToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>143, 22</value>
<value>152, 22</value>
</data>
<data name="exitToolStripMenuItem.Text" xml:space="preserve">
<value>Exit</value>
@ -1255,41 +1255,47 @@
<value>Logs</value>
</data>
<data name="usersTSMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>133, 22</value>
<value>152, 22</value>
</data>
<data name="usersTSMenuItem.Text" xml:space="preserve">
<value>Users</value>
</data>
<data name="localSettingsTSMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>133, 22</value>
<value>152, 22</value>
</data>
<data name="localSettingsTSMenuItem.Text" xml:space="preserve">
<value>Language</value>
</data>
<data name="databaseSettingsTSMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>133, 22</value>
<value>152, 22</value>
</data>
<data name="databaseSettingsTSMenuItem.Text" xml:space="preserve">
<value>Database</value>
</data>
<data name="passwortToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>133, 22</value>
<value>152, 22</value>
</data>
<data name="passwortToolStripMenuItem.Text" xml:space="preserve">
<value>Password</value>
</data>
<data name="upgradeTSMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>133, 22</value>
<value>152, 22</value>
</data>
<data name="upgradeTSMenuItem.Text" xml:space="preserve">
<value>Upgrade</value>
</data>
<data name="iPerlHeadsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>133, 22</value>
<value>152, 22</value>
</data>
<data name="iPerlHeadsToolStripMenuItem.Text" xml:space="preserve">
<value>iPerl Heads</value>
</data>
<data name="clearCountersToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>152, 22</value>
</data>
<data name="clearCountersToolStripMenuItem.Text" xml:space="preserve">
<value>Clear Counters</value>
</data>
<data name="editTSMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>61, 20</value>
</data>
@ -1297,7 +1303,7 @@
<value>Settings</value>
</data>
<data name="aboutTSMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>107, 22</value>
<value>152, 22</value>
</data>
<data name="aboutTSMenuItem.Text" xml:space="preserve">
<value>About</value>
@ -1536,6 +1542,12 @@
<data name="&gt;&gt;graphsToolStripMenuItem.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;clearCountersToolStripMenuItem.Name" xml:space="preserve">
<value>clearCountersToolStripMenuItem</value>
</data>
<data name="&gt;&gt;clearCountersToolStripMenuItem.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;$this.Name" xml:space="preserve">
<value>MainWnd</value>
</data>

4
TBF/Properties/AssemblyInfo.cs
View File

@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number
// Revision
//
[assembly: AssemblyVersion("2.18.1211.0")]
[assembly: AssemblyFileVersion("2.18.1211.0")]
[assembly: AssemblyVersion("2.18.1213.0")]
[assembly: AssemblyFileVersion("2.18.1213.0")]

29
TBF/Screens/ResultsTabPageCtrl.cs
View File

@ -92,12 +92,20 @@ namespace TBF.Screens
void OnProcedureSelected(object sender, ProcedureSelectedEventArgs args)
{
RedrawAll(TBF.BenchControl.Sequences.ProcessData.BatchRslts);
if ((TBF.BenchControl.Sequences.ProcessData.BatchRslts != null) && (Program.LocalSettings != null))
{
Results.Utils.GetCounterStates(TBF.BenchControl.Sequences.ProcessData.BatchRslts.Batch, Program.LocalSettings.Counters);
}
RedrawAll(TBF.BenchControl.Sequences.ProcessData.BatchRslts);
}
void OnTestCompleted(object sender, TestCompletedEventArgs args)
{
RedrawAll(TBF.BenchControl.Sequences.ProcessData.BatchRslts);
if ((TBF.BenchControl.Sequences.ProcessData.BatchRslts != null) && (Program.LocalSettings != null))
{
Results.Utils.GetCounterStates(TBF.BenchControl.Sequences.ProcessData.BatchRslts.Batch, Program.LocalSettings.Counters);
}
RedrawAll(TBF.BenchControl.Sequences.ProcessData.BatchRslts);
}
void OnButtonsEtc(object sender, UiBridge.ButtonsEtcEventArgs args)
@ -140,7 +148,10 @@ namespace TBF.Screens
label5.Text = "Vrátiť na predch. krok";
label5.Visible = true;
#endif
if ((TBF.BenchControl.Sequences.ProcessData.BatchRslts != null) && (Program.LocalSettings != null))
{
Results.Utils.GetCounterStates(TBF.BenchControl.Sequences.ProcessData.BatchRslts.Batch, Program.LocalSettings.Counters);
}
RedrawAll(TBF.BenchControl.Sequences.ProcessData.BatchRslts);
}
@ -209,7 +220,11 @@ namespace TBF.Screens
Program.LocalSettings.Save();
}
RedrawAll(TBF.BenchControl.Sequences.ProcessData.BatchRslts);
if ((TBF.BenchControl.Sequences.ProcessData.BatchRslts != null) && (Program.LocalSettings != null))
{
Results.Utils.GetCounterStates(TBF.BenchControl.Sequences.ProcessData.BatchRslts.Batch, Program.LocalSettings.Counters);
}
RedrawAll(TBF.BenchControl.Sequences.ProcessData.BatchRslts);
}
/// <summary>
@ -573,7 +588,11 @@ namespace TBF.Screens
}
Program.LocalSettings.Save();
RedrawAll(TBF.BenchControl.Sequences.ProcessData.BatchRslts);
if ((TBF.BenchControl.Sequences.ProcessData.BatchRslts != null) && (Program.LocalSettings != null))
{
Results.Utils.GetCounterStates(TBF.BenchControl.Sequences.ProcessData.BatchRslts.Batch, Program.LocalSettings.Counters);
}
RedrawAll(TBF.BenchControl.Sequences.ProcessData.BatchRslts);
}
}
}

1
TBF/TBF.csproj
View File

@ -2179,6 +2179,7 @@
<Compile Include="UiBridge\ProcedureSelectedEventArgs.cs" />
<Compile Include="UiBridge\ProcessDataEventArgs.cs" />
<Compile Include="UiBridge\PulsesTestInProgressEventArgs.cs" />
<Compile Include="UiBridge\SaveSettingsEventArgs.cs" />
<Compile Include="UiBridge\StateChangedEventArgs.cs" />
<Compile Include="UiBridge\TestCompletedEventArgs.cs" />
<Compile Include="UiBridge\TestProgressEventArgs.cs" />

11
TBF/UiBridge/Bridge.cs
View File

@ -253,5 +253,16 @@ namespace TBF.UiBridge
catch (Exception e) { log.Error("ImageHandler(...) failed", e); }
}
public static event EventHandler<ImageEventArgs> ImageHandler;
/// <summary>
/// Called from TestMethods.Counter component when counters in LocalSettings should be saved.
/// </summary>
public static void OnSaveSettings(object sender, SaveSettingsEventArgs data)
{
if (SaveSettingsHandler == null) return;
try { SaveSettingsHandler(sender, data); }
catch (Exception e) { log.Error("SaveSettingsHandler(...) failed", e); }
}
public static event EventHandler<SaveSettingsEventArgs> SaveSettingsHandler;
}
}

14
TBF/UiBridge/SaveSettingsEventArgs.cs Normal file
View File

@ -0,0 +1,14 @@
///
/// Copyright (c) 2019 Sensus Slovensko a.s.
///
using System;
namespace TBF.UiBridge
{
public class SaveSettingsEventArgs : EventArgs
{
public SaveSettingsEventArgs()
{
}
}
}