HeatMetersPath, UI, etc., HEAT_METERS_SUPPORT symbol introduced
ProcedureDlg modifications: (1) localization by TBF.Resources.Strings, (2) Heat meters support FlyingStartMassCollection and CombinedMeters methods with similar sequences
This commit is contained in:
@@ -203,7 +203,7 @@ namespace TBF.Screens
|
||||
|
||||
void UpdateVisibility(MetersKind metersKind)
|
||||
{
|
||||
bool visible = (metersKind == MetersKind.Single);
|
||||
bool visible = (metersKind == MetersKind.Single || metersKind == MetersKind.HeatMeter);
|
||||
|
||||
for (int i = 2 * Config.Data.CompoundWMsCount; i < textBoxesCount; i++)
|
||||
{
|
||||
@@ -249,7 +249,7 @@ namespace TBF.Screens
|
||||
|
||||
scaleCmpntLabel.Text = "---";
|
||||
|
||||
if (currentMetersKind == MetersKind.Single)
|
||||
if (currentMetersKind == MetersKind.Single || currentMetersKind == MetersKind.HeatMeter)
|
||||
{
|
||||
watermeterPictureBox1.Visible = true;
|
||||
watermeterPictureBox2.Visible = true;
|
||||
@@ -332,7 +332,7 @@ namespace TBF.Screens
|
||||
error1Label.Text = "---";
|
||||
passed1Label.Text = "---";
|
||||
|
||||
if (currentMetersKind == MetersKind.Single)
|
||||
if (currentMetersKind == MetersKind.Single || currentMetersKind == MetersKind.HeatMeter)
|
||||
{
|
||||
for (int i = 0; i < textBoxesCount; i++)
|
||||
{
|
||||
@@ -450,7 +450,7 @@ namespace TBF.Screens
|
||||
double refError = TBF.BenchControl.Formulas.ErrorFromVolumes(refVolume, volumeCtv);
|
||||
refErrorLabel.Text = refError.ToString("F3");
|
||||
|
||||
if (currentMetersKind == MetersKind.Single)
|
||||
if (currentMetersKind == MetersKind.Single || currentMetersKind == MetersKind.HeatMeter)
|
||||
{
|
||||
for (int i = 0; i < Math.Min(textBoxesCount, ProcessData.RegisterReaders.Length); i++)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user