Skip to content

Commit

Permalink
Version 1.7.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
svenhb authored Feb 4, 2024
1 parent 6ad589a commit bf36bd6
Show file tree
Hide file tree
Showing 15 changed files with 1,470 additions and 99 deletions.
102 changes: 102 additions & 0 deletions GRBL-Plotter/MachineControl/ControlSetupForm.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

27 changes: 27 additions & 0 deletions GRBL-Plotter/MachineControl/ControlSetupForm.ar.resx
Original file line number Diff line number Diff line change
Expand Up @@ -3783,4 +3783,31 @@ Pushbullet: لأسباب تتعلق بالسلامة ، يجب عليك استخ
<data name="nUDSTop.ToolTip" xml:space="preserve">
<value>سيتم ترجمة أصغر عرض للقلم إلى هذا العمق</value>
</data>
<data name="LblNoise2.Text" xml:space="preserve">
<value>مسافة</value>
</data>
<data name="LblNoise1.Text" xml:space="preserve">
<value>السعة</value>
</data>
<data name="NudNoiseDensity.ToolTip" xml:space="preserve">
<value>السعة القصوى</value>
</data>
<data name="NudNoiseAmplitude.ToolTip" xml:space="preserve">
<value>السعة القصوى</value>
</data>
<data name="cBImportGraphicNoise.Text" xml:space="preserve">
<value>زد الضوضاء</value>
</data>
<data name="cBImportGraphicNoise.ToolTip" xml:space="preserve">
<value>توليد خطوط متذبذبة</value>
</data>
<data name="gBNoise.Text" xml:space="preserve">
<value>ضوضاء</value>
</data>
<data name="CbImportGraphicHatchFillNoise.Text" xml:space="preserve">
<value>زد الضوضاء</value>
</data>
<data name="CbImportGraphicHatchFillNoise.ToolTip" xml:space="preserve">
<value>قم بإنشاء خطوط متذبذبة لملء الفتحة فقط</value>
</data>
</root>
17 changes: 15 additions & 2 deletions GRBL-Plotter/MachineControl/ControlSetupForm.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* GRBL-Plotter. Another GCode sender for GRBL.
This file is part of the GRBL-Plotter application.
Copyright (C) 2015-2023 Sven Hasemann contact: [email protected]
Copyright (C) 2015-2024 Sven Hasemann contact: [email protected]
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -35,6 +35,7 @@ You should have received a copy of the GNU General Public License
* 2023-04-27 add new tab 'filter'; highlight tabs with enabled options
* 2023-08-01 check if (!e.Bounds.IsEmpty)
* 2023-09-17 new option multi file import
* 2024-02-04 add noise option
*/

using System;
Expand Down Expand Up @@ -264,6 +265,7 @@ private void SetupForm_Load(object sender, EventArgs e)
CbImportGCTangential_CheckStateChanged(sender, e);
CbImportGraphicHatchFill_CheckStateChanged(sender, e);
CbPathOverlapEnable_CheckStateChanged(sender, e);
CbImportGraphicNoise_CheckStateChanged(sender, e);

uint val = Properties.Settings.Default.importLoggerSettings;
cBLogLevel1.Checked = (val & (uint)LogEnables.Level1) > 0;
Expand Down Expand Up @@ -2209,7 +2211,7 @@ private bool IsOptionEnabledTabControl3(int tabIndex)
return (prop.importGraphicAddFrameEnable || prop.importGraphicMultiplyGraphicsEnable || prop.importGraphicLeadInEnable);// || prop.importGraphicLeadOutEnable);
break;
case 3:
return (prop.importGCDragKnifeEnable || prop.importGCTangentialEnable || prop.importGraphicHatchFillEnable || prop.importGraphicExtendPathEnable);
return (prop.importGCDragKnifeEnable || prop.importGCTangentialEnable || prop.importGraphicHatchFillEnable || prop.importGraphicExtendPathEnable || prop.importGraphicNoiseEnable);
break;
case 4:
return (prop.importGraphicClipEnable);
Expand Down Expand Up @@ -2343,5 +2345,16 @@ private void BtnSetSValues_Click(object sender, EventArgs e)
Properties.Settings.Default.importImageSMin = Properties.Settings.Default.importGCPWMZero;
Properties.Settings.Default.importImageSMax = Properties.Settings.Default.importGCPWMDown;
}

