Skip to content

Commit

Permalink
Version 1.7.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@svenhb
svenhb committed Jul 14, 2023
1 parent d290303 commit 7302c0d
Show file tree
Hide file tree
Showing 2 changed files with 99 additions and 20 deletions.
48 changes: 30 additions & 18 deletions GRBL-Plotter/App.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -661,6 +661,9 @@
<setting name="gui2DColorPenDownModeEnable" serializeAs="String">
<value>True</value>
</setting>
<setting name="gui2DColorPenDownModeWidth" serializeAs="String">
<value>True</value>
</setting>
<setting name="gui2DColorPenUp" serializeAs="String">
<value>Green</value>
</setting>
Expand Down Expand Up @@ -1040,7 +1043,7 @@
<value>50</value>
</setting>
<setting name="importAssumeAsEqualDistance" serializeAs="String">
<value>0.001</value>
<value>0.01</value>
</setting>
<setting name="importBarcode1DHeight" serializeAs="String">
<value>20</value>
Expand Down Expand Up @@ -1453,12 +1456,21 @@
<setting name="importGraphicClip" serializeAs="String">
<value>True</value>
</setting>
<setting name="importGraphicClipAngle" serializeAs="String">
<value>0</value>
</setting>
<setting name="importGraphicClipAngleEnable" serializeAs="String">
<value>False</value>
</setting>
<setting name="importGraphicClipEnable" serializeAs="String">
<value>False</value>
</setting>
<setting name="importGraphicClipGCode" serializeAs="String">
<value>(^2 G0 X#OFFX Y#OFFY) (set offset via 2nd grbl)</value>
</setting>
<setting name="importGraphicClipGetDimAuto" serializeAs="String">
<value>False</value>
</setting>
<setting name="importGraphicClipOffsetApply" serializeAs="String">
<value>True</value>
</setting>
Expand Down Expand Up @@ -1517,6 +1529,18 @@
<setting name="importGraphicExtendPathValue" serializeAs="String">
<value>1</value>
</setting>
<setting name="importGraphicFilterChoiceRemove" serializeAs="String">
<value>True</value>
</setting>
<setting name="importGraphicFilterEnable" serializeAs="String">
<value>False</value>
</setting>
<setting name="importGraphicFilterListKeep" serializeAs="String">
<value>FFFFFF;BBBBBB</value>
</setting>
<setting name="importGraphicFilterListRemove" serializeAs="String">
<value>FFFFFF;BBBBBB</value>
</setting>
<setting name="importGraphicHatchFillAngle" serializeAs="String">
<value>30</value>
</setting>
Expand Down Expand Up @@ -2201,30 +2225,18 @@
<setting name="useCaseLastLoaded" serializeAs="String">
<value>?</value>
</setting>
<setting name="importGraphicClipGetDimAuto" serializeAs="String">
<setting name="importPWMFromWidth" serializeAs="String">
<value>False</value>
</setting>
<setting name="importGraphicClipAngleEnable" serializeAs="String">
<setting name="importSVGMetaData" serializeAs="String">
<value>False</value>
</setting>
<setting name="importGraphicClipAngle" serializeAs="String">
<value>0</value>
<setting name="importMessageDelay" serializeAs="String">
<value>6</value>
</setting>
<setting name="importGraphicFilterEnable" serializeAs="String">
<setting name="importSVGCircleToDotS" serializeAs="String">
<value>False</value>
</setting>
<setting name="importGraphicFilterChoiceRemove" serializeAs="String">
<value>True</value>
</setting>
<setting name="importGraphicFilterListRemove" serializeAs="String">
<value>FFFFFF;BBBBBB</value>
</setting>
<setting name="importGraphicFilterListKeep" serializeAs="String">
<value>FFFFFF;BBBBBB</value>
</setting>
<setting name="gui2DColorPenDownModeWidth" serializeAs="String">
<value>True</value>
</setting>
</GrblPlotter.Properties.Settings>
<GRBL_Plotter.Properties.Settings>
<setting name="cameraColorCross" serializeAs="String">
Expand Down
71 changes: 69 additions & 2 deletions GRBL-Plotter/GRBL-Plotter.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
<ProductName>GRBL-Plotter</ProductName>
<PublisherName>GRBL-Plotter</PublisherName>
<OpenBrowserOnPublish>false</OpenBrowserOnPublish>
<ApplicationRevision>4</ApplicationRevision>
<ApplicationVersion>1.6.9.4</ApplicationVersion>
<ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>1.7.0.0</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<CreateDesktopShortcut>true</CreateDesktopShortcut>
<PublishWizardCompleted>true</PublishWizardCompleted>
Expand Down Expand Up @@ -179,6 +179,7 @@
<Compile Include="GCodeCreation\GraphicCollectData.cs" />
<Compile Include="GCodeCreation\ImportFromFile\GCodeFromGerber.cs" />
<Compile Include="GCodeCreation\ImportFromFile\GCodeFromSVGText.cs" />
<Compile Include="GCodeCreation\Graphic2GCodeMove.cs" />
<Compile Include="GCodeCreation\XmlMarker.cs" />
<Compile Include="GUI\AboutForm.cs">
<SubType>Form</SubType>
Expand Down Expand Up @@ -244,6 +245,7 @@
<DependentUpon>MainForm.cs</DependentUpon>
<SubType>Form</SubType>
</Compile>
<Compile Include="GUI\MessageText.cs" />
<Compile Include="GUI\Notifier.cs" />
<Compile Include="GUI\Splashscreen.cs">
<SubType>Form</SubType>
Expand Down Expand Up @@ -829,6 +831,7 @@
<Content Include="Resources\efOn7.png" />
<Content Include="Resources\efOn8.png" />
<Content Include="Resources\efOn9.png" />
<EmbeddedResource Include="GCodeCreation\CreateFromForm\GCodeForBarcode.pl.resx" />
<EmbeddedResource Include="GCodeCreation\CreateFromForm\GCodeFromBarcode.ar.resx">
<DependentUpon>GCodeFromBarcode.cs</DependentUpon>
</EmbeddedResource>
Expand All @@ -850,6 +853,9 @@
<EmbeddedResource Include="GCodeCreation\CreateFromForm\GCodeFromBarcode.ja.resx">
<DependentUpon>GCodeFromBarcode.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="GCodeCreation\CreateFromForm\GCodeFromBarcode.pl.resx">
<DependentUpon>GCodeFromBarcode.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="GCodeCreation\CreateFromForm\GCodeFromBarcode.pt.resx">
<DependentUpon>GCodeFromBarcode.cs</DependentUpon>
</EmbeddedResource>
Expand All @@ -872,6 +878,9 @@
<EmbeddedResource Include="GCodeCreation\CreateFromForm\GCodeFromImage.it.resx">
<DependentUpon>GCodeFromImage.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="GCodeCreation\CreateFromForm\GCodeFromImage.pl.resx">
<DependentUpon>GCodeFromImage.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="GCodeCreation\CreateFromForm\GCodeFromImage.tr.resx">
<DependentUpon>GCodeFromImage.cs</DependentUpon>
</EmbeddedResource>
Expand All @@ -881,6 +890,9 @@
<EmbeddedResource Include="GCodeCreation\CreateFromForm\GCodeFromShape.it.resx">
<DependentUpon>GCodeFromShape.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="GCodeCreation\CreateFromForm\GCodeFromShape.pl.resx">
<DependentUpon>GCodeFromShape.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="GCodeCreation\CreateFromForm\GCodeFromShape.tr.resx">
<DependentUpon>GCodeFromShape.cs</DependentUpon>
</EmbeddedResource>
Expand All @@ -890,6 +902,9 @@
<EmbeddedResource Include="GCodeCreation\CreateFromForm\GCodeFromText.it.resx">
<DependentUpon>GCodeFromText.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="GCodeCreation\CreateFromForm\GCodeFromText.pl.resx">
<DependentUpon>GCodeFromText.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="GCodeCreation\CreateFromForm\GCodeFromText.tr.resx">
<DependentUpon>GCodeFromText.cs</DependentUpon>
</EmbeddedResource>
Expand All @@ -914,6 +929,9 @@
<EmbeddedResource Include="GUI\AboutForm.ja.resx">
<DependentUpon>AboutForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="GUI\AboutForm.pl.resx">
<DependentUpon>AboutForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="GUI\AboutForm.pt.resx">
<DependentUpon>AboutForm.cs</DependentUpon>
</EmbeddedResource>
Expand Down Expand Up @@ -1014,6 +1032,9 @@
<EmbeddedResource Include="GUI\ButtonEdit.ja.resx">
<DependentUpon>ButtonEdit.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="GUI\ButtonEdit.pl.resx">
<DependentUpon>ButtonEdit.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="GUI\ButtonEdit.pt.resx">
<DependentUpon>ButtonEdit.cs</DependentUpon>
</EmbeddedResource>
Expand All @@ -1035,6 +1056,9 @@
<EmbeddedResource Include="GUI\MainForm.it.resx">
<DependentUpon>MainForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="GUI\MainForm.pl.resx">
<DependentUpon>MainForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="GUI\MainForm.tr.resx">
<DependentUpon>MainForm.cs</DependentUpon>
</EmbeddedResource>
Expand All @@ -1059,6 +1083,9 @@
<EmbeddedResource Include="GUI\MainFormStreamSection.ja.resx">
<DependentUpon>MainFormStreamSection.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="GUI\MainFormStreamSection.pl.resx">
<DependentUpon>MainFormStreamSection.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="GUI\MainFormStreamSection.pt.resx">
<DependentUpon>MainFormStreamSection.cs</DependentUpon>
</EmbeddedResource>
Expand Down Expand Up @@ -1095,6 +1122,9 @@
<EmbeddedResource Include="GUI\MessageForm.ja.resx">
<DependentUpon>MessageForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="GUI\MessageForm.pl.resx">
<DependentUpon>MessageForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="GUI\MessageForm.pt.resx">
<DependentUpon>MessageForm.cs</DependentUpon>
</EmbeddedResource>
Expand All @@ -1116,6 +1146,9 @@
<EmbeddedResource Include="MachineControl\Control2ndGRBL.it.resx">
<DependentUpon>Control2ndGRBL.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="MachineControl\Control2ndGRBL.pl.resx">
<DependentUpon>Control2ndGRBL.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="MachineControl\ControlCameraForm.ar.resx">
<DependentUpon>ControlCameraForm.cs</DependentUpon>
</EmbeddedResource>
Expand All @@ -1137,6 +1170,9 @@
<EmbeddedResource Include="MachineControl\ControlCameraForm.ja.resx">
<DependentUpon>ControlCameraForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="MachineControl\ControlCameraForm.pl.resx">
<DependentUpon>ControlCameraForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="MachineControl\ControlCameraForm.pt.resx">
<DependentUpon>ControlCameraForm.cs</DependentUpon>
</EmbeddedResource>
Expand Down Expand Up @@ -1182,6 +1218,9 @@
<EmbeddedResource Include="MachineControl\ControlHeightMap.ja.resx">
<DependentUpon>ControlHeightMap.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="MachineControl\ControlHeightMap.pl.resx">
<DependentUpon>ControlHeightMap.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="MachineControl\ControlHeightMap.pt.resx">
<DependentUpon>ControlHeightMap.cs</DependentUpon>
</EmbeddedResource>
Expand Down Expand Up @@ -1215,6 +1254,9 @@
<EmbeddedResource Include="MachineControl\ControlJogPathCreator.ja.resx">
<DependentUpon>ControlJogPathCreator.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="MachineControl\ControlJogPathCreator.pl.resx">
<DependentUpon>ControlJogPathCreator.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="MachineControl\ControlJogPathCreator.pt.resx">
<DependentUpon>ControlJogPathCreator.cs</DependentUpon>
</EmbeddedResource>
Expand Down Expand Up @@ -1251,6 +1293,9 @@
<EmbeddedResource Include="MachineControl\ControlLaser.ja.resx">
<DependentUpon>ControlLaser.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="MachineControl\ControlLaser.pl.resx">
<DependentUpon>ControlLaser.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="MachineControl\ControlLaser.pt.resx">
<DependentUpon>ControlLaser.cs</DependentUpon>
</EmbeddedResource>
Expand Down Expand Up @@ -1288,6 +1333,9 @@
<EmbeddedResource Include="MachineControl\ControlProbing.ja.resx">
<DependentUpon>ControlProbing.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="MachineControl\ControlProbing.pl.resx">
<DependentUpon>ControlProbing.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="MachineControl\ControlProbing.pt.resx">
<DependentUpon>ControlProbing.cs</DependentUpon>
</EmbeddedResource>
Expand Down Expand Up @@ -1324,6 +1372,9 @@
<EmbeddedResource Include="MachineControl\ControlProcessAutomation.ja.resx">
<DependentUpon>ControlProcessAutomation.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="MachineControl\ControlProcessAutomation.pl.resx">
<DependentUpon>ControlProcessAutomation.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="MachineControl\ControlProcessAutomation.pt.resx">
<DependentUpon>ControlProcessAutomation.cs</DependentUpon>
</EmbeddedResource>
Expand Down Expand Up @@ -1357,6 +1408,9 @@
<EmbeddedResource Include="MachineControl\ControlProjector.ja.resx">
<DependentUpon>ControlProjector.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="MachineControl\ControlProjector.pl.resx">
<DependentUpon>ControlProjector.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="MachineControl\ControlProjector.pt.resx">
<DependentUpon>ControlProjector.cs</DependentUpon>
</EmbeddedResource>
Expand Down Expand Up @@ -1397,6 +1451,9 @@
<EmbeddedResource Include="MachineControl\ControlSerialForm.ja.resx">
<DependentUpon>ControlSerialForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="MachineControl\ControlSerialForm.pl.resx">
<DependentUpon>ControlSerialForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="MachineControl\ControlSerialForm.pt.resx">
<DependentUpon>ControlSerialForm.cs</DependentUpon>
</EmbeddedResource>
Expand Down Expand Up @@ -1435,6 +1492,9 @@
<EmbeddedResource Include="MachineControl\ControlSetupForm.ja.resx">
<DependentUpon>ControlSetupForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="MachineControl\ControlSetupForm.pl.resx">
<DependentUpon>ControlSetupForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="MachineControl\ControlSetupForm.pt.resx">
<DependentUpon>ControlSetupForm.cs</DependentUpon>
</EmbeddedResource>
Expand Down Expand Up @@ -1474,6 +1534,9 @@
<DependentUpon>ControlSetupUseCase.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="MachineControl\ControlSetupUseCase.pl.resx">
<DependentUpon>ControlSetupUseCase.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="MachineControl\ControlSetupUseCase.pt.resx">
<DependentUpon>ControlSetupUseCase.cs</DependentUpon>
<SubType>Designer</SubType>
Expand Down Expand Up @@ -1558,6 +1621,9 @@
<EmbeddedResource Include="MachineControl\GCodeSelectionProperties.ja.resx">
<DependentUpon>GCodeSelectionProperties.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="MachineControl\GCodeSelectionProperties.pl.resx">
<DependentUpon>GCodeSelectionProperties.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="MachineControl\GCodeSelectionProperties.pt.resx">
<DependentUpon>GCodeSelectionProperties.cs</DependentUpon>
</EmbeddedResource>
Expand Down Expand Up @@ -1765,6 +1831,7 @@
<EmbeddedResource Include="Resources\ResStrings.es.resx" />
<EmbeddedResource Include="Resources\ResStrings.fr.resx" />
<EmbeddedResource Include="Resources\ResStrings.ja.resx" />
<EmbeddedResource Include="Resources\ResStrings.pl.resx" />
<EmbeddedResource Include="Resources\ResStrings.pt.resx" />
<EmbeddedResource Include="Resources\ResStrings.resx">
<Generator>PublicResXFileCodeGenerator</Generator>
Expand Down

0 comments on commit 7302c0d

Please sign in to comment.