3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-08 07:27:41 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

ENH: show the layer and height of conflict position

Browse source 
Change-Id: If80e81b5556f5afc3228a00edc2593bd8cfe63e4
(cherry picked from commit 895e0f2ecf8e259cfdb7c27081b767bfbaa3ffb6)
This commit is contained in:
manch1n 2023-04-14 20:23:46 +08:00 • committed by Lane.Wei
parent 98f3aaa4bf
commit 87eb0f3665
9 changed files with 99 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

40
src/libslic3r/GCode/GCodeProcessor.hpp
View file

@ -93,31 +93,25 @@ namespace Slic3r {
}
};
struct ConflictResult
{
std::string _objName1;
std::string _objName2;
double _height;
const void *_obj1; // nullptr means wipe tower
const void *_obj2;
int layer = -1;
ConflictResult(const std::string &objName1, const std::string &objName2, double height, const void *obj1, const void *obj2)
: _objName1(objName1), _objName2(objName2), _height(height), _obj1(obj1), _obj2(obj2)
{}
ConflictResult() = default;
};
using ConflictResultOpt = std::optional<ConflictResult>;
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;
ConflictResultOpt conflict_result;
struct SettingsIds
{