UniCB DrShp, AltStrings, double Press, new Cfg style, Lbl,Setp,Msrd pos != 0, arrow keys, refactorization, ver. 3.1.1597
This commit is contained in:
@@ -70,7 +70,7 @@ namespace TBF.BenchControl.MettlerToledo.Standard
|
||||
public int MsrdY { get; set; }
|
||||
public Orient MsrdOrient { get; set; }
|
||||
public string MsrdFormat { get; set; }
|
||||
public Config.Unit MsrdUnits { get; set; }
|
||||
public Config.Unit MsrdUnit { get; set; }
|
||||
|
||||
[XmlIgnore]
|
||||
public IList<GNode> GNodes { get; set; }
|
||||
@@ -92,7 +92,7 @@ namespace TBF.BenchControl.MettlerToledo.Standard
|
||||
Shape = Shape.Scale;
|
||||
Sz = Sz.M;
|
||||
MsrdFormat = "{0:F3}";
|
||||
MsrdUnits = Config.Unit.kg;
|
||||
MsrdUnit = Config.Unit.kg;
|
||||
|
||||
Factory = factory;
|
||||
Name = "WT1";
|
||||
|
||||
@@ -158,7 +158,7 @@ namespace TBF.BenchControl.MettlerToledo.Standard
|
||||
handshakeComboBox.Text = config.Handshake.ToString();
|
||||
|
||||
formatTextBox.Text = config.MsrdFormat;
|
||||
unitsComboBox.Text = config.MsrdUnits.ToString();
|
||||
unitsComboBox.Text = config.MsrdUnit.ToString();
|
||||
}
|
||||
|
||||
public void Unlock()
|
||||
@@ -279,12 +279,12 @@ namespace TBF.BenchControl.MettlerToledo.Standard
|
||||
config.Handshake = GetHandshake(handshakeComboBox.SelectedItem.ToString());
|
||||
|
||||
config.MsrdFormat = formatTextBox.Text;
|
||||
config.MsrdUnits = global::Config.Unit.None;
|
||||
config.MsrdUnit = global::Config.Unit.None;
|
||||
for (Config.Unit units = 0; units < global::Config.Unit.Count; units++)
|
||||
{
|
||||
if (unitsComboBox.Text == units.ToString())
|
||||
{
|
||||
config.MsrdUnits = units;
|
||||
config.MsrdUnit = units;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -81,11 +81,8 @@ namespace TBF.BenchControl.MettlerToledo.Standard
|
||||
/// <summary>The mass after StartMassMeasurement() when MsrmntState == MsrmntState.Valid</summary>
|
||||
public double Mass { get { return mass; } }
|
||||
protected double mass;
|
||||
public double MeasuredVal
|
||||
{
|
||||
get { return mass; }
|
||||
set { } // TODO
|
||||
}
|
||||
public double MeasuredVal { get { return mass; } }
|
||||
public string AltString { get { return string.Empty; } }
|
||||
|
||||
/// <summary>The time stamp after StartMassMeasurement() when MsrmntState == MsrmntState.Valid</summary>
|
||||
public int MsrmntTimeStamp { get { return msrmntTimeStamp; } }
|
||||
|
||||
Reference in New Issue
Block a user