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

LS.iPerlCommunicationsFormCheckBoxes -> OptoHeadsEnabled, MainWnd.optoHeadsToolStripMenuItem (+ visibility)

Browse Source
This commit is contained in:
Milan Hanajik 2021-07-15 10:31:32 +02:00
parent 674dde8d74
commit 61ecb23294
6 changed files with 46 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs
View File

@ -681,7 +681,7 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication
TBF.LocalSettings ls = Program.LocalSettings; TBF.LocalSettings ls = Program.LocalSettings;
Left = (ls.iPerlCommunicationsFormLeft != 0) ? ls.iPerlCommunicationsFormLeft : 150; Left = (ls.iPerlCommunicationsFormLeft != 0) ? ls.iPerlCommunicationsFormLeft : 150;
Top = (ls.iPerlCommunicationsFormTop != 0) ? ls.iPerlCommunicationsFormTop : 150; Top = (ls.iPerlCommunicationsFormTop != 0) ? ls.iPerlCommunicationsFormTop : 150;
if (ls.iPerlCommunicationsFormCheckboxes != 0) SetCheckBoxStates(ls.iPerlCommunicationsFormCheckboxes); if (ls.OptoHeadsEnabled != 0) SetCheckBoxStates(ls.OptoHeadsEnabled);
if (!checkBoxesEditMode) if (!checkBoxesEditMode)
{ {
@ -728,12 +728,12 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication
long checkboxStates = GetCheckBoxStates(); long checkboxStates = GetCheckBoxStates();
if (Program.LocalSettings.iPerlCommunicationsFormLeft != Location.X || if (Program.LocalSettings.iPerlCommunicationsFormLeft != Location.X ||
Program.LocalSettings.iPerlCommunicationsFormTop != Location.Y || Program.LocalSettings.iPerlCommunicationsFormTop != Location.Y ||
Program.LocalSettings.iPerlCommunicationsFormCheckboxes != checkboxStates) Program.LocalSettings.OptoHeadsEnabled != checkboxStates)
{ {
/// Update local settings /// Update local settings
Program.LocalSettings.iPerlCommunicationsFormLeft = Location.X; Program.LocalSettings.iPerlCommunicationsFormLeft = Location.X;
Program.LocalSettings.iPerlCommunicationsFormTop = Location.Y; Program.LocalSettings.iPerlCommunicationsFormTop = Location.Y;
Program.LocalSettings.iPerlCommunicationsFormCheckboxes = checkboxStates; Program.LocalSettings.OptoHeadsEnabled = checkboxStates;
Program.LocalSettings.Save(); Program.LocalSettings.Save();
} }
@ -2861,7 +2861,7 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication
private void saveButton_Click(object sender, EventArgs e) private void saveButton_Click(object sender, EventArgs e)
{ {
Program.LocalSettings.iPerlCommunicationsFormCheckboxes = GetCheckBoxStates(); Program.LocalSettings.OptoHeadsEnabled = GetCheckBoxStates();
DialogResult = DialogResult.OK; DialogResult = DialogResult.OK;
Close(); Close();
} }

7
TBF/LocalSettings.cs
View File

@ -205,7 +205,12 @@ namespace TBF
/// iPerlCommunicationsForm /// iPerlCommunicationsForm
public int iPerlCommunicationsFormLeft; public int iPerlCommunicationsFormLeft;
public int iPerlCommunicationsFormTop; public int iPerlCommunicationsFormTop;
public long iPerlCommunicationsFormCheckboxes; /// Bit field with iPerlCommunicationForm checkboxes states
/// S640CommForm
public int S640CommFormLeft;
public int S640CommFormTop;
///
public long OptoHeadsEnabled; /// Bit field with opto-head enabled states, used by iPerlCommunicationForm and S640CommForm
/// Serial numbers /// Serial numbers
public string[] LastSNTexts; public string[] LastSNTexts;

18
TBF/Resources/Strings.Designer.cs generated
View File

@ -798,6 +798,15 @@ namespace TBF.Resources {
} }
} }
/// <summary>
/// Looks up a localized string similar to Clear counters.
/// </summary>
internal static string Clear_counters {
get {
return ResourceManager.GetString("Clear_counters", resourceCulture);
}
}
/// <summary> /// <summary>
/// Looks up a localized string similar to Clear results. /// Looks up a localized string similar to Clear results.
/// </summary> /// </summary>
@ -3300,6 +3309,15 @@ namespace TBF.Resources {
} }
} }
/// <summary>
/// Looks up a localized string similar to Optical heads.
/// </summary>
internal static string Optical_heads {
get {
return ResourceManager.GetString("Optical_heads", resourceCulture);
}
}
/// <summary> /// <summary>
/// Looks up a localized string similar to Other. /// Looks up a localized string similar to Other.
/// </summary> /// </summary>

