juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-07-25 20:02:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix summary handling in MixedFilamentConfigPanel: Replace wxEmptyString with wxString() for improved clarity in preview data handling. Update instance_shift type to Vec3d for better type consistency in Selection class during object pasting.

Browse Source
This commit is contained in:
Radu
2026-02-18 15:50:53 +01:00
parent effe346814
commit ab1c645af9
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/slic3r/GUI/Plater.cpp
View File

@@ -3590,7 +3590,7 @@ void MixedFilamentConfigPanel::build_ui()
if (m_mix_preview) {
const std::string summary = summarize_sequence(preview_sequence);
m_mix_preview->set_data(m_palette, preview_sequence, same_layer_mode, wxColour(m_mf.display_color),
_L("Preview"), summary.empty() ? wxEmptyString : from_u8(summary));
_L("Preview"), summary.empty() ? wxString() : from_u8(summary));
}
if (m_swatch) {
m_swatch->SetBackgroundColour(wxColour(m_mf.display_color));
@@ -3788,7 +3788,7 @@ void MixedFilamentConfigPanel::update_preview()
if (m_mix_preview) {
const std::string summary = summarize_sequence(initial_sequence);
m_mix_preview->set_data(m_palette, initial_sequence, same_layer_mode, wxColour(m_mf.display_color),
_L("Preview"), summary.empty() ? wxEmptyString : from_u8(summary));
_L("Preview"), summary.empty() ? wxString() : from_u8(summary));
}
}

2
src/slic3r/GUI/Selection.cpp
View File

@@ -3158,7 +3158,7 @@ void Selection::paste_objects_from_clipboard()
if (shift_all(0) != 0 || shift_all(1) != 0) {
// BBS: if multiple objects are selected, move them as a whole after copy
if (i == 0) empty_cell_all = wxGetApp().plater()->canvas3D()->get_nearest_empty_cell({start_point(0), start_point(1)}, {bbox.size()(0)+1,bbox.size()(1)+1});
auto instance_shift = src_object->instances.front()->get_offset() - src_objects[0]->instances.front()->get_offset();
Vec3d instance_shift = src_object->instances.front()->get_offset() - src_objects[0]->instances.front()->get_offset();
displacement = {shift_all.x() + empty_cell_all.x() + instance_shift.x(), shift_all.y() + empty_cell_all.y() + instance_shift.y(), start_offset(2)};
} else {
// BBS: if only one object is copied, find an empty cell to put it