juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-16 18:12:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Disable print button when gcode has conflict

Browse Source 
Also fix a crash bug due to setStarted and setDone.

Change-Id: Ib9b069fe4b7e5d1fc359f48e44b4032dd8249428
(cherry picked from commit 9ef190ed3ecd66d12617ad96e927ff34251395a2)
This commit is contained in:
manch1n
2023-03-23 10:09:37 +08:00
committed by Lane.Wei
parent e002885efc
commit d72b4c1bfe
9 changed files with 78 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/libslic3r/GCode/GCodeProcessor.hpp
View File

@@ -90,6 +90,29 @@ namespace Slic3r {
struct GCodeProcessorResult
{
//BBS
struct ConflictResult
{
bool conflicted;
std::string obj1Name;
std::string obj2Name;
void set(const std::string &o1, const std::string &o2)
{
conflicted = true;
obj1Name = o1;
obj2Name = o2;
}
void reset() {
conflicted = false;
obj1Name.clear();
obj2Name.clear();
}
ConflictResult() = default;
ConflictResult(const ConflictResult &) = default;
}conflict_result;
struct SettingsIds
{