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

Added tooltips with manifold_warning information

Browse source
This commit is contained in:
YuSanka 2018-08-09 12:02:09 +02:00
parent 6fb4ced410
commit dc8cdcc2ba
3 changed files with 42 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

43
xs/src/slic3r/GUI/GUI_ObjectParts.cpp
View file

@ -228,6 +228,7 @@ wxBoxSizer* content_objects_list(wxWindow *win)
else if (title == _("Name") && pt.x >15 && else if (title == _("Name") && pt.x >15 &&
m_objects_model->GetParent(item) == wxDataViewItem(0)) m_objects_model->GetParent(item) == wxDataViewItem(0))
{ {
// ys_FIXME
// auto menu = create_add_settings_popupmenu(true);// create_correction_stl_menu !!! // auto menu = create_add_settings_popupmenu(true);// create_correction_stl_menu !!!
// get_tab_panel()->GetPage(0)->PopupMenu(menu); // get_tab_panel()->GetPage(0)->PopupMenu(menu);
} }
@ -275,12 +276,44 @@ wxBoxSizer* content_objects_list(wxWindow *win)
wxDataViewItem item; wxDataViewItem item;
wxDataViewColumn* col; wxDataViewColumn* col;
m_objects_ctrl->HitTest(pt, item, col); m_objects_ctrl->HitTest(pt, item, col);
if (col->GetTitle() == " " && item) if (!item) return;
m_objects_ctrl->GetMainWindow()->SetToolTip(_(L("For object settings changing click on icon")));
// else if (col->GetTitle() == _("Name") && item && m_objects_model->GetIcon(item) == m_icon_manifold_warning ) if ( col->GetTitle() == " " )
// m_objects_ctrl->GetMainWindow()->SetToolTip(_(L("Information about auto-repaired errors\n To fix errors, click on the icon"))); m_objects_ctrl->GetMainWindow()->SetToolTip(_(L("Click the icon to change the object settings")));
else if ( col->GetTitle() == _("Name") &&
m_objects_model->GetIcon(item).GetRefData() == m_icon_manifold_warning.GetRefData()) {
int obj_idx = m_objects_model->GetIdByItem(item);
auto& stats = (*m_objects)[obj_idx]->volumes[0]->mesh.stl.stats;
int errors = stats.degenerate_facets + stats.edges_fixed + stats.facets_removed +
stats.facets_added + stats.facets_reversed + stats.backwards_edges;
wxString tooltip = wxString::Format(_(L("Auto-repaired (%d errors):\n")), errors);
std::map<std::string, int> error_msg;
error_msg[L("degenerate facets")] = stats.degenerate_facets;
error_msg[L("edges fixed")] = stats.edges_fixed;
error_msg[L("facets removed")] = stats.facets_removed;
error_msg[L("facets added")] = stats.facets_added;
error_msg[L("facets reversed")] = stats.facets_reversed;
error_msg[L("backwards edges")] = stats.backwards_edges;
for (auto error: error_msg)
{
if (error.second > 0)
tooltip += wxString::Format(_("\t%d %s\n"), error.second, error.first);
}
// OR
// tooltip += wxString::Format(_(L("%d degenerate facets, %d edges fixed, %d facets removed, "
// "%d facets added, %d facets reversed, %d backwards edges")),
// stats.degenerate_facets, stats.edges_fixed, stats.facets_removed,
// stats.facets_added, stats.facets_reversed, stats.backwards_edges);
// ysFIXME uncomment this when fix_error function will be exist
// tooltip += _(L("Click the icon to fix errors"));
m_objects_ctrl->GetMainWindow()->SetToolTip(tooltip);
}
else else
m_objects_ctrl->GetMainWindow()->SetToolTip(""); m_objects_ctrl->GetMainWindow()->SetToolTip(""); // hide tooltip
}); });
return objects_sz; return objects_sz;

2
xs/src/slic3r/GUI/wxExtensions.cpp
View file

@ -566,7 +566,7 @@ wxString PrusaObjectDataViewModel::GetScale(const wxDataViewItem &item) const
return node->m_scale; return node->m_scale;
} }
wxIcon PrusaObjectDataViewModel::GetIcon(const wxDataViewItem &item) const wxIcon& PrusaObjectDataViewModel::GetIcon(const wxDataViewItem &item) const
{ {
PrusaObjectDataViewModelNode *node = (PrusaObjectDataViewModelNode*)item.GetID(); PrusaObjectDataViewModelNode *node = (PrusaObjectDataViewModelNode*)item.GetID();
return node->m_icon; return node->m_icon;

5
xs/src/slic3r/GUI/wxExtensions.hpp
View file

@ -155,6 +155,7 @@ class PrusaObjectDataViewModelNode
{ {
PrusaObjectDataViewModelNode* m_parent; PrusaObjectDataViewModelNode* m_parent;
MyObjectTreeModelNodePtrArray m_children; MyObjectTreeModelNodePtrArray m_children;
wxIcon m_empty_icon;
public: public:
PrusaObjectDataViewModelNode(const wxString &name, int instances_count=1, int scale=100) { PrusaObjectDataViewModelNode(const wxString &name, int instances_count=1, int scale=100) {
m_parent = NULL; m_parent = NULL;
@ -198,7 +199,7 @@ public:
} }
wxString m_name; wxString m_name;
wxIcon m_icon; wxIcon& m_icon = m_empty_icon;
wxString m_copy; wxString m_copy;
wxString m_scale; wxString m_scale;
std::string m_type; std::string m_type;
@ -365,7 +366,7 @@ public:
wxString GetName(const wxDataViewItem &item) const; wxString GetName(const wxDataViewItem &item) const;
wxString GetCopy(const wxDataViewItem &item) const; wxString GetCopy(const wxDataViewItem &item) const;
wxString GetScale(const wxDataViewItem &item) const; wxString GetScale(const wxDataViewItem &item) const;
wxIcon GetIcon(const wxDataViewItem &item) const; wxIcon& GetIcon(const wxDataViewItem &item) const;
// helper methods to change the model // helper methods to change the model