Refactoring, clean-up, comments, fix in control preventing MainWnd designer to open, ver. 2.18.933

TBF/BenchControl/Output/FileWriters/ImageArchiver/Archiver.cs

@@ -1,18 +1,17 @@
 ///
-/// Copyright (c) 2017 Sensus Metering Systems
+/// Copyright (c) 2017 Sensus Slovensko a.s.
 ///
 using System;
-using System.Collections.Generic;
-using System.Globalization;
 using System.IO;
-using System.Threading;
 using log4net;
-using Config.Entities;
-using TBF.BenchControl;
-using TBF.Resources;
 
 namespace TBF.BenchControl.Output.FileWriters.ImageArchiver
 {
+    /// <summary>
+    /// Implements an operation 'WriteResultsOp(batch)' that copies files from folder
+    ///   Path.Combine(Program.ImagesDir, batch.BatchNr.ToString(), wm.WMPosition.ToString())
+    /// for each water meter in the batch to a destination folder specified by the component properties.
+    /// </summary>
 	public class Archiver : ComponentBase, IOperation, GenericDevices.IResultsWriter
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(Archiver));

TBF/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs

@@ -4,10 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Text;
 using log4net;
-using TBF.BenchControl;
-using TBF.Boxes;
 using TBF.Resources;
 using TBF.UiBridge;
 

TBF/Forms/PreviousResultsDlg.cs

@@ -80,7 +80,7 @@ namespace TBF.Forms
 				{
 					TBF.UiBridge.Bridge.BatchNr = batch.BatchNr;
 
-					Program.MainWnd.ReloadProcedures(batch.ProcedureName);
+					Program.MainWnd.ReloadProcedureComboBoxItems(batch.ProcedureName);
 					TBF.UiBridge.Bridge.Ui2Bench(TBF.UiBridge.UI2BenchCmd.ReloadBatch);
 					break;
 				}

TBF/MainWnd.cs

@@ -256,7 +256,7 @@ namespace TBF
                 }
             }
 
-            procedureComboBox.Text = string.Format("{0}  {1}", Program.LocalSettings.LastProcedureNr, Program.LocalSettings.LastProcedureName);
+            procedureComboBox.Text = string.Format("{0}{1}{2}", Program.LocalSettings.LastProcedureNr, ProcSeparator, Program.LocalSettings.LastProcedureName);
             ProcedureName = Program.LocalSettings.LastProcedureName;
 			rightHorizSplitContainer.SplitterDistance = Program.LocalSettings.RightPaneHorizSplitterDistance;
 			topVerticalSplitContainer.SplitterDistance = Program.LocalSettings.TopPaneVerticalSplitterDistance;
@@ -286,7 +286,7 @@ namespace TBF
 			new System.ComponentModel.ComponentResourceManager(typeof(MainWnd)).ApplyResources(BenchControlPanel, "benchControlPanel");
 			BenchControlPanel.Name = "benchControlPanel";
 			rightHorizSplitContainer.Panel2.Controls.Add(BenchControlPanel);
-			ReloadProcedures();
+			ReloadProcedureComboBoxItems();
 
             /// Select the initial tab page
 			mainTabControl.SelectTab((int)MainTabPageId.Process);		 /// This is to load the 'Process screen'
@@ -387,7 +387,7 @@ namespace TBF
 
 			if (!CycleRunning && ProceduresUpdated)
             {
-                ReloadProcedures();
+                ReloadProcedureComboBoxItems();
             }
         }
 
@@ -445,13 +445,14 @@ namespace TBF
 		/// Read the database and re-initialize procedureComboBox items.
 		/// Try to preserve the original selection.
 		/// </summary>
