MonitoringDB --> TracingDB, TBF ver. 2.18.981
This commit is contained in:
parent
bf69524fd8
commit
0ef9505af1
4
.gitignore
vendored
4
.gitignore
vendored
@ -8,8 +8,8 @@ GemCard/bin
|
||||
GemCard/obj
|
||||
GraphLib/bin
|
||||
GraphLib/obj
|
||||
MonitoringDB/bin
|
||||
MonitoringDB/obj
|
||||
TracingDB/bin
|
||||
TracingDB/obj
|
||||
Results/bin/
|
||||
Results/obj/
|
||||
ResultsBrowser/bin/
|
||||
|
||||
2
TBF.sln
2
TBF.sln
@ -42,7 +42,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GraphLib", "GraphLib\GraphL
|
||||
{743DF7DB-C7B6-42EB-986D-0F485E5588E4} = {743DF7DB-C7B6-42EB-986D-0F485E5588E4}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonitoringDB", "MonitoringDB\MonitoringDB.csproj", "{EFEC8A31-3022-4DA7-A8F6-16D30A94C3FF}"
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TracingDB", "TracingDB\TracingDB.csproj", "{EFEC8A31-3022-4DA7-A8F6-16D30A94C3FF}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GemCard", "GemCard\GemCard.csproj", "{8B10D15A-39DE-4B56-8DD1-710C1EB3A697}"
|
||||
EndProject
|
||||
|
||||
@ -6,7 +6,7 @@ using System.Collections.Generic;
|
||||
using log4net;
|
||||
using NHibernate;
|
||||
using Config.Entities;
|
||||
using MonitoringDB.Entities;
|
||||
using TracingDB.Entities;
|
||||
|
||||
namespace TBF.BenchControl.Output.DB.ProductionMonitoring
|
||||
{
|
||||
@ -70,8 +70,8 @@ namespace TBF.BenchControl.Output.DB.ProductionMonitoring
|
||||
sessionFactory = FluentNHibernate.Cfg.Fluently
|
||||
.Configure()
|
||||
.Database(FluentNHibernate.Cfg.Db.MySQLConfiguration.Standard.ConnectionString(monitoringCfg.ConnStr))
|
||||
.Mappings(m => m.FluentMappings.AddFromAssemblyOf<MonitoringDB.Entities.Process>())
|
||||
.ExposeConfiguration(MonitoringDB.FluentNH.BuildSchema)
|
||||
.Mappings(m => m.FluentMappings.AddFromAssemblyOf<TracingDB.Entities.Process>())
|
||||
.ExposeConfiguration(TracingDB.FluentNH.BuildSchema)
|
||||
.BuildSessionFactory();
|
||||
///
|
||||
/// Read processes and worksteps from the database (this verifies DB connection as well)
|
||||
|
||||
@ -8,7 +8,7 @@ using NHibernate;
|
||||
using NHibernate.Criterion;
|
||||
using Config;
|
||||
using Config.Entities;
|
||||
using MonitoringDB.Entities;
|
||||
using TracingDB.Entities;
|
||||
using TBF.BenchControl.Generic;
|
||||
using TBF.BenchControl.GenericDevices;
|
||||
|
||||
|
||||
@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
|
||||
// Build Number
|
||||
// Revision
|
||||
//
|
||||
[assembly: AssemblyVersion("2.18.980.0")]
|
||||
[assembly: AssemblyFileVersion("2.18.980.0")]
|
||||
[assembly: AssemblyVersion("2.18.981.0")]
|
||||
[assembly: AssemblyFileVersion("2.18.981.0")]
|
||||
|
||||
@ -2946,9 +2946,9 @@
|
||||
<Project>{0C0A1F4D-1363-4544-A7C5-196C76D26CCA}</Project>
|
||||
<Name>GraphLib</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\MonitoringDB\MonitoringDB.csproj">
|
||||
<ProjectReference Include="..\TracingDB\TracingDB.csproj">
|
||||
<Project>{EFEC8A31-3022-4DA7-A8F6-16D30A94C3FF}</Project>
|
||||
<Name>MonitoringDB</Name>
|
||||
<Name>TracingDB</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\Results\Results.csproj">
|
||||
<Project>{9D0DCC88-DC81-47EB-9FDD-4C3907871BFB}</Project>
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using log4net;
|
||||
using MonitoringDB.Entities;
|
||||
using TracingDB.Entities;
|
||||
|
||||
namespace MonitoringDB
|
||||
namespace TracingDB
|
||||
{
|
||||
public class BatteryInfo
|
||||
{
|
||||
@ -1,7 +1,7 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace MonitoringDB.Entities
|
||||
namespace TracingDB.Entities
|
||||
{
|
||||
public class Option1 : Interfaces.IOption
|
||||
{
|
||||
@ -1,7 +1,7 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace MonitoringDB.Entities
|
||||
namespace TracingDB.Entities
|
||||
{
|
||||
public class Option2 : Interfaces.IOption
|
||||
{
|
||||
@ -1,7 +1,7 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace MonitoringDB.Entities
|
||||
namespace TracingDB.Entities
|
||||
{
|
||||
public class Part
|
||||
{
|
||||
@ -1,7 +1,7 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace MonitoringDB.Entities
|
||||
namespace TracingDB.Entities
|
||||
{
|
||||
public class Process
|
||||
{
|
||||
@ -1,7 +1,7 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace MonitoringDB.Entities
|
||||
namespace TracingDB.Entities
|
||||
{
|
||||
public class Record
|
||||
{
|
||||
@ -1,7 +1,7 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace MonitoringDB.Entities
|
||||
namespace TracingDB.Entities
|
||||
{
|
||||
public class ReferenceRecord
|
||||
{
|
||||
@ -1,7 +1,7 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace MonitoringDB.Entities
|
||||
namespace TracingDB.Entities
|
||||
{
|
||||
public class Workstep
|
||||
{
|
||||
@ -1,4 +1,4 @@
|
||||
namespace MonitoringDB
|
||||
namespace TracingDB
|
||||
{
|
||||
public enum CodeType
|
||||
{
|
||||
@ -6,7 +6,7 @@ using NHibernate;
|
||||
using NHibernate.Cfg;
|
||||
using NHibernate.Tool.hbm2ddl;
|
||||
|
||||
namespace MonitoringDB
|
||||
namespace TracingDB
|
||||
{
|
||||
public static class FluentNH
|
||||
{
|
||||
@ -110,7 +110,7 @@ namespace MonitoringDB
|
||||
{
|
||||
//using (var transaction = session.BeginTransaction())
|
||||
//{
|
||||
// var part1 = new MonitoringDB.Entities.Part("flow tube", CodeType.UniqueNr, CodeForm.QRCode, 0);
|
||||
// var part1 = new TracingDB.Entities.Part("flow tube", CodeType.UniqueNr, CodeForm.QRCode, 0);
|
||||
// session.SaveOrUpdate(part1);
|
||||
// transaction.Commit();
|
||||
//}
|
||||
@ -9,7 +9,7 @@ using System.Data;
|
||||
using System.Windows.Forms;
|
||||
using System.Runtime.InteropServices;
|
||||
|
||||
namespace MonitoringDB.Forms
|
||||
namespace TracingDB.Forms
|
||||
{
|
||||
/// <summary>
|
||||
/// Event Handler for SubItem events
|
||||
@ -1,4 +1,4 @@
|
||||
namespace MonitoringDB.Forms
|
||||
namespace TracingDB.Forms
|
||||
{
|
||||
partial class ModelessForm
|
||||
{
|
||||
@ -2,7 +2,7 @@
|
||||
using System.Drawing;
|
||||
using System.Windows.Forms;
|
||||
|
||||
namespace MonitoringDB.Forms
|
||||
namespace TracingDB.Forms
|
||||
{
|
||||
public partial class ModelessForm : Form
|
||||
{
|
||||
@ -5,10 +5,10 @@ using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Windows.Forms;
|
||||
using log4net;
|
||||
using MonitoringDB.Entities;
|
||||
using MonitoringDB.Resources;
|
||||
using TracingDB.Entities;
|
||||
using TracingDB.Resources;
|
||||
|
||||
namespace MonitoringDB.Forms
|
||||
namespace TracingDB.Forms
|
||||
{
|
||||
public partial class ResultsConfigDlg : Form
|
||||
{
|
||||
@ -1,7 +1,7 @@
|
||||
///
|
||||
/// Copyright (c) 2016 Sensus Metering Systems
|
||||
///
|
||||
namespace MonitoringDB.Forms
|
||||
namespace TracingDB.Forms
|
||||
{
|
||||
partial class ResultsConfigDlg
|
||||
{
|
||||
@ -39,7 +39,7 @@ namespace MonitoringDB.Forms
|
||||
this.removeAllButton = new System.Windows.Forms.Button();
|
||||
this.removeButton = new System.Windows.Forms.Button();
|
||||
this.addButton = new System.Windows.Forms.Button();
|
||||
this.selectedResultsListViewEx = new MonitoringDB.Forms.ListViewEx();
|
||||
this.selectedResultsListViewEx = new TracingDB.Forms.ListViewEx();
|
||||
this.upButton = new System.Windows.Forms.Button();
|
||||
this.downButton = new System.Windows.Forms.Button();
|
||||
this.SuspendLayout();
|
||||
@ -133,8 +133,8 @@ namespace MonitoringDB.Forms
|
||||
this.selectedResultsListViewEx.TabIndex = 47;
|
||||
this.selectedResultsListViewEx.UseCompatibleStateImageBehavior = false;
|
||||
this.selectedResultsListViewEx.View = System.Windows.Forms.View.Details;
|
||||
this.selectedResultsListViewEx.SubItemClicked += new MonitoringDB.Forms.SubItemEventHandler(this.selectedResultsListViewEx_SubItemClicked);
|
||||
this.selectedResultsListViewEx.SubItemEndEditing += new MonitoringDB.Forms.SubItemEndEditingEventHandler(this.selectedResultsListViewEx_SubItemEndEditing);
|
||||
this.selectedResultsListViewEx.SubItemClicked += new TracingDB.Forms.SubItemEventHandler(this.selectedResultsListViewEx_SubItemClicked);
|
||||
this.selectedResultsListViewEx.SubItemEndEditing += new TracingDB.Forms.SubItemEndEditingEventHandler(this.selectedResultsListViewEx_SubItemEndEditing);
|
||||
//
|
||||
// upButton
|
||||
//
|
||||
@ -1,4 +1,4 @@
|
||||
namespace MonitoringDB.Forms
|
||||
namespace TracingDB.Forms
|
||||
{
|
||||
partial class SettingsDlg
|
||||
{
|
||||
@ -1,7 +1,7 @@
|
||||
using System;
|
||||
using System.Windows.Forms;
|
||||
|
||||
namespace MonitoringDB.Forms
|
||||
namespace TracingDB.Forms
|
||||
{
|
||||
public partial class SettingsDlg : Form
|
||||
{
|
||||
@ -48,16 +48,16 @@ namespace MonitoringDB.Forms
|
||||
}
|
||||
}
|
||||
|
||||
public MonitoringDB.Mode Mode
|
||||
public TracingDB.Mode Mode
|
||||
{
|
||||
set
|
||||
{
|
||||
radioButton1.Checked = (value == MonitoringDB.Mode.Test);
|
||||
radioButton2.Checked = (value == MonitoringDB.Mode.Production);
|
||||
radioButton1.Checked = (value == TracingDB.Mode.Test);
|
||||
radioButton2.Checked = (value == TracingDB.Mode.Production);
|
||||
}
|
||||
get
|
||||
{
|
||||
return radioButton1.Checked ? MonitoringDB.Mode.Test : MonitoringDB.Mode.Production;
|
||||
return radioButton1.Checked ? TracingDB.Mode.Test : TracingDB.Mode.Production;
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
using System;
|
||||
using System.Windows.Forms;
|
||||
|
||||
namespace MonitoringDB.Forms
|
||||
namespace TracingDB.Forms
|
||||
{
|
||||
public partial class TrivialLoginDlg : Form
|
||||
{
|
||||
@ -1,4 +1,4 @@
|
||||
namespace MonitoringDB.Forms
|
||||
namespace TracingDB.Forms
|
||||
{
|
||||
partial class TrivialLoginDlg
|
||||
{
|
||||
@ -1,7 +1,7 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace MonitoringDB.Interfaces
|
||||
namespace TracingDB.Interfaces
|
||||
{
|
||||
public interface IOption
|
||||
{
|
||||
@ -3,12 +3,12 @@
|
||||
///
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using MonitoringDB.Entities;
|
||||
using MonitoringDB.Resources;
|
||||
using TracingDB.Entities;
|
||||
using TracingDB.Resources;
|
||||
using NHibernate;
|
||||
using NHibernate.Criterion;
|
||||
|
||||
namespace MonitoringDB
|
||||
namespace TracingDB
|
||||
{
|
||||
public class ItemSpec
|
||||
{
|
||||
@ -1,6 +1,6 @@
|
||||
using FluentNHibernate.Mapping;
|
||||
|
||||
namespace MonitoringDB.Mappings
|
||||
namespace TracingDB.Mappings
|
||||
{
|
||||
class Option1Map : ClassMap<Entities.Option1>
|
||||
{
|
||||
@ -1,6 +1,6 @@
|
||||
using FluentNHibernate.Mapping;
|
||||
|
||||
namespace MonitoringDB.Mappings
|
||||
namespace TracingDB.Mappings
|
||||
{
|
||||
class Option2Map : ClassMap<Entities.Option2>
|
||||
{
|
||||
@ -1,6 +1,6 @@
|
||||
using FluentNHibernate.Mapping;
|
||||
|
||||
namespace MonitoringDB.Mappings
|
||||
namespace TracingDB.Mappings
|
||||
{
|
||||
class PartMap : ClassMap<Entities.Part>
|
||||
{
|
||||
@ -1,6 +1,6 @@
|
||||
using FluentNHibernate.Mapping;
|
||||
|
||||
namespace MonitoringDB.Mappings
|
||||
namespace TracingDB.Mappings
|
||||
{
|
||||
class ProcessMap : ClassMap<Entities.Process>
|
||||
{
|
||||
@ -1,6 +1,6 @@
|
||||
using FluentNHibernate.Mapping;
|
||||
|
||||
namespace MonitoringDB.Mappings
|
||||
namespace TracingDB.Mappings
|
||||
{
|
||||
class RecordMap : ClassMap<Entities.Record>
|
||||
{
|
||||
@ -1,6 +1,6 @@
|
||||
using FluentNHibernate.Mapping;
|
||||
|
||||
namespace MonitoringDB.Mappings
|
||||
namespace TracingDB.Mappings
|
||||
{
|
||||
class ReferenceRecordMap : ClassMap<Entities.ReferenceRecord>
|
||||
{
|
||||
@ -1,6 +1,6 @@
|
||||
using FluentNHibernate.Mapping;
|
||||
|
||||
namespace MonitoringDB.Mappings
|
||||
namespace TracingDB.Mappings
|
||||
{
|
||||
class WorkstepMap : ClassMap<Entities.Workstep>
|
||||
{
|
||||
@ -8,7 +8,7 @@
|
||||
// </auto-generated>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
namespace MonitoringDB.Properties {
|
||||
namespace TracingDB.Properties {
|
||||
using System;
|
||||
|
||||
|
||||
@ -39,7 +39,7 @@ namespace MonitoringDB.Properties {
|
||||
internal static global::System.Resources.ResourceManager ResourceManager {
|
||||
get {
|
||||
if (object.ReferenceEquals(resourceMan, null)) {
|
||||
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("MonitoringDB.Properties.Resources", typeof(Resources).Assembly);
|
||||
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("TracingDB.Properties.Resources", typeof(Resources).Assembly);
|
||||
resourceMan = temp;
|
||||
}
|
||||
return resourceMan;
|
||||
@ -1,6 +1,6 @@
|
||||
using System;
|
||||
|
||||
namespace MonitoringDB
|
||||
namespace TracingDB
|
||||
{
|
||||
public class QuitAppException : Exception
|
||||
{
|
||||
@ -8,7 +8,7 @@
|
||||
// </auto-generated>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
namespace MonitoringDB.Resources {
|
||||
namespace TracingDB.Resources {
|
||||
using System;
|
||||
|
||||
|
||||
@ -39,7 +39,7 @@ namespace MonitoringDB.Resources {
|
||||
internal static global::System.Resources.ResourceManager ResourceManager {
|
||||
get {
|
||||
if (object.ReferenceEquals(resourceMan, null)) {
|
||||
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("MonitoringDB.Resources.Strings", typeof(Strings).Assembly);
|
||||
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("TracingDB.Resources.Strings", typeof(Strings).Assembly);
|
||||
resourceMan = temp;
|
||||
}
|
||||
return resourceMan;
|
||||
@ -1,6 +1,6 @@
|
||||
using MonitoringDB.Entities;
|
||||
using TracingDB.Entities;
|
||||
|
||||
namespace MonitoringDB
|
||||
namespace TracingDB
|
||||
{
|
||||
public class ScanVerificationInfo
|
||||
{
|
||||
@ -2,7 +2,7 @@
|
||||
using System.Collections.Generic;
|
||||
using System.Xml.Serialization;
|
||||
|
||||
namespace MonitoringDB
|
||||
namespace TracingDB
|
||||
{
|
||||
[XmlRoot("dictionary")]
|
||||
public class SerializableDictionary<TKey, TValue>
|
||||
@ -8,8 +8,8 @@
|
||||
<ProjectGuid>{EFEC8A31-3022-4DA7-A8F6-16D30A94C3FF}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>MonitoringDB</RootNamespace>
|
||||
<AssemblyName>MonitoringDB</AssemblyName>
|
||||
<RootNamespace>TracingDB</RootNamespace>
|
||||
<AssemblyName>TracingDB</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
</PropertyGroup>
|
||||
@ -2,9 +2,9 @@
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using MonitoringDB.Entities;
|
||||
using TracingDB.Entities;
|
||||
|
||||
namespace MonitoringDB
|
||||
namespace TracingDB
|
||||
{
|
||||
public class WMPart
|
||||
{
|
||||
@ -8,8 +8,8 @@ rmdir /s /q GemCard\bin
|
||||
rmdir /s /q GemCard\obj
|
||||
rmdir /s /q GraphLib\bin
|
||||
rmdir /s /q GraphLib\obj
|
||||
rmdir /s /q MonitoringDB\bin
|
||||
rmdir /s /q MonitoringDB\obj
|
||||
rmdir /s /q TracingDB\bin
|
||||
rmdir /s /q TracingDB\obj
|
||||
rmdir /s /q Results\bin
|
||||
rmdir /s /q Results\obj
|
||||
rmdir /s /q ResultsBrowser\bin
|
||||
|
||||
Loading…
Reference in New Issue
Block a user