3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-12-11 16:00:17 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

fix a few todos

Browse source
This commit is contained in:
Ocraftyone 2023-11-09 09:01:07 -05:00
parent 413e8751c0
commit 506e1f4508
No known key found for this signature in database
GPG key ID: 85836ED21AD4D125
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/slic3r/GUI/ExtraRenderers.cpp
View file

@ -320,7 +320,7 @@ wxWindow* BitmapChoiceRenderer::CreateEditorCtrl(wxWindow* parent, wxRect labelR
c_editor->Append(_L("default"), *get_default_extruder_color_icon()); c_editor->Append(_L("default"), *get_default_extruder_color_icon());
for (size_t i = 0; i < icons.size(); i++) for (size_t i = 0; i < icons.size(); i++)
c_editor->Append(wxString::Format("%d", i+1), icons[i]->GetBitmapFor(parent)); //OcraftyoneTODO: quick n dirty conversion c_editor->Append(wxString::Format("%d", i+1), *icons[i]);
if (has_default_extruder && has_default_extruder()) if (has_default_extruder && has_default_extruder())
c_editor->SetSelection(atoi(data.GetText().c_str())); c_editor->SetSelection(atoi(data.GetText().c_str()));

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

@ -397,8 +397,8 @@ void PresetComboBox::add_ams_filaments(std::string selected, bool alias_name)
const_cast<Preset&>(*iter).is_visible = true; const_cast<Preset&>(*iter).is_visible = true;
auto color = tray.opt_string("filament_colour", 0u); auto color = tray.opt_string("filament_colour", 0u);
auto name = tray.opt_string("tray_name", 0u); auto name = tray.opt_string("tray_name", 0u);
wxBitmap bmp(get_extruder_color_icon(color, name, 24, 16)->GetBitmapFor(m_parent)); //OcraftyoneTODO: conversion rather than updating correctly // wxBitmap bmp(get_extruder_color_icon(color, name, 24, 16)->GetBitmapFor(m_parent)); //OcraftyoneTODO: conversion rather than updating correctly
int item_id = Append(get_preset_name(*iter), bmp.ConvertToImage(), &m_first_ams_filament + entry.first); int item_id = Append(get_preset_name(*iter), *get_extruder_color_icon(color, name, 24, 16), &m_first_ams_filament + entry.first);
//validate_selection(id->value == selected); // can not select //validate_selection(id->value == selected); // can not select
} }
m_last_ams_filament = GetCount(); m_last_ams_filament = GetCount();