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

Next try

Browse source
This commit is contained in:
YuSanka 2019-04-30 09:38:23 +02:00
parent 6ddefc6a65
commit 3eacb0a216
3 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/slic3r/GUI/GUI_ObjectList.cpp
View file

@ -1886,8 +1886,8 @@ void ObjectList::part_selection_changed()
if (item) { if (item) {
wxGetApp().obj_manipul()->get_og()->set_value("object_name", m_objects_model->GetName(item)); wxGetApp().obj_manipul()->get_og()->set_value("object_name", m_objects_model->GetName(item));
const wxString& tooltip = get_mesh_errors_list(obj_idx, volume_id); const wxString tooltip = get_mesh_errors_list(obj_idx, volume_id);
wxGetApp().obj_manipul()->update_manifold_warning_icon_state(tooltip); wxGetApp().obj_manipul()->update_warning_icon_state(tooltip);
} }
} }

4
src/slic3r/GUI/GUI_ObjectManipulation.cpp
View file

@ -66,7 +66,7 @@ ObjectManipulation::ObjectManipulation(wxWindow* parent) :
return; return;
wxGetApp().obj_list()->fix_through_netfabb(); wxGetApp().obj_list()->fix_through_netfabb();
update_manifold_warning_icon_state(wxGetApp().obj_list()->get_mesh_errors_list()); update_warning_icon_state(wxGetApp().obj_list()->get_mesh_errors_list());
}); });
return sizer; return sizer;
@ -365,7 +365,7 @@ void ObjectManipulation::emulate_kill_focus()
on_change(option, 0); on_change(option, 0);
} }
void ObjectManipulation::update_manifold_warning_icon_state(const wxString& tooltip) void ObjectManipulation::update_warning_icon_state(const wxString& tooltip)
{ {
m_fix_throught_netfab_bitmap->SetBitmap(tooltip.IsEmpty() ? wxNullBitmap : m_manifold_warning_bmp.bmp()); m_fix_throught_netfab_bitmap->SetBitmap(tooltip.IsEmpty() ? wxNullBitmap : m_manifold_warning_bmp.bmp());
m_fix_throught_netfab_bitmap->SetToolTip(tooltip); m_fix_throught_netfab_bitmap->SetToolTip(tooltip);

3
src/slic3r/GUI/GUI_ObjectManipulation.hpp
View file

@ -9,6 +9,7 @@
class wxStaticText; class wxStaticText;
class LockButton; class LockButton;
class wxStaticBitmap; class wxStaticBitmap;
class wxString;
namespace Slic3r { namespace Slic3r {
namespace GUI { namespace GUI {
@ -111,7 +112,7 @@ public:
void emulate_kill_focus(); void emulate_kill_focus();
#endif // __APPLE__ #endif // __APPLE__
void update_manifold_warning_icon_state(const wxString& tooltip); void update_warning_icon_state(const wxString& tooltip);
void msw_rescale(); void msw_rescale();
private: private: