diff --git a/TBF/BenchControl/TestMethods/iPerlCommunication/CheckBoxImage.cs b/TBF/BenchControl/TestMethods/iPerlCommunication/CheckBoxImage.cs index 4ee1095fb..29a537727 100644 --- a/TBF/BenchControl/TestMethods/iPerlCommunication/CheckBoxImage.cs +++ b/TBF/BenchControl/TestMethods/iPerlCommunication/CheckBoxImage.cs @@ -10,9 +10,9 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication { public class CheckBoxImage : PictureBox { - private bool cchecked; - private readonly Image ci; - private readonly Image uci; + private bool cbChecked; + private readonly Image checkedImg; + private readonly Image uncheckedImg; public CheckBoxImage() : this(new Bitmap(TBF.Properties.Resources.SwitchOn), new Bitmap(TBF.Properties.Resources.SwitchOff), true) @@ -20,24 +20,24 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication SizeMode = PictureBoxSizeMode.StretchImage; } - public CheckBoxImage(Image checkedimage, Image uncheckedimage, bool initState) + public CheckBoxImage(Image checkedImg, Image uncheckedImg, bool initState) : base() { - ci = checkedimage; - uci = uncheckedimage; + this.checkedImg = checkedImg; + this.uncheckedImg = uncheckedImg; Click += (sender, e) => { Checked = !Checked; }; Checked = initState; } public bool Checked { - get { return cchecked; } + get { return cbChecked; } set { if (Enabled) { - Image = value ? ci : uci; - cchecked = value; + Image = value ? checkedImg : uncheckedImg; + cbChecked = value; } } } diff --git a/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs index fff1bc80c..503299134 100644 --- a/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs +++ b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs @@ -302,13 +302,16 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication /// Constructor for checkBox states (active/inactive iPerl head) editing. /// /// Initial check box states - public iPerlCommunicationForm(bool notUsed) + public iPerlCommunicationForm(bool isCheckBoxesEditMode) : this() { - checkBoxesEditMode = true; - saveButton.Visible = true; - activityLabel.Text = Strings.Activate_Deactivate_heads; - ShuffleTextBoxes(Config.Data.WMsCount, Config.Data.LineSize); + if (isCheckBoxesEditMode) + { + checkBoxesEditMode = true; + saveButton.Visible = true; + activityLabel.Text = Strings.Activate_Deactivate_heads; + ShuffleTextBoxes(Config.Data.WMsCount, Config.Data.LineSize); + } } /// @@ -361,6 +364,7 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication startTimeSec = StateMachine.Time; /// Find QuidoRS + quido = null; if (StateMachine.Components != null) { foreach (var comp in StateMachine.Components) @@ -547,6 +551,8 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication } Width = xMax + 30; Height = yMax + 50; + + saveButton.Location = new Point(Width - 105, saveButton.Location.Y); } @@ -696,8 +702,12 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication if (stopWorkerThreads) break; +#if TURA_SPECIAL + int threadIx = threadID; /// Just one thread for TURA_SPECIAL +#else for (int threadIx = threadID; threadIx < threadID + 4; threadIx += cfg.NrThreads) - { +#endif + { if (cfg.UseMuxBoards && threadIx >= muxBrdOrGroup14Nrs.Count) break; // quit, all RFID ports of all water meters done bool wmFound = false; @@ -705,11 +715,7 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication for (int wmNr0 = 0; wmNr0 < iperlHeads.Count; wmNr0++) { IperlHead ihead = iperlHeads[wmNr0]; -#if TURA_SPECIAL - if (ihead.Group == group && (!cfg.UseMuxBoards || ihead.MuxBoardNrOrGroup14 == muxBrdOrGroup14Nrs[threadIx])) -#else if (ihead.Group == group && ihead.MuxBoardNrOrGroup14 == muxBrdOrGroup14Nrs[threadIx]) -#endif { wmFound = true; Results.Entities.WaterMeter wm = ProcessData.BatchRslts.WaterMeters[waterMeterPositions0[wmNr0]]; @@ -795,6 +801,7 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication } } + #region Communication functions /// /// Read a complete configuration structure of the watermeter @@ -1697,6 +1704,7 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication return error; } + #endregion /// /// Called when communication with one watermeter is completed @@ -1751,6 +1759,7 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication } } +#if !TURA_SPECIAL /// /// Branch /// @@ -1761,6 +1770,7 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication if (!cfg.UseMuxBoards && completedCommCount < 4) return; completedCommCount = 0; } +#endif if (currentGroup < lastGroup) { @@ -1861,6 +1871,8 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication UiBridge.Bridge.OnTestCompleted(this, new UiBridge.TestCompletedEventArgs(string.Empty, null)); } + #region Check boxes edit mode support + private void checkBoxImage1_Click(object sender, EventArgs e) { ckbState[ckbIndex[0]] = checkBoxImage1.Checked; } private void checkBoxImage2_Click(object sender, EventArgs e) { ckbState[ckbIndex[1]] = checkBoxImage2.Checked; } private void checkBoxImage3_Click(object sender, EventArgs e) { ckbState[ckbIndex[2]] = checkBoxImage3.Checked; } @@ -1947,6 +1959,8 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication Program.LocalSettings.iPerlCommunicationsFormCheckboxes = GetCheckBoxStates(); DialogResult = DialogResult.OK; Close(); - } + } + + #endregion } } diff --git a/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.resx b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.resx index 08edb0e5b..799de5ac4 100644 --- a/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.resx +++ b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.resx @@ -121,7 +121,7 @@ iVBORw0KGgoAAAANSUhEUgAAADAAAAAeCAYAAABqpJ3BAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH + YQUAAAAJcEhZcwAADsEAAA7BAbiRa+0AAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH Nn/4nJycJM7JMSfEWNjGAVMMOAScABamGhxABRkJISFpVxISQkjbe2+zu1N2eu+97czO7Oze3O/JS0LT OVe/N++9mf3uV+73/X5FtbW1+DqEw2FEYlEFsVjsM0TjXBNxJFJJJNMpJJNciXQyhQwxlUgiN5VBNpNG NptFejqLVC6L+EwWsZkcIoUcEphFHAWkZguYnpvDHPhP/ivwv+kZYCoHZPKYS+WQjya/0j7B1xIQ4/1B @@ -194,7 +194,7 @@ iVBORw0KGgoAAAANSUhEUgAAADAAAAAeCAYAAABqpJ3BAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH + YQUAAAAJcEhZcwAADsEAAA7BAbiRa+0AAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH Nn/4nJycJM7JMSfEWNjGAVMMOAScABamGhxABRkJISFpVxISQkjbe2+zu1N2eu+97czO7Oze3O/JS0LT OVe/N++9mf3uV+73/X5FtbW1+DqEw2FEYlEFsVjsM0TjXBNxJFJJJNMpJJNciXQyhQwxlUgiN5VBNpNG NptFejqLVC6L+EwWsZkcIoUcEphFHAWkZguYnpvDHPhP/ivwv+kZYCoHZPKYS+WQjya/0j7B1xIQ4/1B @@ -267,7 +267,7 @@ iVBORw0KGgoAAAANSUhEUgAAADAAAAAeCAYAAABqpJ3BAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH + YQUAAAAJcEhZcwAADsEAAA7BAbiRa+0AAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH Nn/4nJycJM7JMSfEWNjGAVMMOAScABamGhxABRkJISFpVxISQkjbe2+zu1N2eu+97czO7Oze3O/JS0LT OVe/N++9mf3uV+73/X5FtbW1+DqEw2FEYlEFsVjsM0TjXBNxJFJJJNMpJJNciXQyhQwxlUgiN5VBNpNG NptFejqLVC6L+EwWsZkcIoUcEphFHAWkZguYnpvDHPhP/ivwv+kZYCoHZPKYS+WQjya/0j7B1xIQ4/1B @@ -340,7 +340,7 @@ iVBORw0KGgoAAAANSUhEUgAAADAAAAAeCAYAAABqpJ3BAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH + YQUAAAAJcEhZcwAADsEAAA7BAbiRa+0AAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH Nn/4nJycJM7JMSfEWNjGAVMMOAScABamGhxABRkJISFpVxISQkjbe2+zu1N2eu+97czO7Oze3O/JS0LT OVe/N++9mf3uV+73/X5FtbW1+DqEw2FEYlEFsVjsM0TjXBNxJFJJJNMpJJNciXQyhQwxlUgiN5VBNpNG NptFejqLVC6L+EwWsZkcIoUcEphFHAWkZguYnpvDHPhP/ivwv+kZYCoHZPKYS+WQjya/0j7B1xIQ4/1B @@ -413,7 +413,7 @@ iVBORw0KGgoAAAANSUhEUgAAADAAAAAeCAYAAABqpJ3BAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH + YQUAAAAJcEhZcwAADsEAAA7BAbiRa+0AAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH Nn/4nJycJM7JMSfEWNjGAVMMOAScABamGhxABRkJISFpVxISQkjbe2+zu1N2eu+97czO7Oze3O/JS0LT OVe/N++9mf3uV+73/X5FtbW1+DqEw2FEYlEFsVjsM0TjXBNxJFJJJNMpJJNciXQyhQwxlUgiN5VBNpNG NptFejqLVC6L+EwWsZkcIoUcEphFHAWkZguYnpvDHPhP/ivwv+kZYCoHZPKYS+WQjya/0j7B1xIQ4/1B @@ -486,7 +486,7 @@ iVBORw0KGgoAAAANSUhEUgAAADAAAAAeCAYAAABqpJ3BAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH + YQUAAAAJcEhZcwAADsEAAA7BAbiRa+0AAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH Nn/4nJycJM7JMSfEWNjGAVMMOAScABamGhxABRkJISFpVxISQkjbe2+zu1N2eu+97czO7Oze3O/JS0LT OVe/N++9mf3uV+73/X5FtbW1+DqEw2FEYlEFsVjsM0TjXBNxJFJJJNMpJJNciXQyhQwxlUgiN5VBNpNG NptFejqLVC6L+EwWsZkcIoUcEphFHAWkZguYnpvDHPhP/ivwv+kZYCoHZPKYS+WQjya/0j7B1xIQ4/1B @@ -559,7 +559,7 @@ iVBORw0KGgoAAAANSUhEUgAAADAAAAAeCAYAAABqpJ3BAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH + YQUAAAAJcEhZcwAADsEAAA7BAbiRa+0AAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH Nn/4nJycJM7JMSfEWNjGAVMMOAScABamGhxABRkJISFpVxISQkjbe2+zu1N2eu+97czO7Oze3O/JS0LT OVe/N++9mf3uV+73/X5FtbW1+DqEw2FEYlEFsVjsM0TjXBNxJFJJJNMpJJNciXQyhQwxlUgiN5VBNpNG NptFejqLVC6L+EwWsZkcIoUcEphFHAWkZguYnpvDHPhP/ivwv+kZYCoHZPKYS+WQjya/0j7B1xIQ4/1B @@ -632,7 +632,7 @@ iVBORw0KGgoAAAANSUhEUgAAADAAAAAeCAYAAABqpJ3BAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH + YQUAAAAJcEhZcwAADsEAAA7BAbiRa+0AAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH Nn/4nJycJM7JMSfEWNjGAVMMOAScABamGhxABRkJISFpVxISQkjbe2+zu1N2eu+97czO7Oze3O/JS0LT OVe/N++9mf3uV+73/X5FtbW1+DqEw2FEYlEFsVjsM0TjXBNxJFJJJNMpJJNciXQyhQwxlUgiN5VBNpNG NptFejqLVC6L+EwWsZkcIoUcEphFHAWkZguYnpvDHPhP/ivwv+kZYCoHZPKYS+WQjya/0j7B1xIQ4/1B @@ -705,7 +705,7 @@ iVBORw0KGgoAAAANSUhEUgAAADAAAAAeCAYAAABqpJ3BAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH + YQUAAAAJcEhZcwAADsEAAA7BAbiRa+0AAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH Nn/4nJycJM7JMSfEWNjGAVMMOAScABamGhxABRkJISFpVxISQkjbe2+zu1N2eu+97czO7Oze3O/JS0LT OVe/N++9mf3uV+73/X5FtbW1+DqEw2FEYlEFsVjsM0TjXBNxJFJJJNMpJJNciXQyhQwxlUgiN5VBNpNG NptFejqLVC6L+EwWsZkcIoUcEphFHAWkZguYnpvDHPhP/ivwv+kZYCoHZPKYS+WQjya/0j7B1xIQ4/1B @@ -778,7 +778,7 @@ iVBORw0KGgoAAAANSUhEUgAAADAAAAAeCAYAAABqpJ3BAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH + YQUAAAAJcEhZcwAADsEAAA7BAbiRa+0AAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH Nn/4nJycJM7JMSfEWNjGAVMMOAScABamGhxABRkJISFpVxISQkjbe2+zu1N2eu+97czO7Oze3O/JS0LT OVe/N++9mf3uV+73/X5FtbW1+DqEw2FEYlEFsVjsM0TjXBNxJFJJJNMpJJNciXQyhQwxlUgiN5VBNpNG NptFejqLVC6L+EwWsZkcIoUcEphFHAWkZguYnpvDHPhP/ivwv+kZYCoHZPKYS+WQjya/0j7B1xIQ4/1B @@ -851,7 +851,7 @@ iVBORw0KGgoAAAANSUhEUgAAADAAAAAeCAYAAABqpJ3BAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH + YQUAAAAJcEhZcwAADsEAAA7BAbiRa+0AAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH Nn/4nJycJM7JMSfEWNjGAVMMOAScABamGhxABRkJISFpVxISQkjbe2+zu1N2eu+97czO7Oze3O/JS0LT OVe/N++9mf3uV+73/X5FtbW1+DqEw2FEYlEFsVjsM0TjXBNxJFJJJNMpJJNciXQyhQwxlUgiN5VBNpNG NptFejqLVC6L+EwWsZkcIoUcEphFHAWkZguYnpvDHPhP/ivwv+kZYCoHZPKYS+WQjya/0j7B1xIQ4/1B @@ -924,7 +924,7 @@ iVBORw0KGgoAAAANSUhEUgAAADAAAAAeCAYAAABqpJ3BAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH + YQUAAAAJcEhZcwAADsEAAA7BAbiRa+0AAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH Nn/4nJycJM7JMSfEWNjGAVMMOAScABamGhxABRkJISFpVxISQkjbe2+zu1N2eu+97czO7Oze3O/JS0LT OVe/N++9mf3uV+73/X5FtbW1+DqEw2FEYlEFsVjsM0TjXBNxJFJJJNMpJJNciXQyhQwxlUgiN5VBNpNG NptFejqLVC6L+EwWsZkcIoUcEphFHAWkZguYnpvDHPhP/ivwv+kZYCoHZPKYS+WQjya/0j7B1xIQ4/1B @@ -997,7 +997,7 @@ iVBORw0KGgoAAAANSUhEUgAAADAAAAAeCAYAAABqpJ3BAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH + YQUAAAAJcEhZcwAADsEAAA7BAbiRa+0AAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH Nn/4nJycJM7JMSfEWNjGAVMMOAScABamGhxABRkJISFpVxISQkjbe2+zu1N2eu+97czO7Oze3O/JS0LT OVe/N++9mf3uV+73/X5FtbW1+DqEw2FEYlEFsVjsM0TjXBNxJFJJJNMpJJNciXQyhQwxlUgiN5VBNpNG NptFejqLVC6L+EwWsZkcIoUcEphFHAWkZguYnpvDHPhP/ivwv+kZYCoHZPKYS+WQjya/0j7B1xIQ4/1B @@ -1070,7 +1070,7 @@ iVBORw0KGgoAAAANSUhEUgAAADAAAAAeCAYAAABqpJ3BAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH + YQUAAAAJcEhZcwAADsEAAA7BAbiRa+0AAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH Nn/4nJycJM7JMSfEWNjGAVMMOAScABamGhxABRkJISFpVxISQkjbe2+zu1N2eu+97czO7Oze3O/JS0LT OVe/N++9mf3uV+73/X5FtbW1+DqEw2FEYlEFsVjsM0TjXBNxJFJJJNMpJJNciXQyhQwxlUgiN5VBNpNG NptFejqLVC6L+EwWsZkcIoUcEphFHAWkZguYnpvDHPhP/ivwv+kZYCoHZPKYS+WQjya/0j7B1xIQ4/1B @@ -1143,7 +1143,7 @@ iVBORw0KGgoAAAANSUhEUgAAADAAAAAeCAYAAABqpJ3BAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH + YQUAAAAJcEhZcwAADsEAAA7BAbiRa+0AAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH Nn/4nJycJM7JMSfEWNjGAVMMOAScABamGhxABRkJISFpVxISQkjbe2+zu1N2eu+97czO7Oze3O/JS0LT OVe/N++9mf3uV+73/X5FtbW1+DqEw2FEYlEFsVjsM0TjXBNxJFJJJNMpJJNciXQyhQwxlUgiN5VBNpNG NptFejqLVC6L+EwWsZkcIoUcEphFHAWkZguYnpvDHPhP/ivwv+kZYCoHZPKYS+WQjya/0j7B1xIQ4/1B @@ -1216,7 +1216,7 @@ iVBORw0KGgoAAAANSUhEUgAAADAAAAAeCAYAAABqpJ3BAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH + YQUAAAAJcEhZcwAADsEAAA7BAbiRa+0AAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH Nn/4nJycJM7JMSfEWNjGAVMMOAScABamGhxABRkJISFpVxISQkjbe2+zu1N2eu+97czO7Oze3O/JS0LT OVe/N++9mf3uV+73/X5FtbW1+DqEw2FEYlEFsVjsM0TjXBNxJFJJJNMpJJNciXQyhQwxlUgiN5VBNpNG NptFejqLVC6L+EwWsZkcIoUcEphFHAWkZguYnpvDHPhP/ivwv+kZYCoHZPKYS+WQjya/0j7B1xIQ4/1B @@ -1289,7 +1289,7 @@ iVBORw0KGgoAAAANSUhEUgAAADAAAAAeCAYAAABqpJ3BAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH + YQUAAAAJcEhZcwAADsEAAA7BAbiRa+0AAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH Nn/4nJycJM7JMSfEWNjGAVMMOAScABamGhxABRkJISFpVxISQkjbe2+zu1N2eu+97czO7Oze3O/JS0LT OVe/N++9mf3uV+73/X5FtbW1+DqEw2FEYlEFsVjsM0TjXBNxJFJJJNMpJJNciXQyhQwxlUgiN5VBNpNG NptFejqLVC6L+EwWsZkcIoUcEphFHAWkZguYnpvDHPhP/ivwv+kZYCoHZPKYS+WQjya/0j7B1xIQ4/1B @@ -1362,7 +1362,7 @@ iVBORw0KGgoAAAANSUhEUgAAADAAAAAeCAYAAABqpJ3BAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH + YQUAAAAJcEhZcwAADsEAAA7BAbiRa+0AAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH Nn/4nJycJM7JMSfEWNjGAVMMOAScABamGhxABRkJISFpVxISQkjbe2+zu1N2eu+97czO7Oze3O/JS0LT OVe/N++9mf3uV+73/X5FtbW1+DqEw2FEYlEFsVjsM0TjXBNxJFJJJNMpJJNciXQyhQwxlUgiN5VBNpNG NptFejqLVC6L+EwWsZkcIoUcEphFHAWkZguYnpvDHPhP/ivwv+kZYCoHZPKYS+WQjya/0j7B1xIQ4/1B @@ -1435,7 +1435,7 @@ iVBORw0KGgoAAAANSUhEUgAAADAAAAAeCAYAAABqpJ3BAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH + YQUAAAAJcEhZcwAADsEAAA7BAbiRa+0AAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH Nn/4nJycJM7JMSfEWNjGAVMMOAScABamGhxABRkJISFpVxISQkjbe2+zu1N2eu+97czO7Oze3O/JS0LT OVe/N++9mf3uV+73/X5FtbW1+DqEw2FEYlEFsVjsM0TjXBNxJFJJJNMpJJNciXQyhQwxlUgiN5VBNpNG NptFejqLVC6L+EwWsZkcIoUcEphFHAWkZguYnpvDHPhP/ivwv+kZYCoHZPKYS+WQjya/0j7B1xIQ4/1B @@ -1508,7 +1508,7 @@ iVBORw0KGgoAAAANSUhEUgAAADAAAAAeCAYAAABqpJ3BAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH + YQUAAAAJcEhZcwAADsEAAA7BAbiRa+0AAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH Nn/4nJycJM7JMSfEWNjGAVMMOAScABamGhxABRkJISFpVxISQkjbe2+zu1N2eu+97czO7Oze3O/JS0LT OVe/N++9mf3uV+73/X5FtbW1+DqEw2FEYlEFsVjsM0TjXBNxJFJJJNMpJJNciXQyhQwxlUgiN5VBNpNG NptFejqLVC6L+EwWsZkcIoUcEphFHAWkZguYnpvDHPhP/ivwv+kZYCoHZPKYS+WQjya/0j7B1xIQ4/1B @@ -1581,7 +1581,7 @@ iVBORw0KGgoAAAANSUhEUgAAADAAAAAeCAYAAABqpJ3BAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH + YQUAAAAJcEhZcwAADsEAAA7BAbiRa+0AAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH Nn/4nJycJM7JMSfEWNjGAVMMOAScABamGhxABRkJISFpVxISQkjbe2+zu1N2eu+97czO7Oze3O/JS0LT OVe/N++9mf3uV+73/X5FtbW1+DqEw2FEYlEFsVjsM0TjXBNxJFJJJNMpJJNciXQyhQwxlUgiN5VBNpNG NptFejqLVC6L+EwWsZkcIoUcEphFHAWkZguYnpvDHPhP/ivwv+kZYCoHZPKYS+WQjya/0j7B1xIQ4/1B @@ -1654,7 +1654,7 @@ iVBORw0KGgoAAAANSUhEUgAAADAAAAAeCAYAAABqpJ3BAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH + YQUAAAAJcEhZcwAADsEAAA7BAbiRa+0AAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH Nn/4nJycJM7JMSfEWNjGAVMMOAScABamGhxABRkJISFpVxISQkjbe2+zu1N2eu+97czO7Oze3O/JS0LT OVe/N++9mf3uV+73/X5FtbW1+DqEw2FEYlEFsVjsM0TjXBNxJFJJJNMpJJNciXQyhQwxlUgiN5VBNpNG NptFejqLVC6L+EwWsZkcIoUcEphFHAWkZguYnpvDHPhP/ivwv+kZYCoHZPKYS+WQjya/0j7B1xIQ4/1B @@ -1727,7 +1727,7 @@ iVBORw0KGgoAAAANSUhEUgAAADAAAAAeCAYAAABqpJ3BAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH + YQUAAAAJcEhZcwAADsEAAA7BAbiRa+0AAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH Nn/4nJycJM7JMSfEWNjGAVMMOAScABamGhxABRkJISFpVxISQkjbe2+zu1N2eu+97czO7Oze3O/JS0LT OVe/N++9mf3uV+73/X5FtbW1+DqEw2FEYlEFsVjsM0TjXBNxJFJJJNMpJJNciXQyhQwxlUgiN5VBNpNG NptFejqLVC6L+EwWsZkcIoUcEphFHAWkZguYnpvDHPhP/ivwv+kZYCoHZPKYS+WQjya/0j7B1xIQ4/1B @@ -1800,7 +1800,7 @@ iVBORw0KGgoAAAANSUhEUgAAADAAAAAeCAYAAABqpJ3BAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH + YQUAAAAJcEhZcwAADsEAAA7BAbiRa+0AAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH Nn/4nJycJM7JMSfEWNjGAVMMOAScABamGhxABRkJISFpVxISQkjbe2+zu1N2eu+97czO7Oze3O/JS0LT OVe/N++9mf3uV+73/X5FtbW1+DqEw2FEYlEFsVjsM0TjXBNxJFJJJNMpJJNciXQyhQwxlUgiN5VBNpNG NptFejqLVC6L+EwWsZkcIoUcEphFHAWkZguYnpvDHPhP/ivwv+kZYCoHZPKYS+WQjya/0j7B1xIQ4/1B @@ -1873,7 +1873,7 @@ iVBORw0KGgoAAAANSUhEUgAAADAAAAAeCAYAAABqpJ3BAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH + YQUAAAAJcEhZcwAADsEAAA7BAbiRa+0AAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH Nn/4nJycJM7JMSfEWNjGAVMMOAScABamGhxABRkJISFpVxISQkjbe2+zu1N2eu+97czO7Oze3O/JS0LT OVe/N++9mf3uV+73/X5FtbW1+DqEw2FEYlEFsVjsM0TjXBNxJFJJJNMpJJNciXQyhQwxlUgiN5VBNpNG NptFejqLVC6L+EwWsZkcIoUcEphFHAWkZguYnpvDHPhP/ivwv+kZYCoHZPKYS+WQjya/0j7B1xIQ4/1B @@ -1946,7 +1946,7 @@ iVBORw0KGgoAAAANSUhEUgAAADAAAAAeCAYAAABqpJ3BAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH + YQUAAAAJcEhZcwAADsEAAA7BAbiRa+0AAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH Nn/4nJycJM7JMSfEWNjGAVMMOAScABamGhxABRkJISFpVxISQkjbe2+zu1N2eu+97czO7Oze3O/JS0LT OVe/N++9mf3uV+73/X5FtbW1+DqEw2FEYlEFsVjsM0TjXBNxJFJJJNMpJJNciXQyhQwxlUgiN5VBNpNG NptFejqLVC6L+EwWsZkcIoUcEphFHAWkZguYnpvDHPhP/ivwv+kZYCoHZPKYS+WQjya/0j7B1xIQ4/1B @@ -2019,7 +2019,7 @@ iVBORw0KGgoAAAANSUhEUgAAADAAAAAeCAYAAABqpJ3BAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH + YQUAAAAJcEhZcwAADsEAAA7BAbiRa+0AAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH Nn/4nJycJM7JMSfEWNjGAVMMOAScABamGhxABRkJISFpVxISQkjbe2+zu1N2eu+97czO7Oze3O/JS0LT OVe/N++9mf3uV+73/X5FtbW1+DqEw2FEYlEFsVjsM0TjXBNxJFJJJNMpJJNciXQyhQwxlUgiN5VBNpNG NptFejqLVC6L+EwWsZkcIoUcEphFHAWkZguYnpvDHPhP/ivwv+kZYCoHZPKYS+WQjya/0j7B1xIQ4/1B @@ -2092,7 +2092,7 @@ iVBORw0KGgoAAAANSUhEUgAAADAAAAAeCAYAAABqpJ3BAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH + YQUAAAAJcEhZcwAADsEAAA7BAbiRa+0AAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH Nn/4nJycJM7JMSfEWNjGAVMMOAScABamGhxABRkJISFpVxISQkjbe2+zu1N2eu+97czO7Oze3O/JS0LT OVe/N++9mf3uV+73/X5FtbW1+DqEw2FEYlEFsVjsM0TjXBNxJFJJJNMpJJNciXQyhQwxlUgiN5VBNpNG NptFejqLVC6L+EwWsZkcIoUcEphFHAWkZguYnpvDHPhP/ivwv+kZYCoHZPKYS+WQjya/0j7B1xIQ4/1B @@ -2165,7 +2165,7 @@ iVBORw0KGgoAAAANSUhEUgAAADAAAAAeCAYAAABqpJ3BAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH + YQUAAAAJcEhZcwAADsEAAA7BAbiRa+0AAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH Nn/4nJycJM7JMSfEWNjGAVMMOAScABamGhxABRkJISFpVxISQkjbe2+zu1N2eu+97czO7Oze3O/JS0LT OVe/N++9mf3uV+73/X5FtbW1+DqEw2FEYlEFsVjsM0TjXBNxJFJJJNMpJJNciXQyhQwxlUgiN5VBNpNG NptFejqLVC6L+EwWsZkcIoUcEphFHAWkZguYnpvDHPhP/ivwv+kZYCoHZPKYS+WQjya/0j7B1xIQ4/1B @@ -2238,7 +2238,7 @@ iVBORw0KGgoAAAANSUhEUgAAADAAAAAeCAYAAABqpJ3BAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH + YQUAAAAJcEhZcwAADsEAAA7BAbiRa+0AAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH Nn/4nJycJM7JMSfEWNjGAVMMOAScABamGhxABRkJISFpVxISQkjbe2+zu1N2eu+97czO7Oze3O/JS0LT OVe/N++9mf3uV+73/X5FtbW1+DqEw2FEYlEFsVjsM0TjXBNxJFJJJNMpJJNciXQyhQwxlUgiN5VBNpNG NptFejqLVC6L+EwWsZkcIoUcEphFHAWkZguYnpvDHPhP/ivwv+kZYCoHZPKYS+WQjya/0j7B1xIQ4/1B @@ -2311,7 +2311,7 @@ iVBORw0KGgoAAAANSUhEUgAAADAAAAAeCAYAAABqpJ3BAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH + YQUAAAAJcEhZcwAADsEAAA7BAbiRa+0AAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH Nn/4nJycJM7JMSfEWNjGAVMMOAScABamGhxABRkJISFpVxISQkjbe2+zu1N2eu+97czO7Oze3O/JS0LT OVe/N++9mf3uV+73/X5FtbW1+DqEw2FEYlEFsVjsM0TjXBNxJFJJJNMpJJNciXQyhQwxlUgiN5VBNpNG NptFejqLVC6L+EwWsZkcIoUcEphFHAWkZguYnpvDHPhP/ivwv+kZYCoHZPKYS+WQjya/0j7B1xIQ4/1B @@ -2384,7 +2384,7 @@ iVBORw0KGgoAAAANSUhEUgAAADAAAAAeCAYAAABqpJ3BAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH + YQUAAAAJcEhZcwAADsEAAA7BAbiRa+0AAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH Nn/4nJycJM7JMSfEWNjGAVMMOAScABamGhxABRkJISFpVxISQkjbe2+zu1N2eu+97czO7Oze3O/JS0LT OVe/N++9mf3uV+73/X5FtbW1+DqEw2FEYlEFsVjsM0TjXBNxJFJJJNMpJJNciXQyhQwxlUgiN5VBNpNG NptFejqLVC6L+EwWsZkcIoUcEphFHAWkZguYnpvDHPhP/ivwv+kZYCoHZPKYS+WQjya/0j7B1xIQ4/1B @@ -2457,7 +2457,7 @@ iVBORw0KGgoAAAANSUhEUgAAADAAAAAeCAYAAABqpJ3BAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH + YQUAAAAJcEhZcwAADsEAAA7BAbiRa+0AAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH Nn/4nJycJM7JMSfEWNjGAVMMOAScABamGhxABRkJISFpVxISQkjbe2+zu1N2eu+97czO7Oze3O/JS0LT OVe/N++9mf3uV+73/X5FtbW1+DqEw2FEYlEFsVjsM0TjXBNxJFJJJNMpJJNciXQyhQwxlUgiN5VBNpNG NptFejqLVC6L+EwWsZkcIoUcEphFHAWkZguYnpvDHPhP/ivwv+kZYCoHZPKYS+WQjya/0j7B1xIQ4/1B @@ -2530,7 +2530,7 @@ iVBORw0KGgoAAAANSUhEUgAAADAAAAAeCAYAAABqpJ3BAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH + YQUAAAAJcEhZcwAADsEAAA7BAbiRa+0AAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH Nn/4nJycJM7JMSfEWNjGAVMMOAScABamGhxABRkJISFpVxISQkjbe2+zu1N2eu+97czO7Oze3O/JS0LT OVe/N++9mf3uV+73/X5FtbW1+DqEw2FEYlEFsVjsM0TjXBNxJFJJJNMpJJNciXQyhQwxlUgiN5VBNpNG NptFejqLVC6L+EwWsZkcIoUcEphFHAWkZguYnpvDHPhP/ivwv+kZYCoHZPKYS+WQjya/0j7B1xIQ4/1B @@ -2603,7 +2603,7 @@ iVBORw0KGgoAAAANSUhEUgAAADAAAAAeCAYAAABqpJ3BAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH + YQUAAAAJcEhZcwAADsEAAA7BAbiRa+0AAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH Nn/4nJycJM7JMSfEWNjGAVMMOAScABamGhxABRkJISFpVxISQkjbe2+zu1N2eu+97czO7Oze3O/JS0LT OVe/N++9mf3uV+73/X5FtbW1+DqEw2FEYlEFsVjsM0TjXBNxJFJJJNMpJJNciXQyhQwxlUgiN5VBNpNG NptFejqLVC6L+EwWsZkcIoUcEphFHAWkZguYnpvDHPhP/ivwv+kZYCoHZPKYS+WQjya/0j7B1xIQ4/1B @@ -2676,7 +2676,7 @@ iVBORw0KGgoAAAANSUhEUgAAADAAAAAeCAYAAABqpJ3BAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH + YQUAAAAJcEhZcwAADsEAAA7BAbiRa+0AAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH Nn/4nJycJM7JMSfEWNjGAVMMOAScABamGhxABRkJISFpVxISQkjbe2+zu1N2eu+97czO7Oze3O/JS0LT OVe/N++9mf3uV+73/X5FtbW1+DqEw2FEYlEFsVjsM0TjXBNxJFJJJNMpJJNciXQyhQwxlUgiN5VBNpNG NptFejqLVC6L+EwWsZkcIoUcEphFHAWkZguYnpvDHPhP/ivwv+kZYCoHZPKYS+WQjya/0j7B1xIQ4/1B @@ -2749,7 +2749,7 @@ iVBORw0KGgoAAAANSUhEUgAAADAAAAAeCAYAAABqpJ3BAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH + YQUAAAAJcEhZcwAADsEAAA7BAbiRa+0AAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH Nn/4nJycJM7JMSfEWNjGAVMMOAScABamGhxABRkJISFpVxISQkjbe2+zu1N2eu+97czO7Oze3O/JS0LT OVe/N++9mf3uV+73/X5FtbW1+DqEw2FEYlEFsVjsM0TjXBNxJFJJJNMpJJNciXQyhQwxlUgiN5VBNpNG NptFejqLVC6L+EwWsZkcIoUcEphFHAWkZguYnpvDHPhP/ivwv+kZYCoHZPKYS+WQjya/0j7B1xIQ4/1B @@ -2822,7 +2822,7 @@ iVBORw0KGgoAAAANSUhEUgAAADAAAAAeCAYAAABqpJ3BAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH + YQUAAAAJcEhZcwAADsEAAA7BAbiRa+0AAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH Nn/4nJycJM7JMSfEWNjGAVMMOAScABamGhxABRkJISFpVxISQkjbe2+zu1N2eu+97czO7Oze3O/JS0LT OVe/N++9mf3uV+73/X5FtbW1+DqEw2FEYlEFsVjsM0TjXBNxJFJJJNMpJJNciXQyhQwxlUgiN5VBNpNG NptFejqLVC6L+EwWsZkcIoUcEphFHAWkZguYnpvDHPhP/ivwv+kZYCoHZPKYS+WQjya/0j7B1xIQ4/1B @@ -2895,7 +2895,7 @@ iVBORw0KGgoAAAANSUhEUgAAADAAAAAeCAYAAABqpJ3BAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH + YQUAAAAJcEhZcwAADsEAAA7BAbiRa+0AAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH Nn/4nJycJM7JMSfEWNjGAVMMOAScABamGhxABRkJISFpVxISQkjbe2+zu1N2eu+97czO7Oze3O/JS0LT OVe/N++9mf3uV+73/X5FtbW1+DqEw2FEYlEFsVjsM0TjXBNxJFJJJNMpJJNciXQyhQwxlUgiN5VBNpNG NptFejqLVC6L+EwWsZkcIoUcEphFHAWkZguYnpvDHPhP/ivwv+kZYCoHZPKYS+WQjya/0j7B1xIQ4/1B @@ -2968,7 +2968,7 @@ iVBORw0KGgoAAAANSUhEUgAAADAAAAAeCAYAAABqpJ3BAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH + YQUAAAAJcEhZcwAADsEAAA7BAbiRa+0AAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH Nn/4nJycJM7JMSfEWNjGAVMMOAScABamGhxABRkJISFpVxISQkjbe2+zu1N2eu+97czO7Oze3O/JS0LT OVe/N++9mf3uV+73/X5FtbW1+DqEw2FEYlEFsVjsM0TjXBNxJFJJJNMpJJNciXQyhQwxlUgiN5VBNpNG NptFejqLVC6L+EwWsZkcIoUcEphFHAWkZguYnpvDHPhP/ivwv+kZYCoHZPKYS+WQjya/0j7B1xIQ4/1B @@ -3041,7 +3041,7 @@ iVBORw0KGgoAAAANSUhEUgAAADAAAAAeCAYAAABqpJ3BAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH + YQUAAAAJcEhZcwAADsEAAA7BAbiRa+0AAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH Nn/4nJycJM7JMSfEWNjGAVMMOAScABamGhxABRkJISFpVxISQkjbe2+zu1N2eu+97czO7Oze3O/JS0LT OVe/N++9mf3uV+73/X5FtbW1+DqEw2FEYlEFsVjsM0TjXBNxJFJJJNMpJJNciXQyhQwxlUgiN5VBNpNG NptFejqLVC6L+EwWsZkcIoUcEphFHAWkZguYnpvDHPhP/ivwv+kZYCoHZPKYS+WQjya/0j7B1xIQ4/1B @@ -3114,7 +3114,7 @@ iVBORw0KGgoAAAANSUhEUgAAADAAAAAeCAYAAABqpJ3BAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH + YQUAAAAJcEhZcwAADsEAAA7BAbiRa+0AAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH Nn/4nJycJM7JMSfEWNjGAVMMOAScABamGhxABRkJISFpVxISQkjbe2+zu1N2eu+97czO7Oze3O/JS0LT OVe/N++9mf3uV+73/X5FtbW1+DqEw2FEYlEFsVjsM0TjXBNxJFJJJNMpJJNciXQyhQwxlUgiN5VBNpNG NptFejqLVC6L+EwWsZkcIoUcEphFHAWkZguYnpvDHPhP/ivwv+kZYCoHZPKYS+WQjya/0j7B1xIQ4/1B @@ -3187,7 +3187,7 @@ iVBORw0KGgoAAAANSUhEUgAAADAAAAAeCAYAAABqpJ3BAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH + YQUAAAAJcEhZcwAADsEAAA7BAbiRa+0AAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH Nn/4nJycJM7JMSfEWNjGAVMMOAScABamGhxABRkJISFpVxISQkjbe2+zu1N2eu+97czO7Oze3O/JS0LT OVe/N++9mf3uV+73/X5FtbW1+DqEw2FEYlEFsVjsM0TjXBNxJFJJJNMpJJNciXQyhQwxlUgiN5VBNpNG NptFejqLVC6L+EwWsZkcIoUcEphFHAWkZguYnpvDHPhP/ivwv+kZYCoHZPKYS+WQjya/0j7B1xIQ4/1B @@ -3260,7 +3260,7 @@ iVBORw0KGgoAAAANSUhEUgAAADAAAAAeCAYAAABqpJ3BAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH + YQUAAAAJcEhZcwAADsEAAA7BAbiRa+0AAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH Nn/4nJycJM7JMSfEWNjGAVMMOAScABamGhxABRkJISFpVxISQkjbe2+zu1N2eu+97czO7Oze3O/JS0LT OVe/N++9mf3uV+73/X5FtbW1+DqEw2FEYlEFsVjsM0TjXBNxJFJJJNMpJJNciXQyhQwxlUgiN5VBNpNG NptFejqLVC6L+EwWsZkcIoUcEphFHAWkZguYnpvDHPhP/ivwv+kZYCoHZPKYS+WQjya/0j7B1xIQ4/1B @@ -3333,7 +3333,7 @@ iVBORw0KGgoAAAANSUhEUgAAADAAAAAeCAYAAABqpJ3BAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH + YQUAAAAJcEhZcwAADsEAAA7BAbiRa+0AAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH Nn/4nJycJM7JMSfEWNjGAVMMOAScABamGhxABRkJISFpVxISQkjbe2+zu1N2eu+97czO7Oze3O/JS0LT OVe/N++9mf3uV+73/X5FtbW1+DqEw2FEYlEFsVjsM0TjXBNxJFJJJNMpJJNciXQyhQwxlUgiN5VBNpNG NptFejqLVC6L+EwWsZkcIoUcEphFHAWkZguYnpvDHPhP/ivwv+kZYCoHZPKYS+WQjya/0j7B1xIQ4/1B @@ -3406,7 +3406,7 @@ iVBORw0KGgoAAAANSUhEUgAAADAAAAAeCAYAAABqpJ3BAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH + YQUAAAAJcEhZcwAADsEAAA7BAbiRa+0AAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH Nn/4nJycJM7JMSfEWNjGAVMMOAScABamGhxABRkJISFpVxISQkjbe2+zu1N2eu+97czO7Oze3O/JS0LT OVe/N++9mf3uV+73/X5FtbW1+DqEw2FEYlEFsVjsM0TjXBNxJFJJJNMpJJNciXQyhQwxlUgiN5VBNpNG NptFejqLVC6L+EwWsZkcIoUcEphFHAWkZguYnpvDHPhP/ivwv+kZYCoHZPKYS+WQjya/0j7B1xIQ4/1B @@ -3479,7 +3479,7 @@ iVBORw0KGgoAAAANSUhEUgAAADAAAAAeCAYAAABqpJ3BAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH + YQUAAAAJcEhZcwAADsEAAA7BAbiRa+0AAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH Nn/4nJycJM7JMSfEWNjGAVMMOAScABamGhxABRkJISFpVxISQkjbe2+zu1N2eu+97czO7Oze3O/JS0LT OVe/N++9mf3uV+73/X5FtbW1+DqEw2FEYlEFsVjsM0TjXBNxJFJJJNMpJJNciXQyhQwxlUgiN5VBNpNG NptFejqLVC6L+EwWsZkcIoUcEphFHAWkZguYnpvDHPhP/ivwv+kZYCoHZPKYS+WQjya/0j7B1xIQ4/1B @@ -3552,7 +3552,7 @@ iVBORw0KGgoAAAANSUhEUgAAADAAAAAeCAYAAABqpJ3BAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH + YQUAAAAJcEhZcwAADsEAAA7BAbiRa+0AAA+KSURBVFhHdVh3lFz1ed04DSODAHVtU9ldrcqqCySKgTjH Nn/4nJycJM7JMSfEWNjGAVMMOAScABamGhxABRkJISFpVxISQkjbe2+zu1N2eu+97czO7Oze3O/JS0LT OVe/N++9mf3uV+73/X5FtbW1+DqEw2FEYlEFsVjsM0TjXBNxJFJJJNMpJJNciXQyhQwxlUgiN5VBNpNG NptFejqLVC6L+EwWsZkcIoUcEphFHAWkZguYnpvDHPhP/ivwv+kZYCoHZPKYS+WQjya/0j7B1xIQ4/1B diff --git a/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationParams.cs b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationParams.cs index 96715db8e..1e2832706 100644 --- a/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationParams.cs +++ b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationParams.cs @@ -8,6 +8,7 @@ using System.Xml.Serialization; using Config.Entities; using TBF.BenchControl.Generic; using TBF.Resources; +using System.Collections.Generic; namespace TBF.BenchControl.TestMethods.iPerlCommunication { @@ -37,6 +38,39 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication public override string ParamName(int i) { return paramNames[i]; } public override int ParamsCount() { return paramNames.Length; } + public override IList ParamValues(int i) + { + IList retVal = new List(); + + if (i == 0) + { + retVal.Add("Read configuration"); + retVal.Add("Set Test mode A0"); + retVal.Add("Set Test mode A4"); + retVal.Add("Read calibration"); + retVal.Add("Normalize calibration factor"); + retVal.Add("Reset Q2 correction"); + retVal.Add("Write calibration factor"); + retVal.Add("Write Q2 correction"); + retVal.Add("Write Q2 correction Alt"); + retVal.Add("Write Q2 correction Greece"); + retVal.Add("Q2 corrected from Q2adj"); + retVal.Add("Set Active mode"); + retVal.Add("---"); + retVal.Add("Reset 2Hz correction"); + retVal.Add("Write 2Hz correction"); + retVal.Add("Read configuration if enabled"); + retVal.Add("Set Test mode 80"); + } + else + { + retVal.Add(Strings.yes); + retVal.Add(Strings.no); + } + + return retVal; + } + public override string ToString(int i) { switch (i) diff --git a/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/ProcParams.cs b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/ProcParams.cs index 41fa49ab9..bcbe62982 100644 --- a/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/ProcParams.cs +++ b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/ProcParams.cs @@ -8,6 +8,7 @@ using System.Xml.Serialization; using Config.Entities; using TBF.BenchControl.Generic; using TBF.Resources; +using System.Collections.Generic; namespace TBF.BenchControl.TestMethods.iPerlCommunication.iPerlHead { @@ -50,7 +51,19 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication.iPerlHead #endif }; public override string ParamName(int i) { return paramNames[i]; } - public override int ParamsCount() { return paramNames.Length; } + public override int ParamsCount() { return paramNames.Length; } + + public override IList ParamValues(int i) + { + if (i == 0) + { + IList retVal = new List(); + for (MeterType mt = 0; mt < MeterType.Count; mt++) retVal.Add(mt.ToString()); + return retVal; + } + + return null; + } public override string ToString(int i) { diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs index 85408eb58..f79d849a6 100644 --- a/TBF/Properties/AssemblyInfo.cs +++ b/TBF/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("2.18.982.0")] -[assembly: AssemblyFileVersion("2.18.982.0")] +[assembly: AssemblyVersion("2.18.984.0")] +[assembly: AssemblyFileVersion("2.18.984.0")] diff --git a/TBF/UiControls/ProcedureParamsCtrl.cs b/TBF/UiControls/ProcedureParamsCtrl.cs index 423f66885..06723732d 100644 --- a/TBF/UiControls/ProcedureParamsCtrl.cs +++ b/TBF/UiControls/ProcedureParamsCtrl.cs @@ -90,13 +90,23 @@ namespace TBF.UiControls paramsCount = sampleToCreateHeader.ParamsCount(); editors = new Control[paramsCount]; - for (int i = 0; i < paramsCount; i++) - { - listViewEx.Columns.Add(sampleToCreateHeader.ParamName(i), 80); - editors[i] = new TextBox(); + for (int i = 0; i < paramsCount; i++) + { + listViewEx.Columns.Add(sampleToCreateHeader.ParamName(i), 80); + IList values = sampleToCreateHeader.ParamValues(i); + if (values == null) + { + editors[i] = new TextBox(); + } + else + { + ComboBox cb = new ComboBox(); + foreach (var v in values) cb.Items.Add(v); + editors[i] = cb; + } editors[i].Visible = false; this.Controls.Add(editors[i]); - } + } } listViewEx.SubItemClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemClicked); diff --git a/TBF/UiControls/TestParamsCtrl.cs b/TBF/UiControls/TestParamsCtrl.cs index c9a12f27e..9c63bf7c9 100644 --- a/TBF/UiControls/TestParamsCtrl.cs +++ b/TBF/UiControls/TestParamsCtrl.cs @@ -77,13 +77,23 @@ namespace TBF.UiControls paramsCount = sampleToCreateHeader.ParamsCount(); editors = new Control[paramsCount]; - for (int i = 0; i < paramsCount; i++) - { - listViewEx.Columns.Add(sampleToCreateHeader.ParamName(i), 90); - editors[i] = new TextBox(); + for (int i = 0; i < paramsCount; i++) + { + listViewEx.Columns.Add(sampleToCreateHeader.ParamName(i), 90); + IList values = sampleToCreateHeader.ParamValues(i); + if (values == null) + { + editors[i] = new TextBox(); + } + else + { + ComboBox cb = new ComboBox(); + foreach (var v in values) cb.Items.Add(v); + editors[i] = cb; + } editors[i].Visible = false; this.Controls.Add(editors[i]); - } + } } listViewEx.SubItemClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemClicked);