Skip to content

Commit

Permalink
Version 1.7.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
svenhb authored Feb 25, 2024
1 parent 5353934 commit ed83df1
Show file tree
Hide file tree
Showing 2 changed files with 117 additions and 26 deletions.
95 changes: 73 additions & 22 deletions GRBL-Plotter/App.config
Original file line number Diff line number Diff line change
Expand Up @@ -322,27 +322,39 @@
<setting name="createShapeY" serializeAs="String">
<value>20</value>
</setting>
<setting name="createTextFontDistance" serializeAs="String">
<value>0</value>
<setting name="createTextAlignment" serializeAs="String">
<value>1</value>
</setting>
<setting name="createTextFontColor" serializeAs="String">
<value>WindowText</value>
</setting>
<setting name="createTextFontIndex" serializeAs="String">
<value>0</value>
</setting>
<setting name="createTextFontSize" serializeAs="String">
<value>10</value>
</setting>
<setting name="createTextFontText" serializeAs="String">
<value>Test</value>
</setting>
<setting name="createTextLineBreak" serializeAs="String">
<setting name="createTextHersheyFontName" serializeAs="String">
<value>cBFont</value>
</setting>
<setting name="createTextHersheyFontSize" serializeAs="String">
<value>10</value>
</setting>
<setting name="createTextHersheyLetterDistance" serializeAs="String">
<value>0</value>
</setting>
<setting name="createTextHersheyLineBreak" serializeAs="String">
<value>100</value>
</setting>
<setting name="createTextLineBreakEnable" serializeAs="String">
<setting name="createTextHersheyLineBreakEnable" serializeAs="String">
<value>False</value>
</setting>
<setting name="createTextLineDistance" serializeAs="String">
<setting name="createTextHersheyLineDistance" serializeAs="String">
<value>15</value>
</setting>
<setting name="createTextHersheySelect" serializeAs="String">
<value>True</value>
</setting>
<setting name="createTextSystemFont" serializeAs="String">
<value>Microsoft Sans Serif, 12pt</value>
</setting>
Expand Down Expand Up @@ -1051,15 +1063,18 @@
<setting name="importBarcode1DLines" serializeAs="String">
<value>4</value>
</setting>
<setting name="importBarcode1DName" serializeAs="String">
<value />
</setting>
<setting name="importBarcode1DScanGap" serializeAs="String">
<value>0.2</value>
</setting>
<setting name="importBarcode1DSelect" serializeAs="String">
<value>True</value>
</setting>
<setting name="importBarcode1DText" serializeAs="String">
<value>123</value>
</setting>
<setting name="importBarcode1DType" serializeAs="String">
<value>31</value>
</setting>
<setting name="importBarcode2DBorder" serializeAs="String">
<value>True</value>
</setting>
Expand Down Expand Up @@ -1580,6 +1595,9 @@
<setting name="importGraphicHatchFillInsetEnable2" serializeAs="String">
<value>False</value>
</setting>
<setting name="importGraphicHatchFillNoise" serializeAs="String">
<value>False</value>
</setting>
<setting name="importGraphicLargestLast" serializeAs="String">
<value>True</value>
</setting>
Expand Down Expand Up @@ -1610,6 +1628,15 @@
<setting name="importGraphicMultiplyGraphicsEnable" serializeAs="String">
<value>False</value>
</setting>
<setting name="importGraphicNoiseAmplitude" serializeAs="String">
<value>1</value>
</setting>
<setting name="importGraphicNoiseDensity" serializeAs="String">
<value>1</value>
</setting>
<setting name="importGraphicNoiseEnable" serializeAs="String">
<value>False</value>
</setting>
<setting name="importGraphicOffsetOrigin" serializeAs="String">
<value>True</value>
</setting>
Expand Down Expand Up @@ -2135,6 +2162,30 @@
<setting name="probingWorkpieceDiameter" serializeAs="String">
<value>20</value>
</setting>
<setting name="processCounter" serializeAs="String">
<value>0</value>
</setting>
<setting name="processCounterDigits" serializeAs="String">
<value>6</value>
</setting>
<setting name="processCounterFill" serializeAs="String">
<value>0</value>
</setting>
<setting name="processCounterFront" serializeAs="String">
<value>Fixed front - </value>
</setting>
<setting name="processCounterRear" serializeAs="String">
<value> - Fixed rear</value>
</setting>
<setting name="processDataDelimeter" serializeAs="String">
<value>; Semicolon</value>
</setting>
<setting name="processDataIndex" serializeAs="String">
<value>1</value>
</setting>
<setting name="processDataLastFile" serializeAs="String">
<value />
</setting>
<setting name="processLastFile" serializeAs="String">
<value />
</setting>
Expand All @@ -2144,11 +2195,14 @@
<setting name="processOpenOnProgStart" serializeAs="String">
<value>False</value>
</setting>
<setting name="processSize" serializeAs="String">
<value>0, 0</value>
</setting>
<setting name="processSplitDistance" serializeAs="String">
<value>300</value>
<value>400</value>
</setting>
<setting name="processTimerInterval" serializeAs="String">
<value>1000</value>
<value>500</value>
</setting>
<setting name="projectorColorBackground" serializeAs="String">
<value>Black</value>
Expand Down Expand Up @@ -2333,17 +2387,14 @@
<setting name="useCaseLastLoaded" serializeAs="String">
<value>?</value>
</setting>
<setting name="importGraphicNoiseEnable" serializeAs="String">
<value>False</value>
</setting>
<setting name="importGraphicNoiseAmplitude" serializeAs="String">
<value>1</value>
<setting name="createTextSystemSizeX" serializeAs="String">
<value>100</value>
</setting>
<setting name="importGraphicNoiseDensity" serializeAs="String">
<value>1</value>
<setting name="createTextSystemSizeY" serializeAs="String">
<value>100</value>
</setting>
<setting name="importGraphicHatchFillNoise" serializeAs="String">
<value>False</value>
<setting name="createTextSystemFontSize" serializeAs="String">
<value>16</value>
</setting>
</GrblPlotter.Properties.Settings>
<GRBL_Plotter.Properties.Settings>
Expand Down
48 changes: 44 additions & 4 deletions GRBL-Plotter/GRBL-Plotter.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<PublisherName>GRBL-Plotter</PublisherName>
<OpenBrowserOnPublish>false</OpenBrowserOnPublish>
<ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>1.7.2.0</ApplicationVersion>
<ApplicationVersion>1.7.3.0</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<CreateDesktopShortcut>true</CreateDesktopShortcut>
<PublishWizardCompleted>true</PublishWizardCompleted>
Expand Down Expand Up @@ -229,6 +229,9 @@
<DependentUpon>MainForm.cs</DependentUpon>
<SubType>Form</SubType>
</Compile>
<Compile Include="GUI\MainFormProcessAutomation.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="GUI\MainFormSimulatePath.cs">
<DependentUpon>MainForm.cs</DependentUpon>
<SubType>Form</SubType>
Expand Down Expand Up @@ -314,6 +317,7 @@
<DependentUpon>ControlSerialForm.cs</DependentUpon>
<SubType>Form</SubType>
</Compile>
<Compile Include="MachineControl\ControlSetupFormIni.cs" />
<Compile Include="MachineControl\ControlSetupUseCase.cs">
<SubType>Form</SubType>
</Compile>
Expand Down Expand Up @@ -468,13 +472,28 @@
<DesignTime>True</DesignTime>
<DependentUpon>ResStrings.resx</DependentUpon>
</Compile>
<Content Include="data\automations\example.xml">
<Content Include="data\automations\example_beep_melody.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="data\automations\example_camera_fiducial_correction.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="data\automations\example2.xml">
<Content Include="data\automations\example_probe_fiducial_correction.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="data\automations\example_probe_fiducial.xml">
<Content Include="data\automations\example_sounds.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="data\automations\File_load\file_load.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="data\automations\File_load\file_load_list.txt">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="data\automations\Name_tag\Name_tag.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="data\automations\Name_tag\Name_Tag_Data.txt">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="data\examples\addon_frame_stamp1.svg">
Expand Down Expand Up @@ -829,6 +848,27 @@
<Content Include="data\buttons\Pen_dot_Servo.ini">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="data\automations\Name_tag\Name_Tag_CreateText.ini">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="data\automations\automation__Name_tag.ini">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="data\automations\disable_options.ini">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="data\automations\Name_tag\Name_tag_CreateText_Segoe.ini">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="data\automations\Name_tag\Name_tag_setup_use_laser.ini">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<None Include="data\automations\automation_File_load.ini">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="data\automations\File_load\file_load_setup_use_z.ini">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Properties\app.manifest" />
<None Include="Resources\LeadInOut.png" />
<None Include="Resources\rndOff.png" />
Expand Down

0 comments on commit ed83df1

Please sign in to comment.