From 203e9e848c1c11770efe642e660f5c3791685e38 Mon Sep 17 00:00:00 2001 From: YuSanka Date: Wed, 24 Apr 2019 13:33:05 +0200 Subject: Changed Manipulation panel. (Simple mode)There is exclamation mark icon next for the object name, if it has errors. + some code refactoring --- src/slic3r/GUI/GUI_ObjectManipulation.hpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/slic3r/GUI/GUI_ObjectManipulation.hpp') diff --git a/src/slic3r/GUI/GUI_ObjectManipulation.hpp b/src/slic3r/GUI/GUI_ObjectManipulation.hpp index a5a180a56..071edbed8 100644 --- a/src/slic3r/GUI/GUI_ObjectManipulation.hpp +++ b/src/slic3r/GUI/GUI_ObjectManipulation.hpp @@ -78,6 +78,9 @@ class ObjectManipulation : public OG_Settings bool m_uniform_scale {true}; PrusaLockButton* m_lock_bnt{ nullptr }; + wxBitmap m_manifold_warning_bmp; + wxStaticBitmap* m_fix_throught_netfab_bitmap; + #ifndef __APPLE__ // Currently focused option name (empty if none) std::string m_focused_option; @@ -107,6 +110,8 @@ public: void emulate_kill_focus(); #endif // __APPLE__ + void update_manifold_warning_icon_state(const wxString& tooltip); + private: void reset_settings_value(); -- cgit v1.2.3 From b4d5287d0c9826bcd3c95b595443efd437cd3f85 Mon Sep 17 00:00:00 2001 From: YuSanka Date: Wed, 24 Apr 2019 16:04:47 +0200 Subject: Refactoring: get_mesh_errors_count() moved to ModelObject + added get_object_stl_stats() to ModelObject --- src/slic3r/GUI/GUI_ObjectManipulation.hpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src/slic3r/GUI/GUI_ObjectManipulation.hpp') diff --git a/src/slic3r/GUI/GUI_ObjectManipulation.hpp b/src/slic3r/GUI/GUI_ObjectManipulation.hpp index 071edbed8..d3d5f8444 100644 --- a/src/slic3r/GUI/GUI_ObjectManipulation.hpp +++ b/src/slic3r/GUI/GUI_ObjectManipulation.hpp @@ -8,6 +8,7 @@ class wxStaticText; class PrusaLockButton; +class wxStaticBitmap; namespace Slic3r { namespace GUI { -- cgit v1.2.3 From 2a47f0dc9249470815b4f4fe76dc39fc46fd29ba Mon Sep 17 00:00:00 2001 From: YuSanka Date: Mon, 29 Apr 2019 15:27:59 +0200 Subject: ObjectList improvements: Added warning icon for Parts with a repaired errors --- src/slic3r/GUI/GUI_ObjectManipulation.hpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/slic3r/GUI/GUI_ObjectManipulation.hpp') diff --git a/src/slic3r/GUI/GUI_ObjectManipulation.hpp b/src/slic3r/GUI/GUI_ObjectManipulation.hpp index 9ced31a1f..f691dcc83 100644 --- a/src/slic3r/GUI/GUI_ObjectManipulation.hpp +++ b/src/slic3r/GUI/GUI_ObjectManipulation.hpp @@ -79,7 +79,7 @@ class ObjectManipulation : public OG_Settings bool m_uniform_scale {true}; LockButton* m_lock_bnt{ nullptr }; - wxBitmap m_manifold_warning_bmp; + ScalableBitmap m_manifold_warning_bmp; wxStaticBitmap* m_fix_throught_netfab_bitmap; #ifndef __APPLE__ @@ -112,6 +112,7 @@ public: #endif // __APPLE__ void update_manifold_warning_icon_state(const wxString& tooltip); + void msw_rescale(); private: void reset_settings_value(); -- cgit v1.2.3 From 3eacb0a216ded94ec535334f9c0611f7e54ed9ad Mon Sep 17 00:00:00 2001 From: YuSanka Date: Tue, 30 Apr 2019 09:38:23 +0200 Subject: Next try --- src/slic3r/GUI/GUI_ObjectManipulation.hpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/slic3r/GUI/GUI_ObjectManipulation.hpp') diff --git a/src/slic3r/GUI/GUI_ObjectManipulation.hpp b/src/slic3r/GUI/GUI_ObjectManipulation.hpp index f691dcc83..da9e67d4e 100644 --- a/src/slic3r/GUI/GUI_ObjectManipulation.hpp +++ b/src/slic3r/GUI/GUI_ObjectManipulation.hpp @@ -9,6 +9,7 @@ class wxStaticText; class LockButton; class wxStaticBitmap; +class wxString; namespace Slic3r { namespace GUI { @@ -111,7 +112,7 @@ public: void emulate_kill_focus(); #endif // __APPLE__ - void update_manifold_warning_icon_state(const wxString& tooltip); + void update_warning_icon_state(const wxString& tooltip); void msw_rescale(); private: -- cgit v1.2.3 From 3bc6c29b7a388fd1ef41d0c4ac16a1cd21f3bf41 Mon Sep 17 00:00:00 2001 From: YuSanka Date: Tue, 30 Apr 2019 11:27:41 +0200 Subject: Added missed include --- src/slic3r/GUI/GUI_ObjectManipulation.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/slic3r/GUI/GUI_ObjectManipulation.hpp') diff --git a/src/slic3r/GUI/GUI_ObjectManipulation.hpp b/src/slic3r/GUI/GUI_ObjectManipulation.hpp index da9e67d4e..5aa69cd15 100644 --- a/src/slic3r/GUI/GUI_ObjectManipulation.hpp +++ b/src/slic3r/GUI/GUI_ObjectManipulation.hpp @@ -2,6 +2,7 @@ #define slic3r_GUI_ObjectManipulation_hpp_ #include +#include #include "GUI_ObjectSettings.hpp" #include "GLCanvas3D.hpp" @@ -9,7 +10,6 @@ class wxStaticText; class LockButton; class wxStaticBitmap; -class wxString; namespace Slic3r { namespace GUI { -- cgit v1.2.3 From 7f37f82ad4696543af0cab8f5b7453644aef639f Mon Sep 17 00:00:00 2001 From: YuSanka Date: Tue, 30 Apr 2019 16:59:40 +0200 Subject: Added comments --- src/slic3r/GUI/GUI_ObjectManipulation.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/slic3r/GUI/GUI_ObjectManipulation.hpp') diff --git a/src/slic3r/GUI/GUI_ObjectManipulation.hpp b/src/slic3r/GUI/GUI_ObjectManipulation.hpp index 5aa69cd15..78941135c 100644 --- a/src/slic3r/GUI/GUI_ObjectManipulation.hpp +++ b/src/slic3r/GUI/GUI_ObjectManipulation.hpp @@ -2,7 +2,7 @@ #define slic3r_GUI_ObjectManipulation_hpp_ #include -#include +#include #include "GUI_ObjectSettings.hpp" #include "GLCanvas3D.hpp" -- cgit v1.2.3 From b048669a3bf533ae0158ea9dd16bf6c6090165ea Mon Sep 17 00:00:00 2001 From: YuSanka Date: Thu, 2 May 2019 08:33:38 +0200 Subject: Changed update_warning_icon_state() signature (next try to fix OSX compilation) --- src/slic3r/GUI/GUI_ObjectManipulation.hpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/slic3r/GUI/GUI_ObjectManipulation.hpp') diff --git a/src/slic3r/GUI/GUI_ObjectManipulation.hpp b/src/slic3r/GUI/GUI_ObjectManipulation.hpp index 78941135c..1bff4e22f 100644 --- a/src/slic3r/GUI/GUI_ObjectManipulation.hpp +++ b/src/slic3r/GUI/GUI_ObjectManipulation.hpp @@ -2,7 +2,6 @@ #define slic3r_GUI_ObjectManipulation_hpp_ #include -#include #include "GUI_ObjectSettings.hpp" #include "GLCanvas3D.hpp" @@ -112,7 +111,7 @@ public: void emulate_kill_focus(); #endif // __APPLE__ - void update_warning_icon_state(const wxString& tooltip); + void update_warning_icon_state(/*const wxString& tooltip*/); void msw_rescale(); private: -- cgit v1.2.3 From 88c9948c85a01474be7af47061931c9017e9a946 Mon Sep 17 00:00:00 2001 From: YuSanka Date: Thu, 2 May 2019 09:54:18 +0200 Subject: Fixed typo --- src/slic3r/GUI/GUI_ObjectManipulation.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/slic3r/GUI/GUI_ObjectManipulation.hpp') diff --git a/src/slic3r/GUI/GUI_ObjectManipulation.hpp b/src/slic3r/GUI/GUI_ObjectManipulation.hpp index 1bff4e22f..f86cd6e56 100644 --- a/src/slic3r/GUI/GUI_ObjectManipulation.hpp +++ b/src/slic3r/GUI/GUI_ObjectManipulation.hpp @@ -111,7 +111,7 @@ public: void emulate_kill_focus(); #endif // __APPLE__ - void update_warning_icon_state(/*const wxString& tooltip*/); + void update_warning_icon_state(const wxString& tooltip); void msw_rescale(); private: -- cgit v1.2.3