diff --git a/src/libslic3r/SLAPrint.cpp b/src/libslic3r/SLAPrint.cpp index 7899d173e1..004f7d5550 100644 --- a/src/libslic3r/SLAPrint.cpp +++ b/src/libslic3r/SLAPrint.cpp @@ -1047,15 +1047,15 @@ Vec3d SLAPrint::relative_correction() const Vec3d corr(1., 1., 1.); if(printer_config().relative_correction.values.size() >= 2) { - corr(X) = printer_config().relative_correction.values[0]; - corr(Y) = printer_config().relative_correction.values[0]; - corr(Z) = printer_config().relative_correction.values.back(); + corr.x() = printer_config().relative_correction.values[0]; + corr.y() = corr.x(); + corr.z() = printer_config().relative_correction.values[1]; } if(material_config().material_correction.values.size() >= 2) { - corr(X) *= material_config().material_correction.values[0]; - corr(Y) *= material_config().material_correction.values[0]; - corr(Z) *= material_config().material_correction.values.back(); + corr.x() *= material_config().material_correction.values[0]; + corr.y() = corr.x(); + corr.z() *= material_config().material_correction.values[1]; } return corr; diff --git a/src/slic3r/GUI/NotificationManager.cpp b/src/slic3r/GUI/NotificationManager.cpp index 1b08e6cd25..98abb4863c 100644 --- a/src/slic3r/GUI/NotificationManager.cpp +++ b/src/slic3r/GUI/NotificationManager.cpp @@ -1172,7 +1172,7 @@ void NotificationManager::SlicingProgressNotification::set_status_text(const std { NotificationData data{ NotificationType::SlicingProgress, NotificationLevel::ProgressBarNotificationLevel, 0, _u8L("Slicing finished."), m_is_fff ? _u8L("Export G-Code.") : _u8L("Export.") }; update(data); - m_state = EState::NotFading; + m_state = EState::Shown; } break; default: @@ -1191,7 +1191,7 @@ void NotificationManager::SlicingProgressNotification::set_print_info(const std: void NotificationManager::SlicingProgressNotification::set_sidebar_collapsed(bool collapsed) { m_sidebar_collapsed = collapsed; - if (m_sp_state == SlicingProgressState::SP_COMPLETED) + if (m_sp_state == SlicingProgressState::SP_COMPLETED && collapsed) m_state = EState::NotFading; } @@ -1208,7 +1208,7 @@ int NotificationManager::SlicingProgressNotification::get_duration() if (m_sp_state == SlicingProgressState::SP_CANCELLED) return 2; else if (m_sp_state == SlicingProgressState::SP_COMPLETED && !m_sidebar_collapsed) - return 0; + return 2; else return 0; }