Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Creat Text form #1098

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Creat Text form #1098

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 49 additions & 0 deletions LaserGRBL/LaserGRBL.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,13 @@
<Compile Include="PSHelper\PSHelperForm.Designer.cs">
<DependentUpon>PSHelperForm.cs</DependentUpon>
</Compile>
<Compile Include="RasterConverter\FontViewModel.cs" />
<Compile Include="RasterConverter\TextToLaserForm.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="RasterConverter\TextToLaserForm.Designer.cs">
<DependentUpon>TextToLaserForm.cs</DependentUpon>
</Compile>
<Compile Include="SaveOptionForm.cs">
<SubType>Form</SubType>
</Compile>
Expand Down Expand Up @@ -1081,6 +1088,48 @@
<EmbeddedResource Include="RasterConverter\ResolutionHelperForm.zh-TW.resx">
<DependentUpon>ResolutionHelperForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="RasterConverter\TextToLaserForm.cs-CZ.resx">
<DependentUpon>TextToLaserForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="RasterConverter\TextToLaserForm.da.resx">
<DependentUpon>TextToLaserForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="RasterConverter\TextToLaserForm.de.resx">
<DependentUpon>TextToLaserForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="RasterConverter\TextToLaserForm.es.resx">
<DependentUpon>TextToLaserForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="RasterConverter\TextToLaserForm.fr.resx">
<DependentUpon>TextToLaserForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="RasterConverter\TextToLaserForm.hu-HU.resx">
<DependentUpon>TextToLaserForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="RasterConverter\TextToLaserForm.it.resx">
<DependentUpon>TextToLaserForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="RasterConverter\TextToLaserForm.pl-PL.resx">
<DependentUpon>TextToLaserForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="RasterConverter\TextToLaserForm.pt-BR.resx">
<DependentUpon>TextToLaserForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="RasterConverter\TextToLaserForm.resx">
<DependentUpon>TextToLaserForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="RasterConverter\TextToLaserForm.ru.resx">
<DependentUpon>TextToLaserForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="RasterConverter\TextToLaserForm.sk-SK.resx">
<DependentUpon>TextToLaserForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="RasterConverter\TextToLaserForm.zh-CN.resx">
<DependentUpon>TextToLaserForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="RasterConverter\TextToLaserForm.zh-TW.resx">
<DependentUpon>TextToLaserForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="ResumeJobForm.cs-CZ.resx">
<DependentUpon>ResumeJobForm.cs</DependentUpon>
</EmbeddedResource>
Expand Down
1,445 changes: 727 additions & 718 deletions LaserGRBL/MainForm.Designer.cs
View file
Open in desktop

Large diffs are not rendered by default.

26 changes: 24 additions & 2 deletions LaserGRBL/MainForm.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

using System;
using System.Drawing;
using System.IO;
using System.Windows.Forms;
using System.Windows.Threading;

Expand Down Expand Up @@ -780,10 +781,31 @@ private void manualsDownloadToolStripMenuItem_Click(object sender, EventArgs e)
{
System.Diagnostics.Process.Start(@"https://lasergrbl.com/ortur-manuals/");
}
}

private void MnCreateText_Click(object sender, EventArgs e)
{
string fileName = Path.GetTempPath();
fileName = Path.Combine(fileName, "image_" + DateTime.Now.ToString("yyyyMMdd_ss") + ".bmp");

using (Bitmap bmp = new Bitmap(200, 100))
{

using (Graphics g = Graphics.FromImage(bmp))
{
g.DrawString("Write something", new Font(FontFamily.GenericSansSerif, 22), Brushes.Black, 0, 0);
bmp.Save(fileName);



RasterConverter.TextToLaserForm form = new RasterConverter.TextToLaserForm(Core, fileName, false);
form.ShowDialog();
}
}
}
}


