Skip to content

Commit

Permalink
+dxf sheets
Browse files Browse the repository at this point in the history
  • Loading branch information
fel88 committed Jul 16, 2021
1 parent 1c67a99 commit 50dad9f
Show file tree
Hide file tree
Showing 11 changed files with 519 additions and 89 deletions.
9 changes: 4 additions & 5 deletions DeepNestLib/Background.cs
Original file line number Diff line number Diff line change
Expand Up @@ -196,24 +196,23 @@ public class MergedResult

public static NFP[] cloneNfp(NFP[] nfp, bool inner = false)
{

if (!inner)
{
return new[] { clone(nfp.First()) };
}
throw new NotImplementedException();

// inner nfp is actually an array of nfps
List<NFP> newnfp = new List<NFP>();
for (var i = 0; i < nfp.Count(); i++)
{
// newnfp.push(clone(nfp[i]));
newnfp.Add(clone(nfp[i]));
}

//return newnfp;
return newnfp.ToArray();
}

public static NFP clone(NFP nfp)
{

NFP newnfp = new NFP();
newnfp.source = nfp.source;
for (var i = 0; i < nfp.length; i++)
Expand Down
2 changes: 0 additions & 2 deletions DeepNestLib/NFP.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
using System.Drawing;
using System.Drawing.Drawing2D;
using System.Linq;
using System.Text;
using System.Xml.Linq;

namespace DeepNestLib
{
Expand Down
2 changes: 1 addition & 1 deletion DeepNestLib/NestingContext.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public class NestingContext
{
public List<NFP> Polygons { get; private set; } = new List<NFP>();
public List<NFP> Sheets { get; private set; } = new List<NFP>();


public double MaterialUtilization { get; private set; } = 0;
public int PlacedPartsCount { get; private set; } = 0;
Expand Down
141 changes: 141 additions & 0 deletions DeepNestPort/AddSheetDialog.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 23 additions & 0 deletions DeepNestPort/AddSheetDialog.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
using System;
using System.Windows.Forms;

namespace DeepNestPort
{
public partial class AddSheetDialog : Form
{
public AddSheetDialog()
{
InitializeComponent();
}

public int SheetWidth { get; set; }
public int SheetHeight { get; set; }
private void button1_Click(object sender, EventArgs e)
{
SheetWidth = (int)numericUpDown1.Value;
SheetHeight = (int)numericUpDown2.Value;
DialogResult = DialogResult.OK;
Close();
}
}
}
120 changes: 120 additions & 0 deletions DeepNestPort/AddSheetDialog.resx
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>
9 changes: 9 additions & 0 deletions DeepNestPort/DeepNestPort.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,12 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="AddSheetDialog.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="AddSheetDialog.Designer.cs">
<DependentUpon>AddSheetDialog.cs</DependentUpon>
</Compile>
<Compile Include="ControlExtensions.cs" />
<Compile Include="DetailLoadInfo.cs" />
<Compile Include="DrawingContext.cs" />
Expand All @@ -70,6 +76,9 @@
<DependentUpon>QntDialog.cs</DependentUpon>
</Compile>
<Compile Include="SheetLoadInfo.cs" />
<EmbeddedResource Include="AddSheetDialog.resx">
<DependentUpon>AddSheetDialog.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Form1.resx">
<DependentUpon>Form1.cs</DependentUpon>
</EmbeddedResource>
Expand Down
Loading

0 comments on commit 50dad9f

Please sign in to comment.