diff options
| author | David Crocker <dcrocker@eschertech.com> | 2019-10-18 17:52:01 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2019-10-18 17:52:01 +0300 |
| commit | 52155fe59efa861b3c5b86efed03e77ee133d701 (patch) | |
| tree | 688bb1f10b5bd61d2c5a4c300097f60ef89450ba /src/Storage/FileInfoParser.cpp | |
| parent | d458f6181761f32c3b2e8e3b52083db77cc7fe6c (diff) | |
Support KISSSlicer 2.0 alpha
Extended file info parsing to support new version of KISSSlicer
Diffstat (limited to 'src/Storage/FileInfoParser.cpp')
| -rw-r--r-- | src/Storage/FileInfoParser.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/Storage/FileInfoParser.cpp b/src/Storage/FileInfoParser.cpp index 6c061801..4a8fe127 100644 --- a/src/Storage/FileInfoParser.cpp +++ b/src/Storage/FileInfoParser.cpp @@ -730,6 +730,10 @@ unsigned int FileInfoParser::FindFilamentUsed(const char* buf, size_t len) while (filamentsFound < maxFilaments && (p = strstr(p, filamentLengthStr)) != nullptr) { p += strlen(filamentLengthStr); + if (*p == '#') + { + ++p; // later KISSlicer versions add a # here + } while(isdigit(*p)) { ++p; @@ -771,8 +775,9 @@ bool FileInfoParser::FindPrintTime(const char* buf, size_t len) " estimated printing time (normal mode)", // slic3r PE later versions "; estimated printing time (normal mode) = 1h 5m 24s" " estimated printing time", // slic3r PE older versions "; estimated printing time = 1h 5m 24s" ";TIME", // Cura ";TIME:38846" - " Build time" // S3D "; Build time: 0 hours 42 minutes" - // also KISSlicer "; Estimated Build Time: 332.83 minutes" + " Build time", // S3D "; Build time: 0 hours 42 minutes" + " Build Time" // KISSlicer "; Estimated Build Time: 332.83 minutes" + // also KISSSlicer 2 alpha "; Calculated-during-export Build Time: 130.62 minutes" }; for (const char * ptStr : PrintTimeStrings) |