-        public void ReloadProcedures()
+        public void ReloadProcedureComboBoxItems()
         {
             int separPos = procedureComboBox.Text.IndexOf(ProcSeparator);
-            ReloadProcedures((separPos >= 0) ? procedureComboBox.Text.Substring(separPos + ProcSeparator.Length) : string.Empty);
+            ReloadProcedureComboBoxItems((separPos >= 0) ? procedureComboBox.Text.Substring(separPos + ProcSeparator.Length) : string.Empty);
         }
 
-        public void ReloadProcedures(string procedureNameToSelect)
+
+        public void ReloadProcedureComboBoxItems(string procedureNameToSelect)
 		{
             if (procedureComboBox.Enabled)
             {
@@ -464,7 +465,7 @@ namespace TBF
                 procedureComboBox.Items.Clear();
                 foreach (var proc in procedures)
                 {
-                    string itemText = string.Format("{0}  {1}", proc.ItemNr + 1, proc.Name);
+                    string itemText = string.Format("{0}{1}{2}", proc.ItemNr + 1, ProcSeparator, proc.Name);
                     procedureComboBox.Items.Add(itemText);
                     if (procedureNameToSelect == proc.Name)
                     {
@@ -478,7 +479,7 @@ namespace TBF
                 {
                     if (procedures.Count > 0)
                     {
-                        procedureComboBox.Text = string.Format("{0}  {1}", procedures[0].ItemNr + 1, procedures[0].Name);
+                        procedureComboBox.Text = string.Format("{0}{1}{2}", procedures[0].ItemNr + 1, ProcSeparator, procedures[0].Name);
                         ProcedureName = procedures[0].Name;
                     }
                     else

TBF/Properties/AssemblyInfo.cs

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

TBF/Screens/GraphsTabPageCtrl.cs

@@ -45,16 +45,21 @@ namespace TBF.Screens
 			Localize();
 
 			UpdateCheckBoxesVisibility();
-			checkBox1.Checked = Program.LocalSettings.Graph1_On;
-			checkBox2.Checked = Program.LocalSettings.Graph2_On;
-			checkBox3.Checked = Program.LocalSettings.Graph3_On;
-			checkBox4.Checked = Program.LocalSettings.Graph4_On;
-			checkBox5.Checked = Program.LocalSettings.Graph5_On;
-			checkBox6.Checked = Program.LocalSettings.Graph6_On;
-            checkBox7.Checked = Program.LocalSettings.Graph7_On;
-            checkBox8.Checked = Program.LocalSettings.Graph8_On;
 
-			layoutMode = Program.LocalSettings.GraphsLayoutMode;
+            layoutMode = GraphLib.PlotterGraphPaneEx.LayoutMode.NORMAL;     /// Default value
+            if (Program.LocalSettings != null)
+            {
+                checkBox1.Checked = Program.LocalSettings.Graph1_On;
+                checkBox2.Checked = Program.LocalSettings.Graph2_On;
+                checkBox3.Checked = Program.LocalSettings.Graph3_On;
+                checkBox4.Checked = Program.LocalSettings.Graph4_On;
+                checkBox5.Checked = Program.LocalSettings.Graph5_On;
+                checkBox6.Checked = Program.LocalSettings.Graph6_On;
+                checkBox7.Checked = Program.LocalSettings.Graph7_On;
+                checkBox8.Checked = Program.LocalSettings.Graph8_On;
+                layoutMode = Program.LocalSettings.GraphsLayoutMode;        /// Override the default value
+            }
+
 			layoutModeComboBox.Text = layoutMode.ToString();
 			for (PlotterGraphPaneEx.LayoutMode mode = 0; mode <= PlotterGraphPaneEx.LayoutMode.TILES_HOR; mode++)
 			{

TBF/UiControls/ProceduresCtrl.cs

@@ -133,7 +133,7 @@ namespace TBF.UiControls
 			}
 			Program.LocalSettings.Save();
 
-			Program.MainWnd.ReloadProcedures();
+			Program.MainWnd.ReloadProcedureComboBoxItems();
 		}
 
 		public void AddOne()