'Config', 'Results' projects added, includes iPerl opto logging bug-fixes, builds OK, cannot open DB, version 2.0.158.

TestBenchFramework/TransitionsDlg.cs

@@ -7,10 +7,9 @@ using System.Linq;
 using System.Windows.Forms;
 using log4net;
 using NHibernate;
-
+using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.BenchControl.GenericDevices;
-using TBF.Entities;
 using TBF.Resources;
 using TBF.UiControls;
 
@@ -33,13 +32,13 @@ namespace TBF
 		/// Transition sequences to be updated by this dialog.
 		/// Set by the constructor or updated by the parent after creation and before loading.
 		/// </summary>
-		public IList<Entities.TransitionSequence> TransitionSequences;
+		public IList<TransitionSequence> TransitionSequences;
 
         /// <summary>
         /// Virtual bench sequences to be updated by this dialog.
         /// Set by the constructor or updated by the parent after creation and before loading.
         /// </summary>
-        public IList<Entities.VirtualBenchSequence> VirtualBenchSequences;
+        public IList<VirtualBenchSequence> VirtualBenchSequences;
 
 
 		/// Auxiliary public lists used also by user controls in tab pages
@@ -58,7 +57,7 @@ namespace TBF
 			InitializeComponent();
 
 			/// SharedDlgButtons configuration
-			sharedButtons.RequiredGroupMembership = Grp.GID.Metrologists;
+			sharedButtons.RequiredGroupMembership = Config.Grp.GID.Metrologists;
 			sharedButtons.OptionalButtons = SharedButtons.Buttons.Add | SharedButtons.Buttons.Remove |
 											SharedButtons.Buttons.Up | SharedButtons.Buttons.Down |
 											SharedButtons.Buttons.NewTab | SharedButtons.Buttons.RenameTab |
@@ -94,7 +93,7 @@ namespace TBF
             Top    = (ls.TransitionsDlgTop != 0)   ? ls.TransitionsDlgTop    : 150;
 
             /// Open the database
-			Session = FluentCommon.CreateSession(Database.Procedures);
+			Session = Config.FluentCommon.CreateSession(Config.Database.Procedures);
 
             /// Prepare a list of components and a list of all valves in the test bench
             TbfComponents = BenchControl.TbfComponents.LoadComponentsFromDB(Session);
@@ -110,10 +109,10 @@ namespace TBF
 
             /// Load the sequences
             TransitionSequences = Session.CreateQuery("FROM TransitionSequence ORDER BY ItemNr")
-								  .List<Entities.TransitionSequence>();
+								  .List<TransitionSequence>();
 
             VirtualBenchSequences = Session.CreateQuery("FROM VirtualBenchSequence ORDER BY ItemNr")
-                                    .List<Entities.VirtualBenchSequence>();
+                                    .List<VirtualBenchSequence>();
 
 			/// Create a tab with sequence steps for each sequence ordered by ItemNr.
             /// Note: Each sequence (in both sequences together) has a unique ItemNr (0 .. N-1)