3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-13 01:37:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

FIX: close conflict notification after move obj

Browse source 
Jira: STUDIO-2720

Change-Id: Icb7bc2ed76aa28c7b8227a219cb57da412aab12d
(cherry picked from commit 47e04a1bd7118de95c4a964fea38d8c09f53a200)
This commit is contained in:
Arthur 2023-04-18 21:15:53 +08:00 • committed by Lane.Wei
parent bd2df4801a
commit 62b4be7341
1 changed files with 14 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/slic3r/GUI/GLCanvas3D.cpp
View file

@ -2658,6 +2658,7 @@ void GLCanvas3D::reload_scene(bool refresh_immediately, bool force_full_scene_re
//BBS:exclude the assmble view //BBS:exclude the assmble view
if (m_canvas_type != ECanvasType::CanvasAssembleView) { if (m_canvas_type != ECanvasType::CanvasAssembleView) {
_set_warning_notification_if_needed(EWarning::GCodeConflict);
// checks for geometry outside the print volume to render it accordingly // checks for geometry outside the print volume to render it accordingly
if (!m_volumes.empty()) { if (!m_volumes.empty()) {
ModelInstanceEPrintVolumeState state; ModelInstanceEPrintVolumeState state;
@ -8838,8 +8839,10 @@ void GLCanvas3D::_set_warning_notification_if_needed(EWarning warning)
{ {
_set_current(); _set_current();
bool show = false; bool show = false;
if (!m_volumes.empty()) if (!m_volumes.empty()) {
show = _is_any_volume_outside(); show = _is_any_volume_outside();
show &= m_gcode_viewer.has_data() && m_gcode_viewer.is_contained_in_bed() && m_gcode_viewer.m_conflict_result.has_value();
}
else { else {
if (wxGetApp().is_editor()) { if (wxGetApp().is_editor()) {
if (current_printer_technology() != ptSLA) if (current_printer_technology() != ptSLA)
@ -8884,17 +8887,23 @@ void GLCanvas3D::_set_warning_notification(EWarning warning, bool state)
}; };
std::string text; std::string text;
ErrorType error = ErrorType::PLATER_WARNING; ErrorType error = ErrorType::PLATER_WARNING;
const ModelObject* conflictObj=nullptr;
switch (warning) { switch (warning) {
case EWarning::GCodeConflict: { case EWarning::GCodeConflict: {
static std::string prevConflictText;
text = prevConflictText;
error = ErrorType::SLICING_ERROR;
if (!m_gcode_viewer.m_conflict_result) { break; } if (!m_gcode_viewer.m_conflict_result) { break; }
std::string objName1 = m_gcode_viewer.m_conflict_result.value()._objName1; std::string objName1 = m_gcode_viewer.m_conflict_result.value()._objName1;
std::string objName2 = m_gcode_viewer.m_conflict_result.value()._objName2; std::string objName2 = m_gcode_viewer.m_conflict_result.value()._objName2;
double height = m_gcode_viewer.m_conflict_result.value()._height; double height = m_gcode_viewer.m_conflict_result.value()._height;
int layer = m_gcode_viewer.m_conflict_result.value().layer; int layer = m_gcode_viewer.m_conflict_result.value().layer;
text = (boost::format(_u8L("Conflicts of gcode paths have been found at layer %d, z = %.2lf mm. Please separate the conflicted objects farther (%s <-> %s).")) % layer % text = (boost::format(_u8L("Conflicts of gcode paths have been found at layer %d. Please separate the conflicted objects farther (%s <-> %s).")) % (layer + 1) %
height % objName1 % objName2) objName1 % objName2)
.str(); .str();
error = ErrorType::SLICING_ERROR; prevConflictText = text;
const PrintObject *obj2 = reinterpret_cast<const PrintObject *>(m_gcode_viewer.m_conflict_result.value()._obj2);
conflictObj = obj2->model_object();
break; break;
} }
case EWarning::ObjectOutside: text = _u8L("An object is layed over the boundary of plate."); break; case EWarning::ObjectOutside: text = _u8L("An object is layed over the boundary of plate."); break;
@ -8913,25 +8922,6 @@ void GLCanvas3D::_set_warning_notification(EWarning warning, bool state)
return; return;
auto& notification_manager = *wxGetApp().plater()->get_notification_manager(); auto& notification_manager = *wxGetApp().plater()->get_notification_manager();
if (warning == EWarning::GCodeConflict && m_gcode_viewer.m_conflict_result) {
const PrintObject *obj2 = reinterpret_cast<const PrintObject *>(m_gcode_viewer.m_conflict_result.value()._obj2);
auto mo = obj2->model_object();
ObjectID id = mo->id();
auto action_fn = [id](wxEvtHandler *) {
auto &objects = wxGetApp().model().objects;
auto iter = id.id ? std::find_if(objects.begin(), objects.end(), [id](auto o) { return o->id() == id; }) : objects.end();
if (iter != objects.end()) {
wxGetApp().mainframe->select_tab(MainFrame::tp3DEditor);
wxGetApp().obj_list()->select_items({{*iter, nullptr}});
}
return false;
};
auto hypertext = _u8L("Jump to");
hypertext += std::string(" [") + mo->name + "]";
notification_manager.push_notification(NotificationType::PlaterError, NotificationManager::NotificationLevel::ErrorNotificationLevel, _u8L("ERROR:") + "\n" + text,
hypertext, action_fn);
return;
}
switch (error) switch (error)
{ {
case PLATER_WARNING: case PLATER_WARNING:
@ -8948,7 +8938,7 @@ void GLCanvas3D::_set_warning_notification(EWarning warning, bool state)
break; break;
case SLICING_ERROR: case SLICING_ERROR:
if (state) if (state)
notification_manager.push_slicing_error_notification(text, nullptr); notification_manager.push_slicing_error_notification(text, conflictObj);
else else
notification_manager.close_slicing_error_notification(text); notification_manager.close_slicing_error_notification(text);
break; break;