diff --git a/Config/Entities/Enums.cs b/Config/Entities/Enums.cs
index 0368919d5..e1de9da98 100644
--- a/Config/Entities/Enums.cs
+++ b/Config/Entities/Enums.cs
@@ -164,7 +164,7 @@ namespace Config.Entities
public enum Publish : sbyte
{
-#if MUNICH
+#if LANG_DE
/// nemecky
[Description("nie")] Never = 0,
[Description("immer")] Always = 1,
@@ -239,22 +239,22 @@ namespace Config.Entities
/// Possible modes of operation of components and devices.
public enum DebugMode
- {
-#if MUNICH
- [Description("Detected off")] DetectedOff = -2,
- [Description("Detected on")] DetectedOn = -1,
+ {
+#if LANG_DE
+ [Description("Erkennen-aus")] DetectedOff = -2,
+ [Description("Erkennen-ein")] DetectedOn = -1,
[Description("Normal")] Normal = 0, /// Normal operation
- [Description("Auto detect")] AutoDetect, /// The component (device) will be auto-detected
+ [Description("Auto-erkennen")] AutoDetect, /// The component (device) will be auto-detected
[Description("Fehler")] FailureDuringOperation, /// Failure during operation -> disabled
[Description("Aus")] Off, /// The component is off
- [Description("Record")] Record,
+ [Description("Aufzeichnen")] Record,
[Description("Reply")] Reply,
- [Description("Simulation")] Simulate, /// Test bench simulation, this mode does not require any hardware
- [Description("Inherit")] Inherit,
+ [Description("Simuliert")] Simulate, /// Test bench simulation, this mode does not require any hardware
+ [Description("Geerbt")] Inherit,
#else
[Description("Detected off")] DetectedOff = -2,
[Description("Detected on")] DetectedOn = -1,
- [Description("Normal")] Normal = 0, /// Normal operation
+ [Description("normal")] Normal = 0, /// Normal operation
[Description("Auto detect")] AutoDetect, /// The component (device) will be auto-detected
[Description("Run-time error")] FailureDuringOperation, /// Failure during operation -> disabled
[Description("Off")] Off, /// The component is off
@@ -267,15 +267,15 @@ namespace Config.Entities
}
public enum LogLevel
- {
-#if MUNICH
- [Description("Aus")] Off,
- [Description("Fatal")] Fatal,
- [Description("Fehler")] Error,
- [Description("Warn")] Warn,
- [Description("Info")] Info,
- [Description("Debug")] Debug,
- [Description("Alles")] All,
+ {
+#if LANG_DE
+ [Description("Aus")] Off,
+ [Description("Schwerwiegend")] Fatal,
+ [Description("Fehler")] Error,
+ [Description("Warnung")] Warn,
+ [Description("Info")] Info,
+ [Description("Debug")] Debug,
+ [Description("Alles")] All,
#else
[Description("Off")] Off,
[Description("Fatal")] Fatal,
@@ -304,12 +304,12 @@ namespace Config.Entities
}
public enum Alignment
- {
-#if MUNICH
- [Description("Links")] Left,
- [Description("Center")] Center,
- [Description("Rechts")] Right,
- [Description("Justified")] Justified,
+ {
+#if LANG_DE
+ [Description("links")] Left,
+ [Description("zentriert")] Center,
+ [Description("rechts")] Right,
+ [Description("angepasst")] Justified,
#else
[Description("Left")] Left,
[Description("Center")] Center,
diff --git a/TestBenchFramework/ProcedureDlg.cs b/TestBenchFramework/ProcedureDlg.cs
index 8e8f762ea..910fecb40 100644
--- a/TestBenchFramework/ProcedureDlg.cs
+++ b/TestBenchFramework/ProcedureDlg.cs
@@ -653,8 +653,8 @@ namespace TBF
metrology2ListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Err_limit_pos_pct_chdr, Width = 100 });
metrology2ListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Uncertainty_pct_chdr, Width = 100 });
metrology2ListViewEx.Columns.Add(new ColumnHeader { Text = "Filter", Width = 80 }); /// Strings.Tol_red_pct_chdr
- metrology2ListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Publish, Width = 80 });
- metrology2ListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Evaluate, Width = 80 });
+ metrology2ListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Publish, Width = 100 });
+ metrology2ListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Evaluate, Width = 100 });
//metrology2ListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Red_type_chdr, Width = 80 });
//metrology2ListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Err_cor_neg_pct_chdr, Width = 90 });
//metrology2ListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Err_cor_pos_pct_chdr, Width = 90 });
@@ -772,10 +772,12 @@ namespace TBF
Qfrom,
Qto,
PumpPower,
+#if STABLE_MASS_EXTRAS
MassRepeats,
MassSpread,
MassMethod,
- Time_Pump2StartV,
+#endif
+ Time_Pump2StartV,
Time_BeforeFlow,
Time_Flow2Mass,
Time_Stop2Mass,
@@ -791,9 +793,11 @@ namespace TBF
parametersListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Q_from_m3h, Width = 80 });
parametersListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Q_to_m3h, Width = 80 });
parametersListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Pump_power_pct, Width = 90 });
+#if STABLE_MASS_EXTRAS
parametersListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Mass_repeats, Width = 90 });
parametersListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Mass_spread_kg, Width = 110 });
parametersListViewEx.Columns.Add(new ColumnHeader { Text = Strings.Mass_method, Width = 90 });
+#endif
parametersListViewEx.Columns.Add(new ColumnHeader { Text = Strings.TimePump2StartV_chdr, Width = 70 });
parametersListViewEx.Columns.Add(new ColumnHeader { Text = Strings.TimeBeforeSettingFlow, Width = 70 });
parametersListViewEx.Columns.Add(new ColumnHeader { Text = Strings.TimeFlow2Start_chdr, Width = 70 });
@@ -806,9 +810,11 @@ namespace TBF
new TextBox(), /// Qfrom
new TextBox(), /// Qto
new ComboBox(), /// PumpPower
+#if STABLE_MASS_EXTRAS
new TextBox(), /// MassRepeats
new TextBox(), /// MassSpread
new ComboBox(), /// MassMethod
+#endif
new TextBox(), /// Time_Pump2StartV
new TextBox(), /// Time_BeforeFlow
new TextBox(), /// Time_Flow2Mass
@@ -830,10 +836,10 @@ namespace TBF
((ComboBox)parametersEditors[(int)ParametersClmn.PumpPower]).Items.Add("96");
((ComboBox)parametersEditors[(int)ParametersClmn.PumpPower]).Items.Add("98");
((ComboBox)parametersEditors[(int)ParametersClmn.PumpPower]).Items.Add("100");
-
+#if STABLE_MASS_EXTRAS
((ComboBox)parametersEditors[(int)ParametersClmn.MassMethod]).Items.Add(Strings.stable);
((ComboBox)parametersEditors[(int)ParametersClmn.MassMethod]).Items.Add(Strings.fast);
-
+#endif
foreach (var ctrl in parametersEditors)
{
parametersTabPage.Controls.Add(ctrl);
@@ -924,10 +930,12 @@ namespace TBF
/// Process subitems FeedingPath, ...
///
lviParameters.SubItems.Add(test.PumpPower.ToString("F1"));
+#if STABLE_MASS_EXTRAS
lviParameters.SubItems.Add(test.MassRepeats.ToString());
lviParameters.SubItems.Add(test.MassSpread.ToString("F4"));
lviParameters.SubItems.Add(test.MassMethod ? "fast" : "stable");
- lviParameters.SubItems.Add(test.TimePump2StartV.ToString());
+#endif
+ lviParameters.SubItems.Add(test.TimePump2StartV.ToString());
lviParameters.SubItems.Add(test.TimeBeforeFlow.ToString());
lviParameters.SubItems.Add(test.TimeFlow2Mass.ToString());
lviParameters.SubItems.Add(test.TimeStop2Mass.ToString());
@@ -1090,7 +1098,8 @@ namespace TBF
entity.PumpPower = powerPct;
}
- int itmp;
+ int itmp;
+#if STABLE_MASS_EXTRAS
if (int.TryParse(lvi.SubItems[(int)ParametersClmn.MassRepeats].Text, out itmp)) entity.MassRepeats = itmp;
float massSpread;
@@ -1100,7 +1109,7 @@ namespace TBF
}
entity.MassMethod = lvi.SubItems[(int)ParametersClmn.MassMethod].Text.Equals(Strings.fast);
-
+#endif
if (int.TryParse(lvi.SubItems[(int)ParametersClmn.Time_Pump2StartV].Text, out itmp)) entity.TimePump2StartV = itmp;
if (int.TryParse(lvi.SubItems[(int)ParametersClmn.Time_BeforeFlow].Text, out itmp)) entity.TimeBeforeFlow = itmp;
if (int.TryParse(lvi.SubItems[(int)ParametersClmn.Time_Flow2Mass].Text, out itmp)) entity.TimeFlow2Mass = itmp;
diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs
index 2b7c21e7a..164505a0f 100644
--- a/TestBenchFramework/Properties/AssemblyInfo.cs
+++ b/TestBenchFramework/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number
// Revision
//
-[assembly: AssemblyVersion("2.12.386.1")]
-[assembly: AssemblyFileVersion("2.12.386.1")]
+[assembly: AssemblyVersion("2.12.387.1")]
+[assembly: AssemblyFileVersion("2.12.387.1")]
diff --git a/TestBenchFramework/Resources/Strings.de.resx b/TestBenchFramework/Resources/Strings.de.resx
index f5893c6ad..6f110d93c 100644
--- a/TestBenchFramework/Resources/Strings.de.resx
+++ b/TestBenchFramework/Resources/Strings.de.resx
@@ -214,7 +214,7 @@
Dauer [s]
- Nein
+ nein
ja
@@ -766,7 +766,7 @@
s
- Stab.Zeit [s]
+ Stab. Zeit [s]
weniger
@@ -1249,7 +1249,7 @@
Einstellung Druck
- Prüfdruck einstellen
+ Abpressdruck einstellen
Best.
@@ -1353,4 +1353,22 @@
Anzeigen
+
+ Dr delta
+
+
+ Zeit zur Durchfluseinst. [s]
+
+
+ Zeit Durchfl. IO-Start [s]
+
+
+ Zeit Pumpe-Startventil [s]
+
+
+ Waagebehälter Vol. prüfen
+
+
+ Pumpe starten
+
\ No newline at end of file