Merge pull request #29 from avmaisak/prusa-slicer

Added Prusa Slicer Parser
avmaisak · Jan 3, 2020 · 7d50c28 · 7d50c28
2 parents 288e886 + 49728e1
commit 7d50c28
Show file tree

Hide file tree

Showing 20 changed files with 544,958 additions and 15 deletions.
diff --git a/src/Gcode.Utils/Entity/CuraSlicerInfo.cs → ...ode.Utils/Entity/Slicer/CuraSlicerInfo.cs b/src/Gcode.Utils/Entity/CuraSlicerInfo.cs → ...ode.Utils/Entity/Slicer/CuraSlicerInfo.cs
@@ -1,6 +1,6 @@
 using Gcode.Utils.Entity.Base;
 
-namespace Gcode.Utils.Entity
+namespace Gcode.Utils.Entity.Slicer
 {
 	public class CuraSlicerInfo: SlicerInfoBase
 	{

diff --git a/src/Gcode.Utils/Entity/KisslicerInfo.cs → ...code.Utils/Entity/Slicer/KisslicerInfo.cs b/src/Gcode.Utils/Entity/KisslicerInfo.cs → ...code.Utils/Entity/Slicer/KisslicerInfo.cs
@@ -1,6 +1,6 @@
 using Gcode.Utils.Entity.Base;
 
-namespace Gcode.Utils.Entity
+namespace Gcode.Utils.Entity.Slicer
 {
 	/// <summary>
 	/// Gcode, generated by Kisslicer information.

diff --git a/src/Gcode.Utils/Entity/Simplify3dInfo.cs → ...ode.Utils/Entity/Slicer/Simplify3dInfo.cs b/src/Gcode.Utils/Entity/Simplify3dInfo.cs → ...ode.Utils/Entity/Slicer/Simplify3dInfo.cs
@@ -1,6 +1,6 @@
 using Gcode.Utils.Entity.Base;
 
-namespace Gcode.Utils.Entity
+namespace Gcode.Utils.Entity.Slicer
 {
 	/// <summary>
 	/// Simplify3D(R) info.

diff --git a/src/Gcode.Utils/Entity/Slic3RInfo.cs → src/Gcode.Utils/Entity/Slicer/Slic3RInfo.cs b/src/Gcode.Utils/Entity/Slic3RInfo.cs → src/Gcode.Utils/Entity/Slicer/Slic3RInfo.cs
@@ -1,6 +1,6 @@
 using Gcode.Utils.Entity.Base;
 
-namespace Gcode.Utils.Entity
+namespace Gcode.Utils.Entity.Slicer
 {
 	public class Slic3RInfo: SlicerInfoBase
 	{

diff --git a/src/Gcode.Utils/Gcode.Utils.csproj b/src/Gcode.Utils/Gcode.Utils.csproj
@@ -15,7 +15,7 @@
     <Copyright>Anton Maisak</Copyright>
     <AssemblyVersion>0.2.0.12</AssemblyVersion>
     <PackageReleaseNotes></PackageReleaseNotes>
-    <Version>0.2.12</Version>
+    <Version>0.2.13</Version>
     <FileVersion>0.2.0.12</FileVersion>
     <PackageIconUrl>https://raw.githubusercontent.com/avmaisak/Gcode/master/misc/design/logo/logo.png</PackageIconUrl>
   </PropertyGroup>

diff --git a/src/Gcode.Utils/GcodeCrc.cs b/src/Gcode.Utils/GcodeCrc.cs
@@ -30,10 +30,8 @@ public static int FrameCrc(this GcodeCommandFrame gcodeCommandFrame)
 
 			var f = gcodeCommandFrame.ToString();
 			var check = 0;
-			foreach (var ch in f)
-			{
-				check ^= ch & 0xff;
-			}
+
+			foreach (var ch in f) check ^= ch & 0xff;
 
 			check ^= 32;
 

diff --git a/src/Gcode.Utils/SlicerParser/CuraParser.cs b/src/Gcode.Utils/SlicerParser/CuraParser.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Linq;
 using Gcode.Utils.Entity;
+using Gcode.Utils.Entity.Slicer;
 
 namespace Gcode.Utils.SlicerParser
 {

diff --git a/src/Gcode.Utils/SlicerParser/KisSlicerParser.cs b/src/Gcode.Utils/SlicerParser/KisSlicerParser.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Linq;
 using Gcode.Utils.Entity;
+using Gcode.Utils.Entity.Slicer;
 using LibBase.Extensions;
 
 namespace Gcode.Utils.SlicerParser

diff --git a/src/Gcode.Utils/SlicerParser/PrusaSlicerParser.cs b/src/Gcode.Utils/SlicerParser/PrusaSlicerParser.cs
@@ -0,0 +1,68 @@
+using System;
+using System.Linq;
+using Gcode.Utils.Entity.Slicer;
+
+namespace Gcode.Utils.SlicerParser
+{
+	public class PrusaSlicerParser: SlicerParserBase<Slic3RInfo>
+	{
+		public override Slic3RInfo GetSlicerInfo(string[] fileContent)
+		{
+			var name = fileContent.FirstOrDefault(x => x.StartsWith("; generated by PrusaSlicer "));
+
+			if (name?.Split(' ')[3] == null) return null;
+
+			var res = new Slic3RInfo
+			{
+				Name = name.Split(' ')[3],
+				Version = name.Split(' ')[4],
+				// no edition provided by Slic3r
+				Edition = string.Empty,
+			};
+
+			var filamentUsed = fileContent.Where(x => x.StartsWith("; filament used [mm] = ")).ToArray();
+			if (filamentUsed.Length == 1 && filamentUsed[0] != null)
+			{
+				// filament used
+				res.FilamentUsedExtruder1 = Convert.ToDecimal(filamentUsed[0].Split('=')[1]?.Split(' ')[1]?.Replace("[mm]", "").Replace(".", ","));
+			}
+
+			if (filamentUsed.Length == 2 && filamentUsed[1] != null)
+			{
+				// filament used
+				res.FilamentUsedExtruder2 = Convert.ToDecimal(filamentUsed[1].Split('=')[1]?.Split(' ')[1]?.Replace("[mm]", "").Replace(".", ","));
+			}
+
+			var filamentDiameter = fileContent.FirstOrDefault(x => x.StartsWith("; filament_diameter"));
+
+			if (!string.IsNullOrWhiteSpace(filamentDiameter))
+			{
+				var diameter = filamentDiameter.Split('=')?[1];
+				if (string.IsNullOrWhiteSpace(diameter))
+				{
+					res.FilamentDiameter = null;
+				}
+				else
+				{
+					if (diameter.Contains(",")) diameter = diameter.Split(',')[0];
+					res.FilamentDiameter = Convert.ToDecimal(diameter.Replace(".", ","));
+				}
+
+			}
+
+			if (res.FilamentUsedExtruder1 != null && res.FilamentUsedExtruder1 > 0 && res.FilamentDiameter != null && res.FilamentDiameter > 0)
+			{
+				// обьем = сечение * длину
+				res.FilamentUsedExtruder1Volume = res.FilamentDiameter * res.FilamentUsedExtruder1;
+			}
+
+			if (res.FilamentUsedExtruder2 != null && res.FilamentUsedExtruder2 > 0 && res.FilamentDiameter != null && res.FilamentDiameter > 0)
+			{
+				// обьем = сечение * длину
+				res.FilamentUsedExtruder2Volume = res.FilamentDiameter * res.FilamentUsedExtruder2;
+			}
+
+			return res;
+		}
+	}
+}
diff --git a/src/Gcode.Utils/SlicerParser/Simplify3dParser.cs b/src/Gcode.Utils/SlicerParser/Simplify3dParser.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Linq;
 using Gcode.Utils.Entity;
+using Gcode.Utils.Entity.Slicer;
 
 namespace Gcode.Utils.SlicerParser
 {

diff --git a/src/Gcode.Utils/SlicerParser/Slic3RParser.cs b/src/Gcode.Utils/SlicerParser/Slic3RParser.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Linq;
 using Gcode.Utils.Entity;
+using Gcode.Utils.Entity.Slicer;
 
 namespace Gcode.Utils.SlicerParser
 {