6
TBF/Resources/Strings.resx
View File

@ -2263,4 +2263,10 @@
<data name="Writing_to_the_production_tracing_DB_failed" xml:space="preserve"> <data name="Writing_to_the_production_tracing_DB_failed" xml:space="preserve">
<value>Writing to the production tracing DB failed</value> <value>Writing to the production tracing DB failed</value>
</data> </data>
<data name="Optical_heads" xml:space="preserve">
<value>Optical heads</value>
</data>
<data name="Clear_counters" xml:space="preserve">
<value>Clear counters</value>
</data>
</root> </root>

12
TBF/UI/MainWnd.Designer.cs generated
View File

@ -97,7 +97,7 @@ namespace TBF.UI
this.backUpResultsTSMItem = new System.Windows.Forms.ToolStripMenuItem(); this.backUpResultsTSMItem = new System.Windows.Forms.ToolStripMenuItem();
this.passwdTSMItem = new System.Windows.Forms.ToolStripMenuItem(); this.passwdTSMItem = new System.Windows.Forms.ToolStripMenuItem();
this.upgradeTSMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.upgradeTSMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.iPerlHeadsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.optoHeadsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.clearCountersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.clearCountersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.helpTSMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.helpTSMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.aboutTSMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.aboutTSMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@ -525,7 +525,7 @@ namespace TBF.UI
this.backUpTSMItem, this.backUpTSMItem,
this.passwdTSMItem, this.passwdTSMItem,
this.upgradeTSMenuItem, this.upgradeTSMenuItem,
this.iPerlHeadsToolStripMenuItem, this.optoHeadsToolStripMenuItem,
this.clearCountersToolStripMenuItem}); this.clearCountersToolStripMenuItem});
this.settingsTSMenuItem.Name = "settingsTSMenuItem"; this.settingsTSMenuItem.Name = "settingsTSMenuItem";
resources.ApplyResources(this.settingsTSMenuItem, "settingsTSMenuItem"); resources.ApplyResources(this.settingsTSMenuItem, "settingsTSMenuItem");
@ -582,9 +582,9 @@ namespace TBF.UI
// //
// iPerlHeadsToolStripMenuItem // iPerlHeadsToolStripMenuItem
// //
this.iPerlHeadsToolStripMenuItem.Name = "iPerlHeadsToolStripMenuItem"; this.optoHeadsToolStripMenuItem.Name = "iPerlHeadsToolStripMenuItem";
resources.ApplyResources(this.iPerlHeadsToolStripMenuItem, "iPerlHeadsToolStripMenuItem"); resources.ApplyResources(this.optoHeadsToolStripMenuItem, "iPerlHeadsToolStripMenuItem");
this.iPerlHeadsToolStripMenuItem.Click += new System.EventHandler(this.iPerlHeadsToolStripMenuItem_Click); this.optoHeadsToolStripMenuItem.Click += new System.EventHandler(this.optoHeadsToolStripMenuItem_Click);
// //
// clearCountersToolStripMenuItem // clearCountersToolStripMenuItem
// //
@ -798,7 +798,7 @@ namespace TBF.UI
private System.Windows.Forms.ToolStripMenuItem upgradeTSMenuItem; private System.Windows.Forms.ToolStripMenuItem upgradeTSMenuItem;
private System.Windows.Forms.TabPage graphsTabPage; private System.Windows.Forms.TabPage graphsTabPage;
private TBF.UI.Graphs.GraphsTabPageCtrl graphsTabPageCtrl; private TBF.UI.Graphs.GraphsTabPageCtrl graphsTabPageCtrl;
private System.Windows.Forms.ToolStripMenuItem iPerlHeadsToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem optoHeadsToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem clearCountersToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem clearCountersToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem backUpTSMItem; private System.Windows.Forms.ToolStripMenuItem backUpTSMItem;
private System.Windows.Forms.ToolStripMenuItem backUpConfigTSMItem; private System.Windows.Forms.ToolStripMenuItem backUpConfigTSMItem;

