Version 1.7.4.0

svenhb · Aug 18, 2024 · 79c7d0d · 79c7d0d
1 parent afdbf53
commit 79c7d0d
Show file tree

Hide file tree

Showing 4 changed files with 137 additions and 9 deletions.
diff --git a/GRBL-Plotter/App.config b/GRBL-Plotter/App.config
@@ -241,6 +241,9 @@
       <setting name="counterImportImage" serializeAs="String">
         <value>0</value>
       </setting>
+      <setting name="counterImportPDNJson" serializeAs="String">
+        <value>0</value>
+      </setting>
       <setting name="counterImportShape" serializeAs="String">
         <value>0</value>
       </setting>
@@ -1018,6 +1021,9 @@
       <setting name="guiSpindleSpeed" serializeAs="String">
         <value>1000</value>
       </setting>
+      <setting name="guiToolSelection" serializeAs="String">
+        <value>0</value>
+      </setting>
       <setting name="heightMapDeltaX" serializeAs="String">
         <value>50</value>
       </setting>
@@ -1355,7 +1361,7 @@
         <value>True</value>
       </setting>
       <setting name="importGCSegment" serializeAs="String">
-        <value>0</value>
+        <value>0.5</value>
       </setting>
       <setting name="importGCSpindleCmd" serializeAs="String">
         <value>True</value>
@@ -1399,6 +1405,12 @@
       <setting name="importGCTangentialRange" serializeAs="String">
         <value>False</value>
       </setting>
+      <setting name="importGCTangentialShortening" serializeAs="String">
+        <value>1</value>
+      </setting>
+      <setting name="importGCTangentialShorteningEnable" serializeAs="String">
+        <value>False</value>
+      </setting>
       <setting name="importGCTangentialTurn" serializeAs="String">
         <value>360</value>
       </setting>
@@ -1616,6 +1628,12 @@
       <setting name="importGraphicHatchFillNoise" serializeAs="String">
         <value>False</value>
       </setting>
+      <setting name="importGraphicHatchFillOffset" serializeAs="String">
+        <value>0.3</value>
+      </setting>
+      <setting name="importGraphicHatchFillOffsetInc" serializeAs="String">
+        <value>False</value>
+      </setting>
       <setting name="importGraphicLargestLast" serializeAs="String">
         <value>True</value>
       </setting>
@@ -1655,6 +1673,12 @@
       <setting name="importGraphicNoiseEnable" serializeAs="String">
         <value>False</value>
       </setting>
+      <setting name="importGraphicOffsetLargestLast" serializeAs="String">
+        <value>True</value>
+      </setting>
+      <setting name="importGraphicOffsetLargestRemove" serializeAs="String">
+        <value>False</value>
+      </setting>
       <setting name="importGraphicOffsetOrigin" serializeAs="String">
         <value>True</value>
       </setting>
@@ -1673,6 +1697,9 @@
       <setting name="importGraphicSortDistanceAllowRotate" serializeAs="String">
         <value>True</value>
       </setting>
+      <setting name="importGraphicSortDistanceStart" serializeAs="String">
+        <value>0</value>
+      </setting>
       <setting name="importGraphicTileAddOnX" serializeAs="String">
         <value>0</value>
       </setting>
@@ -1805,6 +1832,15 @@
       <setting name="importPausePenDown" serializeAs="String">
         <value>False</value>
       </setting>
+      <setting name="importPDNDpi" serializeAs="String">
+        <value>96</value>
+      </setting>
+      <setting name="importPDNLayerVisible" serializeAs="String">
+        <value>True</value>
+      </setting>
+      <setting name="importPDNSmoothCycles" serializeAs="String">
+        <value>3</value>
+      </setting>
       <setting name="importPWMFromWidth" serializeAs="String">
         <value>False</value>
       </setting>
@@ -1874,6 +1910,9 @@
       <setting name="importSVGPathExtend" serializeAs="String">
         <value>False</value>
       </setting>
