From bc89ea46058cc47ee424d0c2b81ceaa4a8c683eb Mon Sep 17 00:00:00 2001
From: Milan Hanajik <hanajikmilan@gmail.com>
Date: Fri, 1 Dec 2017 13:45:15 +0100
Subject: [PATCH] Reconfigured for Rumunsko-Mobile

---
 Config/Config.csproj                          |  4 +-
 Results/Results.csproj                        |  4 +-
 ResultsBrowser/ResultsBrowser.csproj          |  4 +-
 TestBenchFramework/MainWnd.Designer.cs        |  2 +-
 TestBenchFramework/SampleConfig/config.xml    | 68 +++++++------------
 .../SampleConfig/log4netConfig.xml            |  4 +-
 TestBenchFramework/TBF.csproj                 | 12 ++--
 7 files changed, 38 insertions(+), 60 deletions(-)

diff --git a/Config/Config.csproj b/Config/Config.csproj
index 96a973b16..2aa1e6525 100644
--- a/Config/Config.csproj
+++ b/Config/Config.csproj
@@ -18,7 +18,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;MUNICH</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;RUM_MOB;LANG_RO</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
@@ -28,7 +28,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;MUNICH</DefineConstants>
+    <DefineConstants>TRACE;RUM_MOB;LANG_RO</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
diff --git a/Results/Results.csproj b/Results/Results.csproj
index cc89a2beb..709141133 100644
--- a/Results/Results.csproj
+++ b/Results/Results.csproj
@@ -18,7 +18,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;MUNICH</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;RUM_MOB;LANG_RO</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>x86</PlatformTarget>
@@ -27,7 +27,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;MUNICH</DefineConstants>
+    <DefineConstants>TRACE;RUM_MOB;LANG_RO</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
diff --git a/ResultsBrowser/ResultsBrowser.csproj b/ResultsBrowser/ResultsBrowser.csproj
index cb844d5b6..fafe193d8 100644
--- a/ResultsBrowser/ResultsBrowser.csproj
+++ b/ResultsBrowser/ResultsBrowser.csproj
@@ -21,7 +21,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;MUNICH</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;RUM_MOB;LANG_RO</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
@@ -31,7 +31,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;MUNICH</DefineConstants>
+    <DefineConstants>TRACE;RUM_MOB;LANG_RO</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
diff --git a/TestBenchFramework/MainWnd.Designer.cs b/TestBenchFramework/MainWnd.Designer.cs
index a4f5d9be1..45fb68252 100644
--- a/TestBenchFramework/MainWnd.Designer.cs
+++ b/TestBenchFramework/MainWnd.Designer.cs
@@ -54,7 +54,7 @@ namespace TBF
             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.Screens.ProcessTabPageCtrl6();
             this.insertTabPage = new System.Windows.Forms.TabPage();
diff --git a/TestBenchFramework/SampleConfig/config.xml b/TestBenchFramework/SampleConfig/config.xml
index df7345213..f4886babe 100644
--- a/TestBenchFramework/SampleConfig/config.xml
+++ b/TestBenchFramework/SampleConfig/config.xml
@@ -1,70 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TestBenchFramework xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <Language>de</Language>
+  <Language>ru</Language>
   <TestBenches>
     <DatabaseSettings>
-      <BenchName>TestBench1</BenchName>
+      <BenchName>Mobile test bench</BenchName>
       <IsRealBench>true</IsRealBench>
