diff --git a/GRBL-Plotter/App.config b/GRBL-Plotter/App.config index db7cc9a8..5f6195c9 100644 --- a/GRBL-Plotter/App.config +++ b/GRBL-Plotter/App.config @@ -1781,6 +1781,18 @@ <setting name="importImageKeepRatio" serializeAs="String"> <value>True</value> </setting> + <setting name="importImagePixelArt" serializeAs="String"> + <value>False</value> + </setting> + <setting name="importImagePixelArtDotSize" serializeAs="String"> + <value>2</value> + </setting> + <setting name="importImagePixelArtDotsPerPixel" serializeAs="String"> + <value>1</value> + </setting> + <setting name="importImagePixelArtGapSize" serializeAs="String"> + <value>0.5</value> + </setting> <setting name="importImageReso" serializeAs="String"> <value>0.5</value> </setting> @@ -1838,8 +1850,8 @@ <setting name="importPDNLayerVisible" serializeAs="String"> <value>True</value> </setting> - <setting name="importPDNSmoothCycles" serializeAs="String"> - <value>3</value> + <setting name="importPDNWidth" serializeAs="String"> + <value>120</value> </setting> <setting name="importPWMFromWidth" serializeAs="String"> <value>False</value> @@ -1925,6 +1937,66 @@ <setting name="importUseCaseInfo" serializeAs="String"> <value>Information about current use case</value> </setting> + <setting name="importVectorizeAlgorithmPoTrace" serializeAs="String"> + <value>True</value> + </setting> + <setting name="importVectorizeDetectTransparency" serializeAs="String"> + <value>True</value> + </setting> + <setting name="importVectorizeDpiFromImage" serializeAs="String"> + <value>True</value> + </setting> + <setting name="importVectorizeFromClipboard" serializeAs="String"> + <value>False</value> + </setting> + <setting name="importVectorizeInvertResult" serializeAs="String"> + <value>False</value> + </setting> + <setting name="importVectorizeOptimize1" serializeAs="String"> + <value>False</value> + </setting> + <setting name="importVectorizeOptimize2" serializeAs="String"> + <value>False</value> + </setting> + <setting name="importVectorizeOptimize3" serializeAs="String"> + <value>False</value> + </setting> + <setting name="importVectorizeOptimize4" serializeAs="String"> + <value>False</value> + </setting> + <setting name="importVectorizePoTraceAlphamax" serializeAs="String"> + <value>1</value> + </setting> + <setting name="importVectorizePoTraceCurveoptimizing" serializeAs="String"> + <value>True</value> + </setting> + <setting name="importVectorizePoTraceOpttolerance" serializeAs="String"> + <value>0.2</value> + </setting> + <setting name="importVectorizePoTraceTurdsize" serializeAs="String"> + <value>2</value> + </setting> + <setting name="importVectorizeSetWidthOfImage" serializeAs="String"> + <value>False</value> + </setting> + <setting name="importVectorizeSmoothCycles" serializeAs="String"> + <value>3</value> + </setting> + <setting name="importVectorizeThreshold" serializeAs="String"> + <value>128</value> + </setting> + <setting name="importVectorizeTypeBmp" serializeAs="String"> + <value>False</value> + </setting> + <setting name="importVectorizeTypeGif" serializeAs="String"> + <value>False</value> + </setting> + <setting name="importVectorizeTypeJpg" serializeAs="String"> + <value>False</value> + </setting> + <setting name="importVectorizeTypePng" serializeAs="String"> + <value>False</value> + </setting> <setting name="laserMotionDelay" serializeAs="String"> <value>0</value> </setting> @@ -2048,6 +2120,27 @@ <setting name="machineLimitsShow" serializeAs="String"> <value>False</value> </setting> + <setting name="mainFormMovoToX" serializeAs="String"> + <value>0</value> + </setting> + <setting name="mainFormMovoToY" serializeAs="String"> + <value>0</value> + </setting> + <setting name="mainFormMovoToZ" serializeAs="String"> + <value>0</value> + </setting> + <setting name="mainFormSetCoordA" serializeAs="String"> + <value>0</value> + </setting> + <setting name="mainFormSetCoordX" serializeAs="String"> + <value>0</value> + </setting> + <setting name="mainFormSetCoordY" serializeAs="String"> + <value>0</value> + </setting> + <setting name="mainFormSetCoordZ" serializeAs="String"> + <value>0</value> + </setting> <setting name="mainFormSize" serializeAs="String"> <value>900, 680</value> </setting> @@ -2471,26 +2564,17 @@ <setting name="wirecutterToolDiameter" serializeAs="String"> <value>2</value> </setting> - <setting name="mainFormMovoToX" serializeAs="String"> - <value>0</value> - </setting> - <setting name="mainFormMovoToY" serializeAs="String"> - <value>0</value> - </setting> - <setting name="mainFormMovoToZ" serializeAs="String"> - <value>0</value> - </setting> - <setting name="mainFormSetCoordX" serializeAs="String"> - <value>0</value> + <setting name="importImagePixelArtDrawDot" serializeAs="String"> + <value>True</value> </setting> - <setting name="mainFormSetCoordY" serializeAs="String"> - <value>0</value> + <setting name="importImagePixelArtDrawShapeCircle" serializeAs="String"> + <value>True</value> </setting> - <setting name="mainFormSetCoordA" serializeAs="String"> - <value>0</value> + <setting name="importImagePixelArtShapePenDiameter" serializeAs="String"> + <value>0.4</value> </setting> - <setting name="mainFormSetCoordZ" serializeAs="String"> - <value>0</value> + <setting name="importImagePixelArtShapeFill" serializeAs="String"> + <value>False</value> </setting> </GrblPlotter.Properties.Settings> <GRBL_Plotter.Properties.Settings> diff --git a/GRBL-Plotter/GRBL-Plotter.csproj b/GRBL-Plotter/GRBL-Plotter.csproj index 550f24e3..eb039369 100644 --- a/GRBL-Plotter/GRBL-Plotter.csproj +++ b/GRBL-Plotter/GRBL-Plotter.csproj @@ -30,7 +30,7 @@ <PublisherName>GRBL-Plotter</PublisherName> <OpenBrowserOnPublish>false</OpenBrowserOnPublish> <ApplicationRevision>0</ApplicationRevision> - <ApplicationVersion>1.7.4.0</ApplicationVersion> + <ApplicationVersion>1.7.5.0</ApplicationVersion> <UseApplicationTrust>false</UseApplicationTrust> <CreateDesktopShortcut>true</CreateDesktopShortcut> <PublishWizardCompleted>true</PublishWizardCompleted> @@ -171,6 +171,9 @@ <Compile Include="GCodeCreation\CreateFromForm\GCodeFromBarcode.Designer.cs"> <DependentUpon>GCodeFromBarcode.cs</DependentUpon> </Compile> + <Compile Include="GCodeCreation\CreateFromForm\GCodeFromImageCreatePixel.cs"> + <SubType>Form</SubType> + </Compile> <Compile Include="GCodeCreation\CreateFromForm\GCodeFromImageMisc.cs"> <SubType>Form</SubType> </Compile> @@ -189,6 +192,11 @@ <Compile Include="GCodeCreation\ImportFromFile\GCodeFromPDNJson.cs" /> <Compile Include="GCodeCreation\ImportFromFile\GCodeFromSVGText.cs" /> <Compile Include="GCodeCreation\Graphic2GCodeMove.cs" /> + <Compile Include="GCodeCreation\Vectorize\CsPotrace.cs" /> + <Compile Include="GCodeCreation\Vectorize\CsPtoraceExport.cs" /> + <Compile Include="GCodeCreation\Vectorize\Vectorize.cs" /> + <Compile Include="GCodeCreation\Vectorize\Vectorize_FitCurves.cs" /> + <Compile Include="GCodeCreation\Vectorize\Vectorize_Helper.cs" /> <Compile Include="GCodeCreation\XmlMarker.cs" /> <Compile Include="GUI\AboutForm.cs"> <SubType>Form</SubType> @@ -1198,15 +1206,19 @@ </EmbeddedResource> <EmbeddedResource Include="GUI\MainForm.cs.resx"> <DependentUpon>MainForm.cs</DependentUpon> + <SubType>Designer</SubType> </EmbeddedResource> <EmbeddedResource Include="GUI\MainForm.it.resx"> <DependentUpon>MainForm.cs</DependentUpon> + <SubType>Designer</SubType> </EmbeddedResource> <EmbeddedResource Include="GUI\MainForm.pl.resx"> <DependentUpon>MainForm.cs</DependentUpon> + <SubType>Designer</SubType> </EmbeddedResource> <EmbeddedResource Include="GUI\MainForm.tr.resx"> <DependentUpon>MainForm.cs</DependentUpon> + <SubType>Designer</SubType> </EmbeddedResource> <EmbeddedResource Include="GUI\MainFormStreamSection.ar.resx"> <DependentUpon>MainFormStreamSection.cs</DependentUpon> @@ -1741,15 +1753,19 @@ </EmbeddedResource> <EmbeddedResource Include="GUI\MainForm.es.resx"> <DependentUpon>MainForm.cs</DependentUpon> + <SubType>Designer</SubType> </EmbeddedResource> <EmbeddedResource Include="GUI\MainForm.fr.resx"> <DependentUpon>MainForm.cs</DependentUpon> + <SubType>Designer</SubType> </EmbeddedResource> <EmbeddedResource Include="GUI\MainForm.ja.resx"> <DependentUpon>MainForm.cs</DependentUpon> + <SubType>Designer</SubType> </EmbeddedResource> <EmbeddedResource Include="GUI\MainForm.pt.resx"> <DependentUpon>MainForm.cs</DependentUpon> + <SubType>Designer</SubType> </EmbeddedResource> <EmbeddedResource Include="GUI\MainForm.resx"> <DependentUpon>MainForm.cs</DependentUpon> @@ -1760,6 +1776,7 @@ </EmbeddedResource> <EmbeddedResource Include="GUI\MainForm.zh-CN.resx"> <DependentUpon>MainForm.cs</DependentUpon> + <SubType>Designer</SubType> </EmbeddedResource> <EmbeddedResource Include="GUI\MessageForm.resx"> <DependentUpon>MessageForm.cs</DependentUpon> diff --git a/GRBL-Plotter/GRBL-Plotter.csproj.user b/GRBL-Plotter/GRBL-Plotter.csproj.user index faa95f71..821f6ac0 100644 --- a/GRBL-Plotter/GRBL-Plotter.csproj.user +++ b/GRBL-Plotter/GRBL-Plotter.csproj.user @@ -14,4 +14,7 @@ <PropertyGroup> <EnableSecurityDebugging>false</EnableSecurityDebugging> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'"> + <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging> + </PropertyGroup> </Project> \ No newline at end of file