QIDITECH/QIDIStudio
1
0
Fork 0
mirror of https://github.com/QIDITECH/QIDIStudio.git synced 2026-02-07 12:21:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

update slic3r

Browse Source
This commit is contained in:
QIDI TECH
2025-02-26 20:14:36 +08:00
parent d32f03deb8
commit ffb5d3da8a
60 changed files with 1724 additions and 475 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/slic3r/GUI/GLCanvas3D.cpp
View File

@@ -4572,8 +4572,9 @@ void GLCanvas3D::on_mouse(wxMouseEvent& evt)
// Detection of doubleclick on text to open emboss edit window
auto type = m_gizmos.get_current_type();
if (evt.LeftDClick() && !m_hover_volume_idxs.empty() &&
(type == GLGizmosManager::EType::Undefined //||type == GLGizmosManager::EType::Text ||
//type == GLGizmosManager::EType::Svg
(type == GLGizmosManager::EType::Undefined ||
type == GLGizmosManager::EType::Text ||
type == GLGizmosManager::EType::Svg
)) {
for (int hover_volume_id : m_hover_volume_idxs) {
const GLVolume &hover_gl_volume = *m_volumes.volumes[hover_volume_id];
@@ -4586,16 +4587,26 @@ void GLCanvas3D::on_mouse(wxMouseEvent& evt)
continue;
const ModelVolume *hover_volume = hover_object->volumes[hover_volume_idx];
/* if (hover_volume->text_configuration.has_value()) {
if (hover_volume->is_text()) {
m_selection.add_volumes(Selection::EMode::Volume, {(unsigned) hover_volume_id});
if (type == GLGizmosManager::EType::Text)
m_gizmos.open_gizmo(GLGizmosManager::EType::Text); // close text
wxGetApp().obj_list()->update_selections();
m_gizmos.open_gizmo(GLGizmosManager::EType::Text);
return;
}
/* else if (hover_volume->text_configuration.has_value()) {
m_selection.add_volumes(Selection::EMode::Volume, {(unsigned) hover_volume_id});
if (type != GLGizmosManager::EType::Emboss) m_gizmos.open_gizmo(GLGizmosManager::EType::Emboss);
wxGetApp().obj_list()->update_selections();
return;
} else*/ if (hover_volume->emboss_shape.has_value()) {
}*/
else if(hover_volume->emboss_shape.has_value()){
m_selection.add_volumes(Selection::EMode::Volume, {(unsigned) hover_volume_id});
if (type != GLGizmosManager::EType::Svg)
m_gizmos.open_gizmo(GLGizmosManager::EType::Svg);
if (type == GLGizmosManager::EType::Svg)
m_gizmos.open_gizmo(GLGizmosManager::EType::Svg);// close svg
wxGetApp().obj_list()->update_selections();
m_gizmos.open_gizmo(GLGizmosManager::EType::Svg);
return;
}
}