-      <UsersDBSettings>
-        <DbType>SQLite</DbType>
-        <ConnectionString>SQLite.db</ConnectionString>
-      </UsersDBSettings>
-      <BenchDBSettings>
-        <DbType>SQLite</DbType>
-        <ConnectionString>SQLite.db</ConnectionString>
-      </BenchDBSettings>
-      <ProceduresDBSettings>
-        <DbType>SQLite</DbType>
-        <ConnectionString>SQLite.db</ConnectionString>
-      </ProceduresDBSettings>
-      <WMTypesDBSettings>
-        <DbType>SQLite</DbType>
-        <ConnectionString>SQLite.db</ConnectionString>
-      </WMTypesDBSettings>
-      <WaterMetersDBSettings>
-        <DbType>SQLite</DbType>
-        <ConnectionString>SQLite.db</ConnectionString>
-      </WaterMetersDBSettings>
-    </DatabaseSettings>
-    <DatabaseSettings>
-      <BenchName>TestBench2</BenchName>
-      <IsRealBench>true</IsRealBench>
-      <UsersDBSettings>
-        <DbType>MySql</DbType>
-        <ConnectionString>SERVER=localhost; DATABASE=testbench2; UID=root; PASSWORD=;</ConnectionString>
-      </UsersDBSettings>
-      <BenchDBSettings>
-        <DbType>MySql</DbType>
-        <ConnectionString>SERVER=localhost; DATABASE=testbench2; UID=root; PASSWORD=;</ConnectionString>
-      </BenchDBSettings>
       <ProceduresDBSettings>
         <DbType>MySql</DbType>
-        <ConnectionString>SERVER=localhost; DATABASE=testbench2; UID=root; PASSWORD=;</ConnectionString>
+        <ConnectionString>SERVER=localhost; DATABASE=rummob; UID=root; PASSWORD=; CHARSET=utf8;</ConnectionString>
       </ProceduresDBSettings>
-      <WMTypesDBSettings>
-        <DbType>MySql</DbType>
-        <ConnectionString>SERVER=localhost; DATABASE=testbench2; UID=root; PASSWORD=;</ConnectionString>
-      </WMTypesDBSettings>
       <WaterMetersDBSettings>
         <DbType>MySql</DbType>
-        <ConnectionString>SERVER=localhost; DATABASE=testbench2; UID=root; PASSWORD=;</ConnectionString>
+        <ConnectionString>SERVER=localhost; DATABASE=rummob-r; UID=root; PASSWORD=; CHARSET=utf8;</ConnectionString>
       </WaterMetersDBSettings>
+      <UsersDBSettings>
+        <DbType>MySql</DbType>
+        <ConnectionString />
+      </UsersDBSettings>
     </DatabaseSettings>
   </TestBenches>
-  <LastBench>TestBench1</LastBench>
+  <LoginMethod>UserName</LoginMethod>
+  <LastBench>Mobile test bench</LastBench>
   <BatchNr>1</BatchNr>
-  <RealDensity>988.2</RealDensity>
+  <RealDensity>998.2008</RealDensity>
   <AtTemperature>20</AtTemperature>
   <RightPaneHorizSplitterDistance>25</RightPaneHorizSplitterDistance>
-  <MainWndLeft>75</MainWndLeft>
-  <MainWndTop>5</MainWndTop>
+  <TopPaneVerticalSplitterDistance>596</TopPaneVerticalSplitterDistance>
+  <MainWndLeft>76</MainWndLeft>
+  <MainWndTop>21</MainWndTop>
   <MainWndWidth>1250</MainWndWidth>
   <MainWndHeight>750</MainWndHeight>
-  <ManiWndMaximized>false</ManiWndMaximized>
+  <ManiWndMaximized>true</ManiWndMaximized>
   <ComponentsDlgLeft>200</ComponentsDlgLeft>
   <ComponentsDlgTop>100</ComponentsDlgTop>
   <ComponentsDlgWidth>850</ComponentsDlgWidth>
   <ComponentsDlgHeight>500</ComponentsDlgHeight>
+  <PopupResultsLeft>0</PopupResultsLeft>
+  <PopupResultsTop>0</PopupResultsTop>
+  <PopupResultsWidth>0</PopupResultsWidth>
+  <PopupResultsHeight>0</PopupResultsHeight>
   <PathsDlgLeft>0</PathsDlgLeft>
   <PathsDlgTop>0</PathsDlgTop>
   <PathsDlgWidth>0</PathsDlgWidth>
@@ -89,6 +63,10 @@
   <OneProcedureDlgHeight>0</OneProcedureDlgHeight>
   <PrintOrderLeft>0</PrintOrderLeft>
   <PrintOrderTop>0</PrintOrderTop>
