Changes in iPerlCommunicationForm : CheckboxEditMode bug fixes, ver. 2.26.1725
This commit is contained in:
parent
11ca2b7272
commit
9ecba98b4c
@ -653,7 +653,7 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication
|
||||
TBF.LocalSettings ls = Program.LocalSettings;
|
||||
Left = (ls.iPerlCommunicationsFormLeft != 0) ? ls.iPerlCommunicationsFormLeft : 150;
|
||||
Top = (ls.iPerlCommunicationsFormTop != 0) ? ls.iPerlCommunicationsFormTop : 150;
|
||||
if (ls.OptoHeadsEnabled != 0) SetCheckBoxStates(ls.OptoHeadsEnabled);
|
||||
SetCheckBoxStates(ls.OptoHeadsEnabled);
|
||||
|
||||
if (!checkBoxesEditMode)
|
||||
{
|
||||
@ -2887,9 +2887,10 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication
|
||||
long result = 0;
|
||||
for (int i = 0; i < 48; i++)
|
||||
{
|
||||
if (ckbIndex[i] >= 0 && ckbState[ckbIndex[i]])
|
||||
int wmNr0 = ckbIndex[i];
|
||||
if (wmNr0 >= 0 && ckbState[wmNr0])
|
||||
{
|
||||
result += (1L << i);
|
||||
result += (1L << wmNr0);
|
||||
}
|
||||
}
|
||||
return result;
|
||||
@ -2915,9 +2916,10 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication
|
||||
};
|
||||
for (int i = 0; i < 48; i++)
|
||||
{
|
||||
if (ckbIndex[i] >= 0)
|
||||
int wmNr0 = ckbIndex[i];
|
||||
if (wmNr0 >= 0)
|
||||
{
|
||||
chkBoxes[i].Checked = ckbState[ckbIndex[i]] = ((state & (1L << i)) != 0);
|
||||
chkBoxes[i].Checked = ckbState[wmNr0] = ((state & (1L << wmNr0)) != 0);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -2925,6 +2927,7 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication
|
||||
private void saveButton_Click(object sender, EventArgs e)
|
||||
{
|
||||
Program.LocalSettings.OptoHeadsEnabled = GetCheckBoxStates();
|
||||
Program.LocalSettings.Save();
|
||||
DialogResult = DialogResult.OK;
|
||||
Close();
|
||||
}
|
||||
|
||||
@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
|
||||
// Build Number
|
||||
// Revision
|
||||
//
|
||||
[assembly: AssemblyVersion("2.26.1724.0")]
|
||||
[assembly: AssemblyFileVersion("2.26.1724.0")]
|
||||
[assembly: AssemblyVersion("2.26.1725.0")]
|
||||
[assembly: AssemblyFileVersion("2.26.1725.0")]
|
||||
|
||||
Loading…
Reference in New Issue
Block a user