14
TBF/UI/MainWnd.cs
View File

@ -103,6 +103,8 @@ namespace TBF.UI
eventLogsTSMenuItem.Text = Strings.Event_logs; eventLogsTSMenuItem.Text = Strings.Event_logs;
calendarTSMenuItem.Text = Strings.Calendar; calendarTSMenuItem.Text = Strings.Calendar;
settingsTSMenuItem.Text = Strings.Settings; settingsTSMenuItem.Text = Strings.Settings;
optoHeadsToolStripMenuItem.Text = Strings.Optical_heads;
clearCountersToolStripMenuItem.Text = Strings.Clear_counters;
helpTSMenuItem.Text = Strings.Help; helpTSMenuItem.Text = Strings.Help;
#if CAMERA #if CAMERA
/// Add 'Camera' menu item /// Add 'Camera' menu item
@ -116,12 +118,8 @@ namespace TBF.UI
#endif #endif
UpdateMenuItemsVisibility(); UpdateMenuItemsVisibility();
#if IPERL optoHeadsToolStripMenuItem.Visible = true;
iPerlHeadsToolStripMenuItem.Visible = true; optoHeadsToolStripMenuItem.Enabled = false;
iPerlHeadsToolStripMenuItem.Enabled = false;
#else
iPerlHeadsToolStripMenuItem.Visible = false;
#endif
IsShutdownDisabled = true; IsShutdownDisabled = true;
IsShutdownPCAfterClosingTbf = false; IsShutdownPCAfterClosingTbf = false;
@ -440,7 +438,7 @@ namespace TBF.UI
} }
procedureComboBox.Enabled = ((args.Flags & ButtonsEtc.ProcedureCmbBoxEn) != 0); procedureComboBox.Enabled = ((args.Flags & ButtonsEtc.ProcedureCmbBoxEn) != 0);
iPerlHeadsToolStripMenuItem.Enabled = ((args.Flags & ButtonsEtc.ProcedureCmbBoxEn) != 0); optoHeadsToolStripMenuItem.Enabled = ((args.Flags & ButtonsEtc.ProcedureCmbBoxEn) != 0);
if (procedureComboBox.Enabled && ProceduresUpdated) if (procedureComboBox.Enabled && ProceduresUpdated)
{ {
@ -825,7 +823,7 @@ namespace TBF.UI
new TBF.UI.Settings.UpgradeSelectionDlg().ShowDialog(); new TBF.UI.Settings.UpgradeSelectionDlg().ShowDialog();
} }
private void iPerlHeadsToolStripMenuItem_Click(object sender, EventArgs e) private void optoHeadsToolStripMenuItem_Click(object sender, EventArgs e)
{ {
new BenchControl.TestMethods.iPerlCommunication.iPerlCommunicationForm(true).ShowDialog(); new BenchControl.TestMethods.iPerlCommunication.iPerlCommunicationForm(true).ShowDialog();
} }