Skip to content

Commit

Permalink
New features and bug fix
Browse files Browse the repository at this point in the history
-----Changelog since last commit:-----

* Bug fix ("Use Z" as power command produced wrong lines)

* Some other minor bugs fix.

* Added diagonal Gcode generation mode.

* Added imperial/metric units.

* Added about dialog.

* Some gui improvements.
  • Loading branch information
villamany committed Feb 15, 2015
1 parent 9617708 commit 207753d
Show file tree
Hide file tree
Showing 10 changed files with 5,431 additions and 284 deletions.
417 changes: 267 additions & 150 deletions Form1.Designer.cs

Large diffs are not rendered by default.

548 changes: 417 additions & 131 deletions Form1.cs

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions Form1.resx
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,9 @@
<metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>157, 17</value>
</metadata>
<metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>524, 17</value>
</metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>25</value>
</metadata>
Expand Down
68 changes: 68 additions & 0 deletions Form2.Designer.cs

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

19 changes: 19 additions & 0 deletions Form2.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Windows.Forms;

namespace WindowsFormsApplication1
{
public partial class Form2 : Form
{
public Form2()
{
InitializeComponent();
}
}
}
4,644 changes: 4,644 additions & 0 deletions Form2.resx

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions Properties/Resources.resx
Original file line number Diff line number Diff line change
Expand Up @@ -124,13 +124,13 @@
<data name="right" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\1423670303_repeatR.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="flip_horizontal" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\flip_horizontal.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="left" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\1423670303_repeat.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="inv2" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\inv2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="flip_horizontal" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\flip_horizontal.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>
Binary file added Resources/mar.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions WindowsFormsApplication1.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,20 @@
<Compile Include="Form1.Designer.cs">
<DependentUpon>Form1.cs</DependentUpon>
</Compile>
<Compile Include="Form2.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Form2.Designer.cs">
<DependentUpon>Form2.cs</DependentUpon>
</Compile>
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<EmbeddedResource Include="Form1.resx">
<DependentUpon>Form1.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Form2.resx">
<DependentUpon>Form2.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<SubType>Designer</SubType>
Expand Down Expand Up @@ -87,6 +96,7 @@
<Content Include="3dpBurnerGcode.ico" />
<Content Include="3dpBurnerGcode2.ico" />
<Content Include="picLaser.ico" />
<None Include="Resources\mar.jpg" />
<None Include="Resources\inv2.png" />
<None Include="Resources\flip_vertical.png" />
<None Include="Resources\flip_horizontal.png" />
Expand Down
Binary file modified bin/Release/3dpBurner Image2Gcode.exe
Binary file not shown.

0 comments on commit 207753d

Please sign in to comment.