From dc067ec2ddb2de1a02832f8cbebf8fe0a129fd91 Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Thu, 7 Nov 2019 13:34:01 +0100 Subject: [PATCH] Reconfigured for ROMA_200 --- Config/Config.csproj | 4 ++-- TBF/SampleConfig/config.xml | 30 ++++++++++++++++++++++-------- TBF/TBF.csproj | 12 ++++++------ TBF/UI/MainWnd.Designer.cs | 4 ++-- Users/Users.csproj | 4 ++-- 5 files changed, 34 insertions(+), 20 deletions(-) diff --git a/Config/Config.csproj b/Config/Config.csproj index 02d5ceb6b..83cc89985 100644 --- a/Config/Config.csproj +++ b/Config/Config.csproj @@ -19,7 +19,7 @@ full false bin\Debug\ - TRACE;DEBUG;MUNICH + TRACE;DEBUG;ROMA_200;LANG_IT;TEST_PROFILES prompt 4 false @@ -30,7 +30,7 @@ pdbonly true bin\Release\ - TRACE;MUNICH + TRACE;ROMA_200;LANG_IT;TEST_PROFILES prompt 4 false diff --git a/TBF/SampleConfig/config.xml b/TBF/SampleConfig/config.xml index 314d8740f..3bff444af 100644 --- a/TBF/SampleConfig/config.xml +++ b/TBF/SampleConfig/config.xml @@ -1,34 +1,44 @@ - en + it - Test Bench + Roma PT200 true MySql - SERVER=localhost; DATABASE=testbench; UID=root; PASSWORD=; CHARSET=utf8; + SERVER=localhost; DATABASE=roma200; UID=root; PASSWORD=; CHARSET=utf8; MySql - SERVER=localhost; DATABASE=testbench-r; UID=root; PASSWORD=; CHARSET=utf8; + SERVER=localhost; DATABASE=roma200-r; UID=root; PASSWORD=; CHARSET=utf8; + + MySql + + - Test Bench + UserName + Roma PT200 1 998.2008 20 25 - 75 - 5 + 596 + 76 + 21 1250 750 - false + true 200 100 850 500 + 0 + 0 + 0 + 0 0 0 0 @@ -53,6 +63,10 @@ 0 0 0 + 0 + 0 + 0 + 0 false false Vertically diff --git a/TBF/TBF.csproj b/TBF/TBF.csproj index 49b320d5c..36a6861ac 100644 --- a/TBF/TBF.csproj +++ b/TBF/TBF.csproj @@ -39,7 +39,7 @@ full false bin\Debug\ - TRACE;DEBUG;MUNICH;CAMERA + TRACE;DEBUG;ROMA_200;STABLE_MASS_EXTRAS;LANG_IT;TEST_PROFILES prompt 4 true @@ -50,7 +50,7 @@ pdbonly true bin\Release\ - TRACE;MUNICH;CAMERA + TRACE;ROMA_200;STABLE_MASS_EXTRAS;LANG_IT;TEST_PROFILES prompt 4 AnyCPU @@ -60,7 +60,7 @@ true bin\Debug\ - TRACE;DEBUG;MUNICH;CAMERA + TRACE;DEBUG;ROMA_200;STABLE_MASS_EXTRAS;LANG_IT;TEST_PROFILES full AnyCPU prompt @@ -70,7 +70,7 @@ bin\x86\Release\ - TRACE;MUNICH;CAMERA + TRACE;ROMA_200;STABLE_MASS_EXTRAS;LANG_IT;TEST_PROFILES true pdbonly AnyCPU @@ -101,8 +101,8 @@ false - - ..\packages\ControlBoard\Munich\ControlComponent3Munich.dll + + ..\packages\ControlBoard\Roma200\ControlComponent3U.dll ..\packages\FluentNHibernate.2.0.3.0\lib\net40\FluentNHibernate.dll diff --git a/TBF/UI/MainWnd.Designer.cs b/TBF/UI/MainWnd.Designer.cs index 8005a86ac..36ae0ff77 100644 --- a/TBF/UI/MainWnd.Designer.cs +++ b/TBF/UI/MainWnd.Designer.cs @@ -54,9 +54,9 @@ namespace TBF.UI this.horizontalSplitContainer = new System.Windows.Forms.SplitContainer(); this.mainTabControl = new System.Windows.Forms.TabControl(); this.homeTabPage = new System.Windows.Forms.TabPage(); - this.ctrlBrdComponent = new ControlComponent3Munich.UserControl1(); + this.ctrlBrdComponent = new ControlComponent_Torino2015.UserControl1(); this.processTabPage = new System.Windows.Forms.TabPage(); - this.processTabPageCtrl = new TBF.UI.Process.ProcessTabPageCtrl6(); + this.processTabPageCtrl = new TBF.UI.Process.ProcessTabPageCtrl24(); this.insertTabPage = new System.Windows.Forms.TabPage(); this.resultsTabPage = new System.Windows.Forms.TabPage(); this.resultsTabPageCtrl = new TBF.UI.ResultsMI.ResultsTabPageCtrl(); diff --git a/Users/Users.csproj b/Users/Users.csproj index dcdeab2ea..6c7220746 100644 --- a/Users/Users.csproj +++ b/Users/Users.csproj @@ -19,7 +19,7 @@ full false bin\Debug\ - DEBUG;TRACE + TRACE;DEBUG;TEST_PROFILES prompt 4 false @@ -28,7 +28,7 @@ pdbonly true bin\Release\ - TRACE + TRACE;TEST_PROFILES prompt 4 false