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

Fixed events OBJECT_SETTINGS_CHANGED_EVENT , OBJECT_REMOVE_EVENT and UPDATE_SCENE_EVENT

Browse source 
+ changed ctor of ObjList
+ deleted unusable code from Tab.cpp
This commit is contained in:
YuSanka 2018-10-08 16:27:38 +02:00
parent 04e193011c
commit 1006cd976e
11 changed files with 123 additions and 292 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/slic3r/GUI/GUI_ObjectList.hpp
View file

@ -1,15 +1,11 @@
#ifndef slic3r_GUI_ObjectList_hpp_
#define slic3r_GUI_ObjectList_hpp_
#include <wx/panel.h>
#include <wx/bitmap.h>
#include <wx/dataview.h>
#include <map>
class wxBoxSizer;
class wxDataViewCtrl;
class wxDataViewColumn;
class wxDataViewEvent;
class wxDataViewItem;
class PrusaObjectDataViewModel;
namespace Slic3r {
@ -20,10 +16,9 @@ class ModelVolume;
namespace GUI {
class ObjectList
class ObjectList : public wxDataViewCtrl
{
wxBoxSizer *m_sizer {nullptr};
wxWindow *m_parent{ nullptr };
DynamicPrintConfig *m_default_config {nullptr};
@ -50,11 +45,10 @@ public:
std::map<std::string, wxBitmap> CATEGORY_ICON;
wxDataViewCtrl *m_objects_ctrl{ nullptr };
PrusaObjectDataViewModel *m_objects_model{ nullptr };
DynamicPrintConfig *m_config {nullptr};
std::vector<ModelObject*> *m_objects{ nullptr };
std::vector<ModelObject*> *m_objects{ nullptr };
void create_objects_ctrl();
@ -110,7 +104,7 @@ public:
void update_manipulation_sizer(const bool is_simple_mode);
// Add object to the list
void add_object_to_list(const std::string &name, ModelObject* model_object);
void add_object_to_list(size_t obj_idx);
// Delete object from the list
void delete_object_from_list();
// Delete all objects from the list