+      <setting name="importSVGPathNewFigure" serializeAs="String">
+        <value>False</value>
+      </setting>
       <setting name="importSVGRezise" serializeAs="String">
         <value>False</value>
       </setting>
@@ -1979,6 +2018,9 @@
       <setting name="locationTextForm" serializeAs="String">
         <value>-30, 0</value>
       </setting>
+      <setting name="locationWireCutterForm" serializeAs="String">
+        <value>0, 0</value>
+      </setting>
       <setting name="machineLimitsAlarm" serializeAs="String">
         <value>False</value>
       </setting>
@@ -2405,13 +2447,49 @@
       <setting name="useCaseLastLoaded" serializeAs="String">
         <value>?</value>
       </setting>
-      <setting name="importGCTangentialShorteningEnable" serializeAs="String">
-        <value>False</value>
+      <setting name="wirecutterArrayX" serializeAs="String">
+        <value>3</value>
       </setting>
-      <setting name="importGCTangentialShortening" serializeAs="String">
-        <value>1</value>
+      <setting name="wirecutterArrayY" serializeAs="String">
+        <value>3</value>
       </setting>
-      <setting name="guiToolSelection" serializeAs="String">
+      <setting name="wirecutterGapX" serializeAs="String">
+        <value>2</value>
+      </setting>
+      <setting name="wirecutterGapY" serializeAs="String">
+        <value>2</value>
+      </setting>
+      <setting name="wirecutterRingDiameterIn" serializeAs="String">
+        <value>20</value>
+      </setting>
+      <setting name="wirecutterRingDiameterOut" serializeAs="String">
+        <value>50</value>
+      </setting>
+      <setting name="wirecutterRingSections" serializeAs="String">
+        <value>2</value>
+      </setting>
+      <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>
+      <setting name="mainFormSetCoordY" serializeAs="String">
+        <value>0</value>
+      </setting>
+      <setting name="mainFormSetCoordA" serializeAs="String">
+        <value>0</value>
+      </setting>
+      <setting name="mainFormSetCoordZ" serializeAs="String">
         <value>0</value>
       </setting>
     </GrblPlotter.Properties.Settings>

diff --git a/GRBL-Plotter/GRBL-Plotter.csproj b/GRBL-Plotter/GRBL-Plotter.csproj
@@ -29,8 +29,8 @@
     <ProductName>GRBL-Plotter</ProductName>
     <PublisherName>GRBL-Plotter</PublisherName>
     <OpenBrowserOnPublish>false</OpenBrowserOnPublish>
-    <ApplicationRevision>1</ApplicationRevision>
-    <ApplicationVersion>1.7.3.1</ApplicationVersion>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.7.4.0</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
     <PublishWizardCompleted>true</PublishWizardCompleted>
@@ -159,6 +159,12 @@
   <ItemGroup>
     <Compile Include="GCodeCreation\CreateFromForm\BarcodeLib.cs" />
     <Compile Include="GCodeCreation\CreateFromForm\BarcodeLibSymbologies.cs" />
+    <Compile Include="GCodeCreation\CreateFromForm\GCodeForWireCutter.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="GCodeCreation\CreateFromForm\GCodeForWireCutter.Designer.cs">
+      <DependentUpon>GCodeForWireCutter.cs</DependentUpon>
+    </Compile>
     <Compile Include="GCodeCreation\CreateFromForm\GCodeFromBarcode.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -180,6 +186,7 @@
     <Compile Include="GCodeCreation\ImportFromFile\GCodeFromCsv.cs" />
     <Compile Include="GCodeCreation\GraphicCollectData.cs" />
     <Compile Include="GCodeCreation\ImportFromFile\GCodeFromGerber.cs" />
+    <Compile Include="GCodeCreation\ImportFromFile\GCodeFromPDNJson.cs" />
     <Compile Include="GCodeCreation\ImportFromFile\GCodeFromSVGText.cs" />
     <Compile Include="GCodeCreation\Graphic2GCodeMove.cs" />
     <Compile Include="GCodeCreation\XmlMarker.cs" />
