3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Change wxString to string

Browse source
This commit is contained in:
Filip Sykala - NTB T15p 2022-10-21 17:26:25 +02:00
parent 47952e0c08
commit f7f4b28f73
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1738,7 +1738,7 @@ void ObjectList::load_shape_object(const std::string& type_name)
// Create mesh
BoundingBoxf3 bb;
TriangleMesh mesh = create_mesh(type_name, bb);
load_mesh_object(mesh, _L("Shape") + "-" + _(type_name));
load_mesh_object(mesh, _u8L("Shape") + "-" + type_name);
#if ENABLE_RELOAD_FROM_DISK_REWORK
if (!m_objects->empty())
m_objects->back()->volumes.front()->source.is_from_builtin_objects = true;
@ -1780,7 +1780,7 @@ void ObjectList::load_shape_object_from_gallery(const wxArrayString& input_files
void ObjectList::load_mesh_object(
const TriangleMesh & mesh,
const wxString & name,
const std::string & name,
bool center,
const TextConfiguration *text_config /* = nullptr*/,
const Transform3d * transformation /* = nullptr*/)
@ -1794,12 +1794,12 @@ void ObjectList::load_mesh_object(
std::vector<size_t> object_idxs;
ModelObject* new_object = model.add_object();
new_object->name = into_u8(name);
new_object->name = name;
new_object->add_instance(); // each object should have at list one instance
ModelVolume* new_volume = new_object->add_volume(mesh);
new_object->sort_volumes(wxGetApp().app_config->get("order_volumes") == "1");
new_volume->name = into_u8(name);
new_volume->name = name;
if (text_config)
new_volume->text_configuration = *text_config;
// set a default extruder value, since user can't add it manually

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

@ -257,7 +257,7 @@ public:
void load_shape_object(const std::string &type_name);
void load_shape_object_from_gallery();
void load_shape_object_from_gallery(const wxArrayString& input_files);
void load_mesh_object(const TriangleMesh &mesh, const wxString &name, bool center = true,
void load_mesh_object(const TriangleMesh &mesh, const std::string &name, bool center = true,
const TextConfiguration* text_config = nullptr, const Transform3d* transformation = nullptr);
void del_object(const int obj_idx);
void del_subobject_item(wxDataViewItem& item);