aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters
diff options
context:
space:
mode:
authorShlomo Hecht <shlomo@twine-s.com>2018-07-18 08:03:17 +0300
committerShlomo Hecht <shlomo@twine-s.com>2018-07-18 08:03:17 +0300
commit4b0ca04d68b04507cd0947444936509bda3cb8c8 (patch)
treeae9c5d19aa05bf20b1682dbc1ac3441fa2721c67 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters
parente96d9f083aa58b24d2e64cbbec47e638d0ce84a0 (diff)
parent97150bf5a7f5844d9da47523e3136ce87c305ba0 (diff)
downloadTango-4b0ca04d68b04507cd0947444936509bda3cb8c8.tar.gz
Tango-4b0ca04d68b04507cd0947444936509bda3cb8c8.zip
merge
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
{