michal/tbf
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Bug fix in State.cs

Browse Source 
- Component for DN100 being used
This commit is contained in:
Milan Hanajik 2014-08-11 18:33:03 +02:00
parent ffb4d5afb6
commit 7cdfad0738
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
TestBenchFramework/BenchControl/State.cs
View File

@ -42,8 +42,8 @@ namespace TBF.BenchControl
/// </summary> /// </summary>
static State() static State()
{ {
currentState = State.Empty; PermanentOperations = new List<IOperation>();
PermanentOperations = new List<IOperation>(); currentState = State.Empty;
} }
/// ///

2
TestBenchFramework/MainWnd.Designer.cs generated
View File

@ -47,7 +47,7 @@
this.activityLabel = new System.Windows.Forms.Label(); this.activityLabel = new System.Windows.Forms.Label();
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 ControlCom2VB.ControlCom2panel();
this.processTabPage = new System.Windows.Forms.TabPage(); this.processTabPage = new System.Windows.Forms.TabPage();
this.processTabPageCtrl = new TBF.Screens.ProcessTabPageCtrl(); this.processTabPageCtrl = new TBF.Screens.ProcessTabPageCtrl();
this.measurementTabPage = new System.Windows.Forms.TabPage(); this.measurementTabPage = new System.Windows.Forms.TabPage();

2
TestBenchFramework/MainWnd.resx
View File

@ -1063,7 +1063,7 @@
<value>0, 0</value> <value>0, 0</value>
</data> </data>
<data name="&gt;&gt;ctrlBrdComponent.Type" xml:space="preserve"> <data name="&gt;&gt;ctrlBrdComponent.Type" xml:space="preserve">
<value>ControlComponent3Munich.UserControl1, ControlComponent3Munich, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value> <value>ControlCom2VB.ControlCom2panel, ControlCom2VB, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
</data> </data>
<data name="processTabPage.TabIndex" type="System.Int32, mscorlib"> <data name="processTabPage.TabIndex" type="System.Int32, mscorlib">
<value>30</value> <value>30</value>

8
TestBenchFramework/TBF.csproj
View File

@ -38,7 +38,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;DN100</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
</PropertyGroup> </PropertyGroup>
@ -46,7 +46,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;DN100</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<PlatformTarget>AnyCPU</PlatformTarget> <PlatformTarget>AnyCPU</PlatformTarget>
@ -73,8 +73,8 @@
<StartupObject>TBF.Program</StartupObject> <StartupObject>TBF.Program</StartupObject>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="ControlComponent3Munich"> <Reference Include="ControlCom2VB">
<HintPath>..\packages\ControlBoard\ControlComponent3Munich.dll</HintPath> <HintPath>..\packages\ControlBoard\ControlCom2VB.dll</HintPath>
</Reference> </Reference>
<Reference Include="FluentNHibernate"> <Reference Include="FluentNHibernate">
<HintPath>..\packages\FluentNHibernate.1.3.0.733\lib\FluentNHibernate.dll</HintPath> <HintPath>..\packages\FluentNHibernate.1.3.0.733\lib\FluentNHibernate.dll</HintPath>