@@ -893,6 +900,9 @@
     <Content Include="data\buttons\Pen_zero_Servo.ini">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="data\examples\bunny_new.pdn-json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <None Include="Properties\app.manifest" />
     <None Include="Resources\LeadInOut.png" />
     <None Include="Resources\rndOff.png" />
@@ -909,6 +919,7 @@
     <None Include="Resources\barcode.png" />
     <None Include="Resources\bevOff.png" />
     <None Include="Resources\bevOn.png" />
+    <Content Include="Newtonsoft.Json.dll" />
     <Content Include="Resources\efOff1.png" />
     <Content Include="Resources\efOff2.png" />
     <Content Include="Resources\efOff3.png" />
@@ -928,6 +939,45 @@
     <Content Include="Resources\efOn8.png" />
     <Content Include="Resources\efOn9.png" />
     <EmbeddedResource Include="GCodeCreation\CreateFromForm\GCodeForBarcode.pl.resx" />
+    <EmbeddedResource Include="GCodeCreation\CreateFromForm\GCodeForWireCutter.ar.resx">
+      <DependentUpon>GCodeForWireCutter.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="GCodeCreation\CreateFromForm\GCodeForWireCutter.cs.resx">
+      <DependentUpon>GCodeForWireCutter.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="GCodeCreation\CreateFromForm\GCodeForWireCutter.de-DE.resx">
+      <DependentUpon>GCodeForWireCutter.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="GCodeCreation\CreateFromForm\GCodeForWireCutter.es.resx">
+      <DependentUpon>GCodeForWireCutter.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="GCodeCreation\CreateFromForm\GCodeForWireCutter.fr.resx">
+      <DependentUpon>GCodeForWireCutter.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="GCodeCreation\CreateFromForm\GCodeForWireCutter.it.resx">
+      <DependentUpon>GCodeForWireCutter.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="GCodeCreation\CreateFromForm\GCodeForWireCutter.ja.resx">
+      <DependentUpon>GCodeForWireCutter.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="GCodeCreation\CreateFromForm\GCodeForWireCutter.pl.resx">
+      <DependentUpon>GCodeForWireCutter.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="GCodeCreation\CreateFromForm\GCodeForWireCutter.pt.resx">
+      <DependentUpon>GCodeForWireCutter.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="GCodeCreation\CreateFromForm\GCodeForWireCutter.resx">
+      <DependentUpon>GCodeForWireCutter.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="GCodeCreation\CreateFromForm\GCodeForWireCutter.ru.resx">
+      <DependentUpon>GCodeForWireCutter.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="GCodeCreation\CreateFromForm\GCodeForWireCutter.tr.resx">
+      <DependentUpon>GCodeForWireCutter.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="GCodeCreation\CreateFromForm\GCodeForWireCutter.zh-CN.resx">
+      <DependentUpon>GCodeForWireCutter.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="GCodeCreation\CreateFromForm\GCodeFromBarcode.ar.resx">
       <DependentUpon>GCodeFromBarcode.cs</DependentUpon>
     </EmbeddedResource>

diff --git a/GRBL-Plotter/Recent.txt b/GRBL-Plotter/Recent.txt
@@ -1,3 +1,4 @@
+data\examples\bunny_new.pdn-json
 data\examples\graphic_fiducial_circle.svg
 data\examples\graphic_grbl.svg
 data\examples\graphic_grbl_popup.svg

diff --git a/GRBL-Plotter/packages.config b/GRBL-Plotter/packages.config
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.CodeAnalysis.FxCopAnalyzers" version="2.9.7" targetFramework="net40" developmentDependency="true" />
   <package id="Microsoft.CodeAnalysis.VersionCheckAnalyzer" version="2.9.7" targetFramework="net40" developmentDependency="true" />
   <package id="Microsoft.CodeQuality.Analyzers" version="2.9.7" targetFramework="net40" developmentDependency="true" />
   <package id="Microsoft.NetCore.Analyzers" version="2.9.7" targetFramework="net40" developmentDependency="true" />