Config.Data.RealDensity etc., DataContainers.Density and Buoyancy components, related metrology tabs modified/created.

This commit is contained in:
Milan Hanajik
2019-09-18 18:49:00 +02:00
parent 0468b5a1f5
commit 74f8c44783
49 changed files with 782 additions and 511 deletions
+24 -22
View File
@@ -158,24 +158,6 @@
<DependentUpon>AmbientCfgCtrl.cs</DependentUpon>
</Compile>
<Compile Include="BenchControl\Ambient\Greco\Factory.cs" />
<Compile Include="BenchControl\BackupAndSecurity\Default\Component.cs" />
<Compile Include="BenchControl\BackupAndSecurity\Default\ComponentCfg.cs" />
<Compile Include="BenchControl\BackupAndSecurity\Default\ComponentFactory.cs" />
<Compile Include="BenchControl\BenchInfo\Extended\Component.cs" />
<Compile Include="BenchControl\BenchInfo\Extended\ComponentCfg.cs" />
<Compile Include="BenchControl\BenchInfo\Extended\ComponentFactory.cs" />
<Compile Include="BenchControl\BenchInfo\iPerl\Component.cs" />
<Compile Include="BenchControl\BenchInfo\iPerl\ComponentCfg.cs" />
<Compile Include="BenchControl\BenchInfo\iPerl\ComponentFactory.cs" />
<Compile Include="BenchControl\BenchInfo\Munich\Component.cs" />
<Compile Include="BenchControl\BenchInfo\Munich\ComponentCfg.cs" />
<Compile Include="BenchControl\BenchInfo\Munich\ComponentCfgCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="BenchControl\BenchInfo\Munich\ComponentCfgCtrl.designer.cs">
<DependentUpon>ComponentCfgCtrl.cs</DependentUpon>
</Compile>
<Compile Include="BenchControl\BenchInfo\Munich\ComponentFactory.cs" />
<Compile Include="BenchControl\ComponentParametersDlg.cs">
<SubType>Form</SubType>
</Compile>
@@ -198,6 +180,21 @@
<Compile Include="BenchControl\Configs\ParamsProvider\ComponentCfgCtrl.designer.cs">
<DependentUpon>ComponentCfgCtrl.cs</DependentUpon>
</Compile>
<Compile Include="BenchControl\DataContainers\BackupAndSecurityOptions\Component.cs" />
<Compile Include="BenchControl\DataContainers\BackupAndSecurityOptions\ComponentCfg.cs" />
<Compile Include="BenchControl\DataContainers\BackupAndSecurityOptions\ComponentFactory.cs" />
<Compile Include="BenchControl\DataContainers\BenchInfo\Extended\Component.cs" />
<Compile Include="BenchControl\DataContainers\BenchInfo\Extended\ComponentCfg.cs" />
<Compile Include="BenchControl\DataContainers\BenchInfo\Extended\ComponentFactory.cs" />
<Compile Include="BenchControl\DataContainers\BenchInfo\iPerl\Component.cs" />
<Compile Include="BenchControl\DataContainers\BenchInfo\iPerl\ComponentCfg.cs" />
<Compile Include="BenchControl\DataContainers\BenchInfo\iPerl\ComponentFactory.cs" />
<Compile Include="BenchControl\DataContainers\Buoyancy\Component.cs" />
<Compile Include="BenchControl\DataContainers\Buoyancy\ComponentCfg.cs" />
<Compile Include="BenchControl\DataContainers\Buoyancy\ComponentFactory.cs" />
<Compile Include="BenchControl\DataContainers\Density\Component.cs" />
<Compile Include="BenchControl\DataContainers\Density\ComponentCfg.cs" />
<Compile Include="BenchControl\DataContainers\Density\ComponentFactory.cs" />
<Compile Include="BenchControl\DataEntry\Combined\TestStartEndForm.cs">
<SubType>Form</SubType>
</Compile>
@@ -597,7 +594,6 @@
<DependentUpon>ValveCfgCtrl.cs</DependentUpon>
</Compile>
<Compile Include="BenchControl\Elde\ValveEx\ValveFactory.cs" />
<Compile Include="BenchControl\GenericDevices\IBackupAndSecurity.cs" />
<Compile Include="BenchControl\GenericDevices\ICalibInfoCfg.cs" />
<Compile Include="BenchControl\GenericDevices\IEvaporation.cs" />
<Compile Include="BenchControl\GenericDevices\IParallelOutput.cs" />
@@ -2006,6 +2002,12 @@
<Compile Include="UI\Bench\Metrology\MetrologyDlgBalanceTab.designer.cs">
<DependentUpon>MetrologyDlgBalanceTab.cs</DependentUpon>
</Compile>
<Compile Include="UI\Bench\Metrology\MetrologyDlgBuoyancyTab.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="UI\Bench\Metrology\MetrologyDlgBuoyancyTab.designer.cs">
<DependentUpon>MetrologyDlgBuoyancyTab.cs</DependentUpon>
</Compile>
<Compile Include="UI\Bench\Metrology\MetrologyDlgDensityTab.cs">
<SubType>UserControl</SubType>
</Compile>
@@ -2383,9 +2385,6 @@
<EmbeddedResource Include="BenchControl\Ambient\Greco\AmbientCfgCtrl.resx">
<DependentUpon>AmbientCfgCtrl.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="BenchControl\BenchInfo\Munich\ComponentCfgCtrl.resx">
<DependentUpon>ComponentCfgCtrl.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="BenchControl\ComponentParametersDlg.resx">
<DependentUpon>ComponentParametersDlg.cs</DependentUpon>
</EmbeddedResource>
@@ -3031,6 +3030,9 @@
<EmbeddedResource Include="UI\Bench\Metrology\MetrologyDlgBalanceTab.resx">
<DependentUpon>MetrologyDlgBalanceTab.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UI\Bench\Metrology\MetrologyDlgBuoyancyTab.resx">
<DependentUpon>MetrologyDlgBuoyancyTab.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UI\Bench\Metrology\MetrologyDlgDensityTab.resx">
<DependentUpon>MetrologyDlgDensityTab.cs</DependentUpon>
</EmbeddedResource>