private void CbImportGraphicNoise_CheckStateChanged(object sender, EventArgs e)
{
bool enable = cBImportGraphicNoise.Checked;
NudNoiseAmplitude.Enabled = NudNoiseDensity.Enabled = enable;
if (enable)
gBNoise.BackColor = Color.Yellow;
else
gBNoise.BackColor = Color.WhiteSmoke;

}
}
}
27 changes: 27 additions & 0 deletions GRBL-Plotter/MachineControl/ControlSetupForm.cs.resx
Original file line number Diff line number Diff line change
Expand Up @@ -3798,4 +3798,31 @@ Nakreslete podpis na pravý dolní okraj: měřítko 0,1 nebo nižší a použij
<data name="nUDSTop.ToolTip" xml:space="preserve">
<value>Nejmenší šířka pera bude převedena do této hloubky</value>
</data>
<data name="LblNoise2.Text" xml:space="preserve">
<value>Vzdálenost</value>
</data>
<data name="LblNoise1.Text" xml:space="preserve">
<value>Amplituda</value>
</data>
<data name="NudNoiseDensity.ToolTip" xml:space="preserve">
<value>Maximální amplituda</value>
</data>
<data name="NudNoiseAmplitude.ToolTip" xml:space="preserve">
<value>Maximální amplituda</value>
</data>
<data name="cBImportGraphicNoise.Text" xml:space="preserve">
<value>Přidat šum</value>
</data>
<data name="cBImportGraphicNoise.ToolTip" xml:space="preserve">
<value>Vytvářejte vratké čáry</value>
</data>
<data name="gBNoise.Text" xml:space="preserve">
<value>Hluk</value>
</data>
<data name="CbImportGraphicHatchFillNoise.Text" xml:space="preserve">
<value>Přidat šum</value>
</data>
<data name="CbImportGraphicHatchFillNoise.ToolTip" xml:space="preserve">
<value>Generujte vratké čáry pouze pro výplň šrafování</value>
</data>
</root>
27 changes: 27 additions & 0 deletions GRBL-Plotter/MachineControl/ControlSetupForm.de-DE.resx
Original file line number Diff line number Diff line change
Expand Up @@ -3453,4 +3453,31 @@ Zeichne eine Signatur in den unteren rechten Rand: Maßstab 0,1 oder kleiner und
<data name="nUDSTop.ToolTip" xml:space="preserve">
<value>Die kleinste Stiftbreite wird auf diese Tiefe übersetzt</value>
</data>
<data name="LblNoise2.Text" xml:space="preserve">
<value>Distanz</value>
</data>
<data name="LblNoise1.Text" xml:space="preserve">
<value>Amplitude</value>
</data>
<data name="NudNoiseDensity.ToolTip" xml:space="preserve">
<value>Maximale Amplitude</value>
</data>
<data name="NudNoiseAmplitude.ToolTip" xml:space="preserve">
<value>Maximale Amplitude</value>
</data>
<data name="cBImportGraphicNoise.Text" xml:space="preserve">
<value>Rauschen hinzufügen</value>
</data>
<data name="cBImportGraphicNoise.ToolTip" xml:space="preserve">
<value>Erzeugen Sie wackelige Linien</value>
</data>
<data name="gBNoise.Text" xml:space="preserve">
<value>Lärm</value>
</data>
<data name="CbImportGraphicHatchFillNoise.Text" xml:space="preserve">
<value>Rauschen hinzufügen</value>
</data>
<data name="CbImportGraphicHatchFillNoise.ToolTip" xml:space="preserve">
<value>Erzeugtwackelige Linien nur für die Schraffurfüllung</value>
</data>
</root>
27 changes: 27 additions & 0 deletions GRBL-Plotter/MachineControl/ControlSetupForm.es.resx
Original file line number Diff line number Diff line change
Expand Up @@ -3513,4 +3513,31 @@ Dibuja una firma en el margen inferior derecho: escala 0,1 o menos y usa “abaj
<data name="nUDSTop.ToolTip" xml:space="preserve">
<value>El ancho de pluma más pequeño se trasladará a esta profundidad.</value>
</data>
<data name="LblNoise2.Text" xml:space="preserve">
<value>Distancia</value>
</data>
<data name="LblNoise1.Text" xml:space="preserve">
<value>Amplitud</value>
</data>
<data name="NudNoiseDensity.ToolTip" xml:space="preserve">
<value>amplitud máxima</value>
</data>
<data name="NudNoiseAmplitude.ToolTip" xml:space="preserve">
<value>amplitud máxima</value>
</data>
<data name="cBImportGraphicNoise.Text" xml:space="preserve">
<value>Añadir ruido</value>
</data>
<data name="cBImportGraphicNoise.ToolTip" xml:space="preserve">
<value>Genera líneas tambaleantes</value>
</data>
<data name="gBNoise.Text" xml:space="preserve">
<value>Ruido</value>
</data>
<data name="CbImportGraphicHatchFillNoise.Text" xml:space="preserve">
<value>Añadir ruido</value>
</data>
<data name="CbImportGraphicHatchFillNoise.ToolTip" xml:space="preserve">
<value>Genera líneas tambaleantes solo para relleno de sombreado</value>
</data>
</root>
27 changes: 27 additions & 0 deletions GRBL-Plotter/MachineControl/ControlSetupForm.fr.resx
Original file line number Diff line number Diff line change
Expand Up @@ -3512,4 +3512,31 @@ Dessinez une signature dans la marge inférieure droite : échelle 0,1 ou infér
<data name="nUDSTop.ToolTip" xml:space="preserve">
<value>La plus petite largeur de stylo sera traduite à cette profondeur</value>
</data>
<data name="LblNoise2.Text" xml:space="preserve">
<value>Distance</value>
</data>
<data name="LblNoise1.Text" xml:space="preserve">
<value>Amplitude</value>
</data>
<data name="NudNoiseDensity.ToolTip" xml:space="preserve">
<value>Amplitude maximale</value>
</data>
<data name="NudNoiseAmplitude.ToolTip" xml:space="preserve">
<value>Amplitude maximale</value>
</data>
<data name="cBImportGraphicNoise.Text" xml:space="preserve">
<value>Ajoute du bruit</value>
</data>
<data name="cBImportGraphicNoise.ToolTip" xml:space="preserve">
<value>Générer des lignes bancales</value>
</data>
<data name="gBNoise.Text" xml:space="preserve">
<value>Bruit</value>
</data>
<data name="CbImportGraphicHatchFillNoise.Text" xml:space="preserve">
<value>Ajoute du bruit</value>
</data>
<data name="CbImportGraphicHatchFillNoise.ToolTip" xml:space="preserve">
<value>Générer des lignes bancales pour le remplissage des hachures uniquement</value>
</data>
</root>
Loading

0 comments on commit bf36bd6

Please sign in to comment.