+  <EnduranceDlgLeft>0</EnduranceDlgLeft>
+  <EnduranceDlgTop>0</EnduranceDlgTop>
+  <EnduranceDlgWidth>0</EnduranceDlgWidth>
+  <EnduranceDlgHeight>0</EnduranceDlgHeight>
   <PrintOrderOnlyGoodResult>false</PrintOrderOnlyGoodResult>
   <PrintOrderOnlyLastResult>false</PrintOrderOnlyLastResult>
   <ResultsConfigMeters>Vertically</ResultsConfigMeters>
diff --git a/TestBenchFramework/SampleConfig/log4netConfig.xml b/TestBenchFramework/SampleConfig/log4netConfig.xml
index c93024625..b7c745eb7 100644
--- a/TestBenchFramework/SampleConfig/log4netConfig.xml
+++ b/TestBenchFramework/SampleConfig/log4netConfig.xml
@@ -90,12 +90,12 @@
 	<logger name="NHibernate"> <level value="ERROR" /> </logger>
 	<logger name="TBF.BenchControl.StateMachine"> <level value="INFO" /> </logger>
 	<logger name="TBF.BenchControl.State"> <level value="INFO" /> </logger>
-	<logger name="TBF.BenchControl.Elde.ControlBoardWrap"> <level value="WARN" /> </logger>
+	<logger name="TBF.BenchControl.Elde.ControlComWrap"> <level value="WARN" /> </logger>
 	<logger name="TBF.BenchControl.Elde.Pump"> <level value="WARN" /> </logger>
 	<logger name="TBF.BenchControl.Elde.PumpWithFM"> <level value="WARN" /> </logger>
 	<logger name="TBF.BenchControl.MettlerToledo"> <level value="WARN" /> </logger>
-	<logger name="TBF.BenchControl.IdcCamera"> <level value="WARN" /> </logger>
 	<logger name="TBF.BenchControl.Elde.StartMeasurementOp"> <level value="WARN" /> </logger>
 	<logger name="TBF.BenchControl.Elde.ControlComSim"> <level value="WARN" /> </logger>
 	<logger name="TBF.BenchControl.Keithley"> <level value="DEBUG" /> </logger>
+	<logger name="TBF.BenchControl.Modbus"> <level value="DEBUG" /> </logger>
 </log4net>
diff --git a/TestBenchFramework/TBF.csproj b/TestBenchFramework/TBF.csproj
index 8f77cbf22..64b178d81 100644
--- a/TestBenchFramework/TBF.csproj
+++ b/TestBenchFramework/TBF.csproj
@@ -39,7 +39,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;MUNICH;CAMERA</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;RUM_MOB;LANG_RO;STABLE_MASS_EXTRAS;CAMERA</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -49,7 +49,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;MUNICH;CAMERA</DefineConstants>
+    <DefineConstants>TRACE;RUM_MOB;LANG_RO;STABLE_MASS_EXTRAS;CAMERA</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>x86</PlatformTarget>
@@ -58,7 +58,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;MUNICH;CAMERA</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;RUM_MOB;LANG_RO;STABLE_MASS_EXTRAS;CAMERA</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
@@ -67,7 +67,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <OutputPath>bin\x86\Release\</OutputPath>
-    <DefineConstants>TRACE;MUNICH;CAMERA</DefineConstants>
+    <DefineConstants>TRACE;RUM_MOB;LANG_RO;STABLE_MASS_EXTRAS;CAMERA</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>x86</PlatformTarget>
@@ -97,8 +97,8 @@
     <SignManifests>false</SignManifests>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="ControlComponent3Munich">
-      <HintPath>..\packages\ControlBoard\Munich\ControlComponent3Munich.dll</HintPath>
+    <Reference Include="ControlComponent3U">
+      <HintPath>..\packages\ControlBoard\Rumunsko-Mob\ControlComponent3U.dll</HintPath>
     </Reference>
     <Reference Include="FluentNHibernate">
       <HintPath>..\packages\FluentNHibernate.2.0.3.0\lib\net40\FluentNHibernate.dll</HintPath>