Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Milan Hanajik
|
bc89ea4605 |
@@ -18,7 +18,7 @@
|
|||||||
<DebugType>full</DebugType>
|
<DebugType>full</DebugType>
|
||||||
<Optimize>false</Optimize>
|
<Optimize>false</Optimize>
|
||||||
<OutputPath>bin\Debug\</OutputPath>
|
<OutputPath>bin\Debug\</OutputPath>
|
||||||
<DefineConstants>TRACE;DEBUG;MUNICH</DefineConstants>
|
<DefineConstants>TRACE;DEBUG;RUM_MOB;LANG_RO</DefineConstants>
|
||||||
<ErrorReport>prompt</ErrorReport>
|
<ErrorReport>prompt</ErrorReport>
|
||||||
<WarningLevel>4</WarningLevel>
|
<WarningLevel>4</WarningLevel>
|
||||||
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
|
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
|
||||||
@@ -28,7 +28,7 @@
|
|||||||
<DebugType>pdbonly</DebugType>
|
<DebugType>pdbonly</DebugType>
|
||||||
<Optimize>true</Optimize>
|
<Optimize>true</Optimize>
|
||||||
<OutputPath>bin\Release\</OutputPath>
|
<OutputPath>bin\Release\</OutputPath>
|
||||||
<DefineConstants>TRACE;MUNICH</DefineConstants>
|
<DefineConstants>TRACE;RUM_MOB;LANG_RO</DefineConstants>
|
||||||
<ErrorReport>prompt</ErrorReport>
|
<ErrorReport>prompt</ErrorReport>
|
||||||
<WarningLevel>4</WarningLevel>
|
<WarningLevel>4</WarningLevel>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|||||||
@@ -18,7 +18,7 @@
|
|||||||
<DebugType>full</DebugType>
|
<DebugType>full</DebugType>
|
||||||
<Optimize>false</Optimize>
|
<Optimize>false</Optimize>
|
||||||
<OutputPath>bin\Debug\</OutputPath>
|
<OutputPath>bin\Debug\</OutputPath>
|
||||||
<DefineConstants>TRACE;DEBUG;MUNICH</DefineConstants>
|
<DefineConstants>TRACE;DEBUG;RUM_MOB;LANG_RO</DefineConstants>
|
||||||
<ErrorReport>prompt</ErrorReport>
|
<ErrorReport>prompt</ErrorReport>
|
||||||
<WarningLevel>4</WarningLevel>
|
<WarningLevel>4</WarningLevel>
|
||||||
<PlatformTarget>x86</PlatformTarget>
|
<PlatformTarget>x86</PlatformTarget>
|
||||||
@@ -27,7 +27,7 @@
|
|||||||
<DebugType>pdbonly</DebugType>
|
<DebugType>pdbonly</DebugType>
|
||||||
<Optimize>true</Optimize>
|
<Optimize>true</Optimize>
|
||||||
<OutputPath>bin\Release\</OutputPath>
|
<OutputPath>bin\Release\</OutputPath>
|
||||||
<DefineConstants>TRACE;MUNICH</DefineConstants>
|
<DefineConstants>TRACE;RUM_MOB;LANG_RO</DefineConstants>
|
||||||
<ErrorReport>prompt</ErrorReport>
|
<ErrorReport>prompt</ErrorReport>
|
||||||
<WarningLevel>4</WarningLevel>
|
<WarningLevel>4</WarningLevel>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|||||||
@@ -21,7 +21,7 @@
|
|||||||
<DebugType>full</DebugType>
|
<DebugType>full</DebugType>
|
||||||
<Optimize>false</Optimize>
|
<Optimize>false</Optimize>
|
||||||
<OutputPath>bin\Debug\</OutputPath>
|
<OutputPath>bin\Debug\</OutputPath>
|
||||||
<DefineConstants>TRACE;DEBUG;MUNICH</DefineConstants>
|
<DefineConstants>TRACE;DEBUG;RUM_MOB;LANG_RO</DefineConstants>
|
||||||
<ErrorReport>prompt</ErrorReport>
|
<ErrorReport>prompt</ErrorReport>
|
||||||
<WarningLevel>4</WarningLevel>
|
<WarningLevel>4</WarningLevel>
|
||||||
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
|
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
|
||||||
@@ -31,7 +31,7 @@
|
|||||||
<DebugType>pdbonly</DebugType>
|
<DebugType>pdbonly</DebugType>
|
||||||
<Optimize>true</Optimize>
|
<Optimize>true</Optimize>
|
||||||
<OutputPath>bin\Release\</OutputPath>
|
<OutputPath>bin\Release\</OutputPath>
|
||||||
<DefineConstants>TRACE;MUNICH</DefineConstants>
|
<DefineConstants>TRACE;RUM_MOB;LANG_RO</DefineConstants>
|
||||||
<ErrorReport>prompt</ErrorReport>
|
<ErrorReport>prompt</ErrorReport>
|
||||||
<WarningLevel>4</WarningLevel>
|
<WarningLevel>4</WarningLevel>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|||||||
Generated
+1
-1
@@ -54,7 +54,7 @@ namespace TBF
|
|||||||
this.horizontalSplitContainer = new System.Windows.Forms.SplitContainer();
|
this.horizontalSplitContainer = new System.Windows.Forms.SplitContainer();
|
||||||
this.mainTabControl = new System.Windows.Forms.TabControl();
|
this.mainTabControl = new System.Windows.Forms.TabControl();
|
||||||
this.homeTabPage = new System.Windows.Forms.TabPage();
|
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.processTabPage = new System.Windows.Forms.TabPage();
|
||||||
this.processTabPageCtrl = new TBF.Screens.ProcessTabPageCtrl6();
|
this.processTabPageCtrl = new TBF.Screens.ProcessTabPageCtrl6();
|
||||||
this.insertTabPage = new System.Windows.Forms.TabPage();
|
this.insertTabPage = new System.Windows.Forms.TabPage();
|
||||||
|
|||||||
@@ -1,70 +1,44 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?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">
|
<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>
|
<TestBenches>
|
||||||
<DatabaseSettings>
|
<DatabaseSettings>
|
||||||
<BenchName>TestBench1</BenchName>
|
<BenchName>Mobile test bench</BenchName>
|
||||||
<IsRealBench>true</IsRealBench>
|
<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>
|
<ProceduresDBSettings>
|
||||||
<DbType>MySql</DbType>
|
<DbType>MySql</DbType>
|
||||||
<ConnectionString>SERVER=localhost; DATABASE=testbench2; UID=root; PASSWORD=;</ConnectionString>
|
<ConnectionString>SERVER=localhost; DATABASE=rummob; UID=root; PASSWORD=; CHARSET=utf8;</ConnectionString>
|
||||||
</ProceduresDBSettings>
|
</ProceduresDBSettings>
|
||||||
<WMTypesDBSettings>
|
|
||||||
<DbType>MySql</DbType>
|
|
||||||
<ConnectionString>SERVER=localhost; DATABASE=testbench2; UID=root; PASSWORD=;</ConnectionString>
|
|
||||||
</WMTypesDBSettings>
|
|
||||||
<WaterMetersDBSettings>
|
<WaterMetersDBSettings>
|
||||||
<DbType>MySql</DbType>
|
<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>
|
</WaterMetersDBSettings>
|
||||||
|
<UsersDBSettings>
|
||||||
|
<DbType>MySql</DbType>
|
||||||
|
<ConnectionString />
|
||||||
|
</UsersDBSettings>
|
||||||
</DatabaseSettings>
|
</DatabaseSettings>
|
||||||
</TestBenches>
|
</TestBenches>
|
||||||
<LastBench>TestBench1</LastBench>
|
<LoginMethod>UserName</LoginMethod>
|
||||||
|
<LastBench>Mobile test bench</LastBench>
|
||||||
<BatchNr>1</BatchNr>
|
<BatchNr>1</BatchNr>
|
||||||
<RealDensity>988.2</RealDensity>
|
<RealDensity>998.2008</RealDensity>
|
||||||
<AtTemperature>20</AtTemperature>
|
<AtTemperature>20</AtTemperature>
|
||||||
<RightPaneHorizSplitterDistance>25</RightPaneHorizSplitterDistance>
|
<RightPaneHorizSplitterDistance>25</RightPaneHorizSplitterDistance>
|
||||||
<MainWndLeft>75</MainWndLeft>
|
<TopPaneVerticalSplitterDistance>596</TopPaneVerticalSplitterDistance>
|
||||||
<MainWndTop>5</MainWndTop>
|
<MainWndLeft>76</MainWndLeft>
|
||||||
|
<MainWndTop>21</MainWndTop>
|
||||||
<MainWndWidth>1250</MainWndWidth>
|
<MainWndWidth>1250</MainWndWidth>
|
||||||
<MainWndHeight>750</MainWndHeight>
|
<MainWndHeight>750</MainWndHeight>
|
||||||
<ManiWndMaximized>false</ManiWndMaximized>
|
<ManiWndMaximized>true</ManiWndMaximized>
|
||||||
<ComponentsDlgLeft>200</ComponentsDlgLeft>
|
<ComponentsDlgLeft>200</ComponentsDlgLeft>
|
||||||
<ComponentsDlgTop>100</ComponentsDlgTop>
|
<ComponentsDlgTop>100</ComponentsDlgTop>
|
||||||
<ComponentsDlgWidth>850</ComponentsDlgWidth>
|
<ComponentsDlgWidth>850</ComponentsDlgWidth>
|
||||||
<ComponentsDlgHeight>500</ComponentsDlgHeight>
|
<ComponentsDlgHeight>500</ComponentsDlgHeight>
|
||||||
|
<PopupResultsLeft>0</PopupResultsLeft>
|
||||||
|
<PopupResultsTop>0</PopupResultsTop>
|
||||||
|
<PopupResultsWidth>0</PopupResultsWidth>
|
||||||
|
<PopupResultsHeight>0</PopupResultsHeight>
|
||||||
<PathsDlgLeft>0</PathsDlgLeft>
|
<PathsDlgLeft>0</PathsDlgLeft>
|
||||||
<PathsDlgTop>0</PathsDlgTop>
|
<PathsDlgTop>0</PathsDlgTop>
|
||||||
<PathsDlgWidth>0</PathsDlgWidth>
|
<PathsDlgWidth>0</PathsDlgWidth>
|
||||||
@@ -89,6 +63,10 @@
|
|||||||
<OneProcedureDlgHeight>0</OneProcedureDlgHeight>
|
<OneProcedureDlgHeight>0</OneProcedureDlgHeight>
|
||||||
<PrintOrderLeft>0</PrintOrderLeft>
|
<PrintOrderLeft>0</PrintOrderLeft>
|
||||||
<PrintOrderTop>0</PrintOrderTop>
|
<PrintOrderTop>0</PrintOrderTop>
|
||||||
|
<EnduranceDlgLeft>0</EnduranceDlgLeft>
|
||||||
|
<EnduranceDlgTop>0</EnduranceDlgTop>
|
||||||
|
<EnduranceDlgWidth>0</EnduranceDlgWidth>
|
||||||
|
<EnduranceDlgHeight>0</EnduranceDlgHeight>
|
||||||
<PrintOrderOnlyGoodResult>false</PrintOrderOnlyGoodResult>
|
<PrintOrderOnlyGoodResult>false</PrintOrderOnlyGoodResult>
|
||||||
<PrintOrderOnlyLastResult>false</PrintOrderOnlyLastResult>
|
<PrintOrderOnlyLastResult>false</PrintOrderOnlyLastResult>
|
||||||
<ResultsConfigMeters>Vertically</ResultsConfigMeters>
|
<ResultsConfigMeters>Vertically</ResultsConfigMeters>
|
||||||
|
|||||||
@@ -90,12 +90,12 @@
|
|||||||
<logger name="NHibernate"> <level value="ERROR" /> </logger>
|
<logger name="NHibernate"> <level value="ERROR" /> </logger>
|
||||||
<logger name="TBF.BenchControl.StateMachine"> <level value="INFO" /> </logger>
|
<logger name="TBF.BenchControl.StateMachine"> <level value="INFO" /> </logger>
|
||||||
<logger name="TBF.BenchControl.State"> <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.Pump"> <level value="WARN" /> </logger>
|
||||||
<logger name="TBF.BenchControl.Elde.PumpWithFM"> <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.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.StartMeasurementOp"> <level value="WARN" /> </logger>
|
||||||
<logger name="TBF.BenchControl.Elde.ControlComSim"> <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.Keithley"> <level value="DEBUG" /> </logger>
|
||||||
|
<logger name="TBF.BenchControl.Modbus"> <level value="DEBUG" /> </logger>
|
||||||
</log4net>
|
</log4net>
|
||||||
|
|||||||
@@ -39,7 +39,7 @@
|
|||||||
<DebugType>full</DebugType>
|
<DebugType>full</DebugType>
|
||||||
<Optimize>false</Optimize>
|
<Optimize>false</Optimize>
|
||||||
<OutputPath>bin\Debug\</OutputPath>
|
<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>
|
<ErrorReport>prompt</ErrorReport>
|
||||||
<WarningLevel>4</WarningLevel>
|
<WarningLevel>4</WarningLevel>
|
||||||
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
||||||
@@ -49,7 +49,7 @@
|
|||||||
<DebugType>pdbonly</DebugType>
|
<DebugType>pdbonly</DebugType>
|
||||||
<Optimize>true</Optimize>
|
<Optimize>true</Optimize>
|
||||||
<OutputPath>bin\Release\</OutputPath>
|
<OutputPath>bin\Release\</OutputPath>
|
||||||
<DefineConstants>TRACE;MUNICH;CAMERA</DefineConstants>
|
<DefineConstants>TRACE;RUM_MOB;LANG_RO;STABLE_MASS_EXTRAS;CAMERA</DefineConstants>
|
||||||
<ErrorReport>prompt</ErrorReport>
|
<ErrorReport>prompt</ErrorReport>
|
||||||
<WarningLevel>4</WarningLevel>
|
<WarningLevel>4</WarningLevel>
|
||||||
<PlatformTarget>x86</PlatformTarget>
|
<PlatformTarget>x86</PlatformTarget>
|
||||||
@@ -58,7 +58,7 @@
|
|||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
|
||||||
<DebugSymbols>true</DebugSymbols>
|
<DebugSymbols>true</DebugSymbols>
|
||||||
<OutputPath>bin\Debug\</OutputPath>
|
<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>
|
<DebugType>full</DebugType>
|
||||||
<PlatformTarget>x86</PlatformTarget>
|
<PlatformTarget>x86</PlatformTarget>
|
||||||
<ErrorReport>prompt</ErrorReport>
|
<ErrorReport>prompt</ErrorReport>
|
||||||
@@ -67,7 +67,7 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
|
||||||
<OutputPath>bin\x86\Release\</OutputPath>
|
<OutputPath>bin\x86\Release\</OutputPath>
|
||||||
<DefineConstants>TRACE;MUNICH;CAMERA</DefineConstants>
|
<DefineConstants>TRACE;RUM_MOB;LANG_RO;STABLE_MASS_EXTRAS;CAMERA</DefineConstants>
|
||||||
<Optimize>true</Optimize>
|
<Optimize>true</Optimize>
|
||||||
<DebugType>pdbonly</DebugType>
|
<DebugType>pdbonly</DebugType>
|
||||||
<PlatformTarget>x86</PlatformTarget>
|
<PlatformTarget>x86</PlatformTarget>
|
||||||
@@ -97,8 +97,8 @@
|
|||||||
<SignManifests>false</SignManifests>
|
<SignManifests>false</SignManifests>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="ControlComponent3Munich">
|
<Reference Include="ControlComponent3U">
|
||||||
<HintPath>..\packages\ControlBoard\Munich\ControlComponent3Munich.dll</HintPath>
|
<HintPath>..\packages\ControlBoard\Rumunsko-Mob\ControlComponent3U.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="FluentNHibernate">
|
<Reference Include="FluentNHibernate">
|
||||||
<HintPath>..\packages\FluentNHibernate.2.0.3.0\lib\net40\FluentNHibernate.dll</HintPath>
|
<HintPath>..\packages\FluentNHibernate.2.0.3.0\lib\net40\FluentNHibernate.dll</HintPath>
|
||||||
|
|||||||
Reference in New Issue
Block a user