aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/Tango.Integration/Printing/LiquidVolume.cs
diff options
context:
space:
mode:
Diffstat (limited to 'Software/Visual_Studio/Tango.Integration/Printing/LiquidVolume.cs')
-rw-r--r--Software/Visual_Studio/Tango.Integration/Printing/LiquidVolume.cs20
1 files changed, 17 insertions, 3 deletions
diff --git a/Software/Visual_Studio/Tango.Integration/Printing/LiquidVolume.cs b/Software/Visual_Studio/Tango.Integration/Printing/LiquidVolume.cs
index f3e4df309..5c5b2bcb5 100644
--- a/Software/Visual_Studio/Tango.Integration/Printing/LiquidVolume.cs
+++ b/Software/Visual_Studio/Tango.Integration/Printing/LiquidVolume.cs
@@ -1,4 +1,5 @@
-using System;
+using Newtonsoft.Json;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
@@ -12,6 +13,7 @@ namespace Tango.Integration.Printing
public class LiquidVolume : ExtendedObject
{
private BrushStop _brushStop;
+ [JsonIgnore]
public BrushStop BrushStop
{
get { return _brushStop; }
@@ -19,7 +21,7 @@ namespace Tango.Integration.Printing
}
private Configuration _configuration;
-
+ [JsonIgnore]
public Configuration Configuration
{
get { return _configuration; }
@@ -27,6 +29,7 @@ namespace Tango.Integration.Printing
}
private IdsPack _idsPack;
+ [JsonIgnore]
public IdsPack IdsPack
{
get { return _idsPack; }
@@ -34,6 +37,7 @@ namespace Tango.Integration.Printing
}
private Rml _rml;
+ [JsonIgnore]
public Rml RML
{
get { return _rml; }
@@ -41,6 +45,7 @@ namespace Tango.Integration.Printing
}
private ProcessParametersTable _processParametersTable;
+ [JsonIgnore]
public ProcessParametersTable ProcessParametersTable
{
get { return _processParametersTable; }
@@ -60,7 +65,7 @@ namespace Tango.Integration.Printing
}
private DispenserStepDivisions _dispenserStepDivision;
-
+ [JsonIgnore]
public DispenserStepDivisions DispenserStepDivision
{
get { return _dispenserStepDivision; }
@@ -89,6 +94,11 @@ namespace Tango.Integration.Printing
RaisePropertyChanged(nameof(Volume));
}
+ public LiquidVolume() //For XML Serialization..
+ {
+
+ }
+
public LiquidVolume(Configuration configuration, IdsPack idsPack, Rml rml, ProcessParametersTable processParametersTable, BrushStop brushStop)
{
ProcessParametersTable = processParametersTable;
@@ -105,6 +115,7 @@ namespace Tango.Integration.Printing
Invalidate();
}
+ [JsonIgnore]
public double LiquidMaxNanoliterPerCentimeter
{
get
@@ -129,6 +140,7 @@ namespace Tango.Integration.Printing
}
}
+ [JsonIgnore]
public double NanoliterPerSecond
{
get
@@ -137,6 +149,7 @@ namespace Tango.Integration.Printing
}
}
+ [JsonIgnore]
public double NanoliterPerCentimeter
{
get
@@ -145,6 +158,7 @@ namespace Tango.Integration.Printing
}
}
+ [JsonIgnore]
public double PulsePerSecond
{
get