aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters
diff options
context:
space:
mode:
authorAvi Levkovich <avi@twine-s.com>2018-07-18 17:52:17 +0300
committerAvi Levkovich <avi@twine-s.com>2018-07-18 17:52:17 +0300
commite0d570b8994b5d8ac3733075df9aa4d25e723131 (patch)
tree261ebcd32f07ec43cf29030036c077258d8c03a7 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters
parente0c19a620f338848b130ad6d2bd0ce8d5a52ca93 (diff)
parentdf566bfe8b0f5ab0978dc3fa600052cd300fc577 (diff)
downloadTango-e0d570b8994b5d8ac3733075df9aa4d25e723131.tar.gz
Tango-e0d570b8994b5d8ac3733075df9aa4d25e723131.zip
merge build date
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters')
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/SegmentLengthToWidthConverter.cs17
1 files changed, 8 insertions, 9 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/SegmentLengthToWidthConverter.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/SegmentLengthToWidthConverter.cs
index 6157bf5fd..31208a4f4 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/SegmentLengthToWidthConverter.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/SegmentLengthToWidthConverter.cs
@@ -16,18 +16,17 @@ namespace Tango.MachineStudio.Developer.Converters
{
try
{
- if (values.Length == 4)
+ if (values.Length == 3)
{
- Job job = values[0] as Job;
-
- if (job != null && values[1] is double)
+ if (values[0] is double)
{
- double jobLength = System.Convert.ToDouble(values[1]);
- double elementWidth = System.Convert.ToDouble(values[2]);
- double segmentLength = System.Convert.ToDouble(values[3]);
- double totalLength = job.Length;
+ double jobLength = System.Convert.ToDouble(values[0]);
+ double elementWidth = System.Convert.ToDouble(values[1]);
+ double segmentLength = System.Convert.ToDouble(values[2]);
+
+ double result = (segmentLength / jobLength) * elementWidth;
- return (segmentLength / totalLength) * elementWidth;
+ return double.IsInfinity(result) ? 0d : result;
}
else
{