public class MMnRenderer : ToolStripProfessionalRenderer
public class MMnRenderer : ToolStripProfessionalRenderer
{
public MMnRenderer() : base(new CustomMenuColor()) { }

Expand Down
30 changes: 21 additions & 9 deletions LaserGRBL/MainForm.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@
<value>ConnectionForm</value>
</data>
<data name="&gt;&gt;ConnectionForm.Type" xml:space="preserve">
<value>LaserGRBL.ConnectLogForm, LaserGRBL, Version=3.5.4.0, Culture=neutral, PublicKeyToken=null</value>
<value>LaserGRBL.ConnectLogForm, LaserGRBL, Version=3.7.1.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;ConnectionForm.Parent" xml:space="preserve">
<value>splitContainer1.Panel1</value>
Expand All @@ -175,7 +175,7 @@
<value>JogForm</value>
</data>
<data name="&gt;&gt;JogForm.Type" xml:space="preserve">
<value>LaserGRBL.JogForm, LaserGRBL, Version=3.5.4.0, Culture=neutral, PublicKeyToken=null</value>
<value>LaserGRBL.JogForm, LaserGRBL, Version=3.7.1.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;JogForm.Parent" xml:space="preserve">
<value>splitContainer1.Panel1</value>
Expand Down Expand Up @@ -217,7 +217,7 @@
<value>PreviewForm</value>
</data>
<data name="&gt;&gt;PreviewForm.Type" xml:space="preserve">
<value>LaserGRBL.PreviewForm, LaserGRBL, Version=3.5.4.0, Culture=neutral, PublicKeyToken=null</value>
<value>LaserGRBL.PreviewForm, LaserGRBL, Version=3.7.1.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;PreviewForm.Parent" xml:space="preserve">
<value>splitContainer1.Panel2</value>
Expand Down Expand Up @@ -887,6 +887,12 @@
<data name="MnStartFromPosition.Text" xml:space="preserve">
<value>Send From &amp;Position</value>
</data>
<data name="MnCreateText.Size" type="System.Drawing.Size, System.Drawing">
<value>207, 22</value>
</data>
<data name="MnCreateText.Text" xml:space="preserve">
<value>Create Text</value>
</data>
<data name="fileToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>37, 20</value>
</data>
Expand Down Expand Up @@ -1315,7 +1321,7 @@
</value>
</data>
<data name="orturSupportGroupToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>180, 22</value>
<value>165, 22</value>
</data>
<data name="orturSupportGroupToolStripMenuItem.Text" xml:space="preserve">
<value>Ortur User Group</value>
Expand All @@ -1342,7 +1348,7 @@
</value>
</data>
<data name="orturWebsiteToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>180, 22</value>
<value>165, 22</value>
</data>
<data name="orturWebsiteToolStripMenuItem.Text" xml:space="preserve">
<value>Ortur Website</value>
Expand All @@ -1365,13 +1371,13 @@
</value>
</data>
<data name="youtubeChannelToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>180, 22</value>
<value>165, 22</value>
</data>
<data name="youtubeChannelToolStripMenuItem.Text" xml:space="preserve">
<value>Youtube Channel</value>
</data>
<data name="toolStripSeparator4.Size" type="System.Drawing.Size, System.Drawing">
<value>177, 6</value>
<value>162, 6</value>
</data>
<data name="manualsDownloadToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
Expand Down Expand Up @@ -1448,7 +1454,7 @@
</value>
</data>
<data name="manualsDownloadToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>180, 22</value>
<value>165, 22</value>
</data>
<data name="manualsDownloadToolStripMenuItem.Text" xml:space="preserve">
<value>Ortur Manuals</value>
Expand All @@ -1472,7 +1478,7 @@
</value>
</data>
<data name="firmwareToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>180, 22</value>
<value>165, 22</value>
</data>
<data name="firmwareToolStripMenuItem.Text" xml:space="preserve">
<value>Ortur Firmware</value>
Expand Down Expand Up @@ -2337,6 +2343,12 @@
<data name="&gt;&gt;AwakeTimer.Type" xml:space="preserve">
<value>System.Windows.Forms.Timer, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;MnCreateText.Name" xml:space="preserve">
<value>MnCreateText</value>
</data>
<data name="&gt;&gt;MnCreateText.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;$this.Name" xml:space="preserve">
<value>MainForm</value>
</data>
Expand Down
24 changes: 24 additions & 0 deletions LaserGRBL/RasterConverter/FontViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
using System;
using System.Collections.Generic;
using System.Drawing;
using System.Linq;
using System.Text;

namespace LaserGRBL.RasterConverter
{

public class FontViewModel
{
public FontFamily Family { get; private set; }

public FontViewModel(FontFamily family)
{
this.Family = family;
}

public override string ToString()
{
return Family.Name;
}
}
}
41 changes: 28 additions & 13 deletions LaserGRBL/RasterConverter/ImageProcessor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,33 +96,48 @@ public enum Tool

public enum Direction
{ Horizontal, Vertical, Diagonal, None }

private Size boxSize;
public ImageProcessor(GrblCore core, string fileName, Size boxSize, bool append)
{
mCore = core;
mFileName = fileName;
mAppend = append;
mSuspended = true;
//mOriginal = new Bitmap(fileName);
//mOriginal = new Bitmap(fileName);
this.boxSize = boxSize;
ReloadImage();
}
public void ReloadImage()
{
if (mOriginal != null)
{
mOriginal.Dispose();
mOriginal = null;
}
if (mTrueOriginal != null)
{
mTrueOriginal.Dispose();
mTrueOriginal = null;
}

//this double pass is needed to normalize loaded image pixelformat
//http://stackoverflow.com/questions/2016406/converting-bitmap-pixelformats-in-c-sharp
using (Bitmap loadedBmp = new Bitmap(fileName))
{
mFileDPI = (int)loadedBmp.HorizontalResolution;
mFileResolution = loadedBmp.Size;

using (Bitmap tmpBmp = new Bitmap(loadedBmp))
mOriginal = tmpBmp.Clone(new Rectangle(0, 0, tmpBmp.Width, tmpBmp.Height), System.Drawing.Imaging.PixelFormat.Format32bppArgb);
}
//this double pass is needed to normalize loaded image pixelformat
//http://stackoverflow.com/questions/2016406/converting-bitmap-pixelformats-in-c-sharp
using (Bitmap loadedBmp = new Bitmap(mFileName))
{
mFileDPI = (int)loadedBmp.HorizontalResolution;
mFileResolution = loadedBmp.Size;

using (Bitmap tmpBmp = new Bitmap(loadedBmp))
mOriginal = tmpBmp.Clone(new Rectangle(0, 0, tmpBmp.Width, tmpBmp.Height), System.Drawing.Imaging.PixelFormat.Format32bppArgb);
}

mTrueOriginal = mOriginal.Clone() as Bitmap;

mBoxSize = boxSize;
ResizeRecalc();
mGrayScale = TestGrayScale(mOriginal);
}

internal void FormResize(Size size)
{
mBoxSize = size;
Expand Down Expand Up @@ -799,7 +814,7 @@ public bool Demo
}
}

private void Refresh()
public void Refresh()
{
if (mSuspended)
return;
Expand Down
Loading