3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-08 15:37:30 -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

29
src/libslic3r/Print.hpp
View file

@ -775,14 +775,15 @@ public:
std::string get_conflict_string() const
{
std::string result;
if (m_conflict_result.conflicted) {
result = "Found gcode path conflicts between object " + m_conflict_result.obj1 + " and " + m_conflict_result.obj2;
if (m_conflict_result) {
result = "Found gcode path conflicts between object " + m_conflict_result.value()._objName1 + " and " + m_conflict_result.value()._objName2;
}
return result;
}
//BBS
static StringObjectException sequential_print_clearance_valid(const Print &print, Polygons *polygons = nullptr, std::vector<std::pair<Polygon, float>>* height_polygons = nullptr);
ConflictResultOpt get_conflict_result() const { return m_conflict_result; }
// Return 4 wipe tower corners in the world coordinates (shifted and rotated), including the wipe tower brim.
std::vector<Point> first_layer_wipe_tower_corners(bool check_wipe_tower_existance=true) const;
@ -837,28 +838,8 @@ private:
//BBS: modified_count
int m_modified_count {0};
//BBS
struct ConflictResult
{
bool conflicted;
std::string obj1;
std::string obj2;
//TODO
//the actual loaction
void set(const std::string& o1, const std::string& o2)
{
conflicted = true;
obj1 = o1;
obj2 = o2;
}
void reset()
{
conflicted = false;
obj1.clear();
obj2.clear();
}
}m_conflict_result;
FakeWipeTower m_fake_wipe_tower;
ConflictResultOpt m_conflict_result;
FakeWipeTower m_fake_wipe_tower;
// To allow GCode to set the Print's GCodeExport step status.
friend class GCode;