diff --git a/Config/Config.csproj b/Config/Config.csproj index 02d5ceb6b..a5cd43615 100644 --- a/Config/Config.csproj +++ b/Config/Config.csproj @@ -19,7 +19,7 @@ full false bin\Debug\ - TRACE;DEBUG;MUNICH + TRACE;DEBUG;TURA_IPERL;IPERL;ORACLE_DB;LANG_SK prompt 4 false @@ -30,7 +30,7 @@ pdbonly true bin\Release\ - TRACE;MUNICH + TRACE;TURA_IPERL;IPERL;ORACLE_DB;LANG_SK prompt 4 false diff --git a/Results/Results.csproj b/Results/Results.csproj index fa731fdf0..38f0c6ff6 100644 --- a/Results/Results.csproj +++ b/Results/Results.csproj @@ -19,7 +19,7 @@ full false bin\Debug\ - TRACE;DEBUG + TRACE;DEBUG;TURA_IPERL;IPERL;ORACLE_DB;LANG_SK prompt 4 AnyCPU @@ -29,7 +29,7 @@ pdbonly true bin\Release\ - TRACE + TRACE;TURA_IPERL;IPERL;ORACLE_DB;LANG_SK prompt 4 false diff --git a/ResultsBrowser/ResultsBrowser.csproj b/ResultsBrowser/ResultsBrowser.csproj index cd63d94b7..cf64d38f7 100644 --- a/ResultsBrowser/ResultsBrowser.csproj +++ b/ResultsBrowser/ResultsBrowser.csproj @@ -21,7 +21,7 @@ full false bin\Debug\ - TRACE;DEBUG + TRACE;DEBUG;TURA_IPERL;IPERL;ORACLE_DB;LANG_SK prompt 4 false @@ -32,7 +32,7 @@ pdbonly true bin\Release\ - TRACE + TRACE;TURA_IPERL;IPERL;ORACLE_DB;LANG_SK prompt 4 false diff --git a/TBF/TBF.csproj b/TBF/TBF.csproj index db938cf48..5845b20dc 100644 --- a/TBF/TBF.csproj +++ b/TBF/TBF.csproj @@ -39,45 +39,45 @@ full false bin\Debug\ - TRACE;DEBUG;MUNICH;CAMERA + TRACE;DEBUG;TURA_IPERL;IPERL;ORACLE_DB;LANG_SK;STABLE_MASS_EXTRAS prompt 4 true AnyCPU - false + true pdbonly true bin\Release\ - TRACE;MUNICH;CAMERA + TRACE;TURA_IPERL;IPERL;ORACLE_DB;LANG_SK;STABLE_MASS_EXTRAS prompt 4 AnyCPU true - false + true true bin\Debug\ - TRACE;DEBUG;MUNICH;CAMERA + TRACE;DEBUG;TURA_IPERL;IPERL;ORACLE_DB;LANG_SK;STABLE_MASS_EXTRAS full AnyCPU prompt MinimumRecommendedRules.ruleset true - false + true bin\x86\Release\ - TRACE;MUNICH;CAMERA + TRACE;TURA_IPERL;IPERL;ORACLE_DB;LANG_SK;STABLE_MASS_EXTRAS true pdbonly AnyCPU prompt MinimumRecommendedRules.ruleset true - false + true TBF.Program @@ -101,8 +101,8 @@ false - - ..\packages\ControlBoard\Munich\ControlComponent3Munich.dll + + ..\packages\ControlBoard\iPerlST\ControlComponent3U.dll ..\packages\FluentNHibernate.2.0.3.0\lib\net40\FluentNHibernate.dll @@ -3728,6 +3728,132 @@ + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + Always diff --git a/TBF/UI/MainWnd.Designer.cs b/TBF/UI/MainWnd.Designer.cs index 8005a86ac..4c569fae5 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.ProcessTabPageCtrl48(); this.insertTabPage = new System.Windows.Forms.TabPage(); this.resultsTabPage = new System.Windows.Forms.TabPage(); this.resultsTabPageCtrl = new TBF.UI.ResultsMI.ResultsTabPageCtrl(); diff --git a/TBF/libRfid1.dll b/TBF/libRfid1.dll new file mode 100644 index 000000000..1ce540934 Binary files /dev/null and b/TBF/libRfid1.dll differ diff --git a/TBF/libRfid10.dll b/TBF/libRfid10.dll new file mode 100644 index 000000000..1ce540934 Binary files /dev/null and b/TBF/libRfid10.dll differ diff --git a/TBF/libRfid11.dll b/TBF/libRfid11.dll new file mode 100644 index 000000000..1ce540934 Binary files /dev/null and b/TBF/libRfid11.dll differ diff --git a/TBF/libRfid12.dll b/TBF/libRfid12.dll new file mode 100644 index 000000000..1ce540934 Binary files /dev/null and b/TBF/libRfid12.dll differ diff --git a/TBF/libRfid13.dll b/TBF/libRfid13.dll new file mode 100644 index 000000000..1ce540934 Binary files /dev/null and b/TBF/libRfid13.dll differ diff --git a/TBF/libRfid14.dll b/TBF/libRfid14.dll new file mode 100644 index 000000000..1ce540934 Binary files /dev/null and b/TBF/libRfid14.dll differ diff --git a/TBF/libRfid15.dll b/TBF/libRfid15.dll new file mode 100644 index 000000000..1ce540934 Binary files /dev/null and b/TBF/libRfid15.dll differ diff --git a/TBF/libRfid16.dll b/TBF/libRfid16.dll new file mode 100644 index 000000000..1ce540934 Binary files /dev/null and b/TBF/libRfid16.dll differ diff --git a/TBF/libRfid17.dll b/TBF/libRfid17.dll new file mode 100644 index 000000000..1ce540934 Binary files /dev/null and b/TBF/libRfid17.dll differ diff --git a/TBF/libRfid18.dll b/TBF/libRfid18.dll new file mode 100644 index 000000000..1ce540934 Binary files /dev/null and b/TBF/libRfid18.dll differ diff --git a/TBF/libRfid19.dll b/TBF/libRfid19.dll new file mode 100644 index 000000000..1ce540934 Binary files /dev/null and b/TBF/libRfid19.dll differ diff --git a/TBF/libRfid2.dll b/TBF/libRfid2.dll new file mode 100644 index 000000000..1ce540934 Binary files /dev/null and b/TBF/libRfid2.dll differ diff --git a/TBF/libRfid20.dll b/TBF/libRfid20.dll new file mode 100644 index 000000000..1ce540934 Binary files /dev/null and b/TBF/libRfid20.dll differ diff --git a/TBF/libRfid21.dll b/TBF/libRfid21.dll new file mode 100644 index 000000000..1ce540934 Binary files /dev/null and b/TBF/libRfid21.dll differ diff --git a/TBF/libRfid22.dll b/TBF/libRfid22.dll new file mode 100644 index 000000000..1ce540934 Binary files /dev/null and b/TBF/libRfid22.dll differ diff --git a/TBF/libRfid23.dll b/TBF/libRfid23.dll new file mode 100644 index 000000000..1ce540934 Binary files /dev/null and b/TBF/libRfid23.dll differ diff --git a/TBF/libRfid24.dll b/TBF/libRfid24.dll new file mode 100644 index 000000000..1ce540934 Binary files /dev/null and b/TBF/libRfid24.dll differ diff --git a/TBF/libRfid25.dll b/TBF/libRfid25.dll new file mode 100644 index 000000000..1ce540934 Binary files /dev/null and b/TBF/libRfid25.dll differ diff --git a/TBF/libRfid26.dll b/TBF/libRfid26.dll new file mode 100644 index 000000000..1ce540934 Binary files /dev/null and b/TBF/libRfid26.dll differ diff --git a/TBF/libRfid27.dll b/TBF/libRfid27.dll new file mode 100644 index 000000000..1ce540934 Binary files /dev/null and b/TBF/libRfid27.dll differ diff --git a/TBF/libRfid28.dll b/TBF/libRfid28.dll new file mode 100644 index 000000000..1ce540934 Binary files /dev/null and b/TBF/libRfid28.dll differ diff --git a/TBF/libRfid29.dll b/TBF/libRfid29.dll new file mode 100644 index 000000000..1ce540934 Binary files /dev/null and b/TBF/libRfid29.dll differ diff --git a/TBF/libRfid3.dll b/TBF/libRfid3.dll new file mode 100644 index 000000000..1ce540934 Binary files /dev/null and b/TBF/libRfid3.dll differ diff --git a/TBF/libRfid30.dll b/TBF/libRfid30.dll new file mode 100644 index 000000000..1ce540934 Binary files /dev/null and b/TBF/libRfid30.dll differ diff --git a/TBF/libRfid31.dll b/TBF/libRfid31.dll new file mode 100644 index 000000000..1ce540934 Binary files /dev/null and b/TBF/libRfid31.dll differ diff --git a/TBF/libRfid32.dll b/TBF/libRfid32.dll new file mode 100644 index 000000000..1ce540934 Binary files /dev/null and b/TBF/libRfid32.dll differ diff --git a/TBF/libRfid33.dll b/TBF/libRfid33.dll new file mode 100644 index 000000000..1ce540934 Binary files /dev/null and b/TBF/libRfid33.dll differ diff --git a/TBF/libRfid34.dll b/TBF/libRfid34.dll new file mode 100644 index 000000000..1ce540934 Binary files /dev/null and b/TBF/libRfid34.dll differ diff --git a/TBF/libRfid35.dll b/TBF/libRfid35.dll new file mode 100644 index 000000000..1ce540934 Binary files /dev/null and b/TBF/libRfid35.dll differ diff --git a/TBF/libRfid36.dll b/TBF/libRfid36.dll new file mode 100644 index 000000000..1ce540934 Binary files /dev/null and b/TBF/libRfid36.dll differ diff --git a/TBF/libRfid37.dll b/TBF/libRfid37.dll new file mode 100644 index 000000000..1ce540934 Binary files /dev/null and b/TBF/libRfid37.dll differ diff --git a/TBF/libRfid38.dll b/TBF/libRfid38.dll new file mode 100644 index 000000000..1ce540934 Binary files /dev/null and b/TBF/libRfid38.dll differ diff --git a/TBF/libRfid39.dll b/TBF/libRfid39.dll new file mode 100644 index 000000000..1ce540934 Binary files /dev/null and b/TBF/libRfid39.dll differ diff --git a/TBF/libRfid4.dll b/TBF/libRfid4.dll new file mode 100644 index 000000000..1ce540934 Binary files /dev/null and b/TBF/libRfid4.dll differ diff --git a/TBF/libRfid40.dll b/TBF/libRfid40.dll new file mode 100644 index 000000000..1ce540934 Binary files /dev/null and b/TBF/libRfid40.dll differ diff --git a/TBF/libRfid5.dll b/TBF/libRfid5.dll new file mode 100644 index 000000000..1ce540934 Binary files /dev/null and b/TBF/libRfid5.dll differ diff --git a/TBF/libRfid6.dll b/TBF/libRfid6.dll new file mode 100644 index 000000000..1ce540934 Binary files /dev/null and b/TBF/libRfid6.dll differ diff --git a/TBF/libRfid7.dll b/TBF/libRfid7.dll new file mode 100644 index 000000000..1ce540934 Binary files /dev/null and b/TBF/libRfid7.dll differ diff --git a/TBF/libRfid8.dll b/TBF/libRfid8.dll new file mode 100644 index 000000000..1ce540934 Binary files /dev/null and b/TBF/libRfid8.dll differ diff --git a/TBF/libRfid9.dll b/TBF/libRfid9.dll new file mode 100644 index 000000000..1ce540934 Binary files /dev/null and b/TBF/libRfid9.dll differ diff --git a/TBF/libgcc_s_dw2-1.dll b/TBF/libgcc_s_dw2-1.dll new file mode 100644 index 000000000..90bd246fc Binary files /dev/null and b/TBF/libgcc_s_dw2-1.dll differ diff --git a/TBF/libstdc++-6.dll b/TBF/libstdc++-6.dll new file mode 100644 index 000000000..cb1b0ae46 Binary files /dev/null and b/TBF/libstdc++-6.dll differ diff --git a/UserManagement/UserManagement.csproj b/UserManagement/UserManagement.csproj index b27b6057e..9ad094adb 100644 --- a/UserManagement/UserManagement.csproj +++ b/UserManagement/UserManagement.csproj @@ -39,7 +39,7 @@ DEBUG;TRACE prompt 4 - false + true AnyCPU @@ -49,7 +49,7 @@ TRACE prompt 4 - false + true UserManagement.Program diff --git a/Users/Users.csproj b/Users/Users.csproj index dcdeab2ea..5d232c42c 100644 --- a/Users/Users.csproj +++ b/Users/Users.csproj @@ -19,7 +19,7 @@ full false bin\Debug\ - DEBUG;TRACE + DEBUG;TRACE;TURA_IPERL;LANG_SK prompt 4 false @@ -28,7 +28,7 @@ pdbonly true bin\Release\ - TRACE + TRACE;TURA_IPERL;LANG_SK prompt 4 false