aj/CincyLib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Lookup LowerTool and UpperTool for each step after program is loaded.

Browse Source
This commit is contained in:
AJ
2018-11-12 08:36:57 -05:00
parent ce14bed0da
commit 187fd86358
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
CincyLib/PressBrake/ProgramReader.cs
View File

@@ -1,6 +1,7 @@
using System; using System;
using System.Diagnostics; using System.Diagnostics;
using System.IO; using System.IO;
using System.Linq;
using System.Xml.Linq; using System.Xml.Linq;
namespace CincyLib.PressBrake namespace CincyLib.PressBrake
@@ -16,18 +17,23 @@ namespace CincyLib.PressBrake
public void Read(string file) public void Read(string file)
{ {
var stream = File.OpenRead(file); var xml = XDocument.Load(file);
Program.FilePath = file; Program.FilePath = file;
Read(stream); Read(xml);
} }
public void Read(Stream stream) public void Read(Stream stream)
{ {
var xml = XDocument.Load(stream); var xml = XDocument.Load(stream);
Read(xml);
}
var data = xml.Root.Element("PressBrakeProgram"); private void Read(XDocument doc)
{
var data = doc.Root.Element("PressBrakeProgram");
Program.Version = data.Attribute("Version").ToInt(); Program.Version = data.Attribute("Version").ToInt();
Program.ProgName = data.Attribute("ProgName")?.Value;
Program.MatThick = data.Attribute("MatThick").ToDouble(); Program.MatThick = data.Attribute("MatThick").ToDouble();
Program.MatType = GetMaterialType(data.Attribute("MatType")?.Value); Program.MatType = GetMaterialType(data.Attribute("MatType")?.Value);
Program.KFactor = data.Attribute("KFactor").ToDouble(); Program.KFactor = data.Attribute("KFactor").ToDouble();
@@ -52,6 +58,9 @@ namespace CincyLib.PressBrake
foreach (var item in data.Element("StepData").Descendants("Step")) foreach (var item in data.Element("StepData").Descendants("Step"))
{ {
var step = ReadStep(item); var step = ReadStep(item);
step.UpperTool = Program.UpperToolSets.FirstOrDefault(t => t.Id == step.UpperID);
step.LowerTool = Program.LowerToolSets.FirstOrDefault(t => t.Id == step.LowerID);
Program.Steps.Add(step); Program.Steps.Add(step);
} }
} }
@@ -105,6 +114,7 @@ namespace CincyLib.PressBrake
step.SSRight = x.Attribute("SSRight").ToDouble(); step.SSRight = x.Attribute("SSRight").ToDouble();
step.ReturnSpd = x.Attribute("ReturnSpd").ToDouble(); step.ReturnSpd = x.Attribute("ReturnSpd").ToDouble();
step.SideFlgHeight = x.Attribute("SideFlgHeight").ToDouble(); step.SideFlgHeight = x.Attribute("SideFlgHeight").ToDouble();
return step; return step;
} }

3
CincyLib/PressBrake/Step.cs
View File

@@ -28,5 +28,8 @@
public double SSRight { get; set; } public double SSRight { get; set; }
public double ReturnSpd { get; set; } public double ReturnSpd { get; set; }
public double SideFlgHeight { get; set; } public double SideFlgHeight { get; set; }
public ToolSetup UpperTool { get; set; }
public ToolSetup LowerTool { get; set; }
} }
} }