Skip to content

Commit

Permalink
Fix #1969
Browse files Browse the repository at this point in the history
  • Loading branch information
arkypita committed Apr 9, 2024
1 parent 3eea8a9 commit cd183c2
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion LaserGRBL/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@
// È possibile specificare tutti i valori oppure impostare valori predefiniti per i numeri relativi alla revisione e alla build
// utilizzando l'asterisco (*) come descritto di seguito:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion ("6.2.1")]
[assembly: AssemblyVersion ("6.2.2")]
[assembly: NeutralResourcesLanguage("en")]
10 changes: 5 additions & 5 deletions LaserGRBL/SvgConverter/GCodeFromSVG.cs
Original file line number Diff line number Diff line change
Expand Up @@ -757,12 +757,12 @@ private int parsePathCommand(string svgPath)
char cmd = char.ToUpper(command);
bool absolute = (cmd == command);
string remainingargs = svgPath.Substring(1);
string argSeparators = @"[\s,]|(?=(?<!e)-)";// @"[\s,]|(?=-)|(-{,2})"; // support also -1.2e-3 orig. @"[\s,]|(?=-)";
var splitArgs = Regex
.Split(remainingargs, argSeparators)
.Where(t => !string.IsNullOrEmpty(t));
string argMatcher = @"((\-|)\d+(\.\d+|)((((E|e)(\-|\+|))|\.)\d+|)|((\-|)\.\d+))";
var splitArgs = Regex.Matches(remainingargs, argMatcher);


// get command coordinates
float[] floatArgs = splitArgs.Select(arg => ConvertToPixel(arg)).ToArray();
float[] floatArgs = splitArgs.Cast<Capture>().Select(c => ConvertToPixel(c.Value)).ToArray();
int objCount = 0;

switch (cmd)
Expand Down
2 changes: 1 addition & 1 deletion setup.iss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!

#define MyAppName "LaserGRBL"
#define MyAppVersion "6.2.1"
#define MyAppVersion "6.2.2"
#define MyAppVersionName "Rhydon"
#define MyAppPublisher "LaserGRBL"
#define MyAppURL "https://lasergrbl.com"
Expand Down

0 comments on commit cd183c2

Please sign in to comment.