- added BenchControl/Operations/ProcessDataLoggingOp.cs (forgotten in previous commits)

- fixed a bug in displayng results and progress controls when two tests had the same name
- some work on data entry forms for FixedStartMassCollection method - not finished yet
This commit is contained in:
Milan Hanajik
2014-09-16 16:09:07 +02:00
parent a79be1e07a
commit 54ef1e1216
27 changed files with 2883 additions and 28 deletions
+30
View File
@@ -203,6 +203,27 @@
<DependentUpon>EntryFormCfgCtrl.cs</DependentUpon>
</Compile>
<Compile Include="BenchControl\DataEntry\Munich\EntryFormFactory.cs" />
<Compile Include="BenchControl\DataEntry\WMStates\WMSNsAndStatesForm.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="BenchControl\DataEntry\WMStates\WMSNsAndStatesForm.designer.cs">
<DependentUpon>WMSNsAndStatesForm.cs</DependentUpon>
</Compile>
<Compile Include="BenchControl\DataEntry\WMStates\WMStatesForm.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="BenchControl\DataEntry\WMStates\WMStatesForm.designer.cs">
<DependentUpon>WMStatesForm.cs</DependentUpon>
</Compile>
<Compile Include="BenchControl\DataEntry\WMStates\EntryForm.cs" />
<Compile Include="BenchControl\DataEntry\WMStates\EntryFormCfg.cs" />
<Compile Include="BenchControl\DataEntry\WMStates\EntryFormCfgCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="BenchControl\DataEntry\WMStates\EntryFormCfgCtrl.designer.cs">
<DependentUpon>EntryFormCfgCtrl.cs</DependentUpon>
</Compile>
<Compile Include="BenchControl\DataEntry\WMStates\EntryFormFactory.cs" />
<Compile Include="BenchControl\Elde\FlowMeterTwins\FlowMeter.cs" />
<Compile Include="BenchControl\Elde\FlowMeterTwins\FlowMeterCfg.cs" />
<Compile Include="BenchControl\Elde\FlowMeterTwins\FlowMeterCfgCtrl.cs">
@@ -922,6 +943,15 @@
<EmbeddedResource Include="BenchControl\DataEntry\Munich\EntryFormCfgCtrl.resx">
<DependentUpon>EntryFormCfgCtrl.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="BenchControl\DataEntry\WMStates\WMSNsAndStatesForm.resx">
<DependentUpon>WMSNsAndStatesForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="BenchControl\DataEntry\WMStates\WMStatesForm.resx">
<DependentUpon>WMStatesForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="BenchControl\DataEntry\WMStates\EntryFormCfgCtrl.resx">
<DependentUpon>EntryFormCfgCtrl.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="BenchControl\Elde\Diverter\DiverterCfgCtrl.resx">
<DependentUpon>DiverterCfgCtrl.cs</DependentUpon>
</EmbeddedResource>