3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2026-03-04 17:44:46 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Change to a lossy checkbox and a bits field with a range of 8-30.

Browse source
This commit is contained in:
Maeyanie 2026-02-02 18:09:36 -05:00
parent da42f69b59
commit d642c9bcc0
5 changed files with 90 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/libslic3r/AppConfig.cpp
View file

@ -237,6 +237,9 @@ void AppConfig::set_defaults()
if (get("enable_multi_machine").empty())
set_bool("enable_multi_machine", false);
if (get("drc_lossy_switch").empty())
set_bool("drc_lossy_switch", false);
if (get("drc_bits").empty())
set("drc_bits", DRC_BITS_DEFAULT_STR);

6
src/libslic3r/Format/DRC.hpp
View file

@ -3,10 +3,10 @@
namespace Slic3r {
#define DRC_BITS_MIN 0
#define DRC_BITS_MIN 8
#define DRC_BITS_MAX 30
#define DRC_BITS_DEFAULT 0
#define DRC_BITS_DEFAULT_STR "0"
#define DRC_BITS_DEFAULT 16
#define DRC_BITS_DEFAULT_STR "16"
class TriangleMesh;
class ModelObject;

13
src/slic3r/GUI/Plater.cpp
View file

@ -14881,10 +14881,15 @@ void Plater::export_drc(bool extended, bool selection_only, bool multi_drcs)
int speed = 0;
AppConfig* app_config = wxGetApp().app_config;
if (app_config) bits = stoi(app_config->get("drc_bits"));
if (bits < DRC_BITS_MIN) bits = DRC_BITS_MIN;
if (bits > DRC_BITS_MAX) bits = DRC_BITS_MAX;
if (app_config) {
if (app_config->get("drc_lossy_switch") == "true") {
bits = stoi(app_config->get("drc_bits"));
if (bits < DRC_BITS_MIN) bits = DRC_BITS_MIN;
if (bits > DRC_BITS_MAX) bits = DRC_BITS_MAX;
} else {
bits = 0;
}
}
if (multi_drcs) {
wxDirDialog dlg(this, _L("Choose a directory"), from_u8(wxGetApp().app_config->get_last_dir()),

77
src/slic3r/GUI/Preferences.cpp
View file

@ -795,6 +795,76 @@ wxBoxSizer *PreferencesDialog::create_item_auto_reslice(wxString title, wxString
return sizer_row;
}
wxBoxSizer* PreferencesDialog::create_item_draco(wxString title, wxString side_label, wxString tooltip)
{
wxBoxSizer* m_sizer_input = new wxBoxSizer(wxHORIZONTAL);
m_sizer_input->AddSpacer(FromDIP(DESIGN_LEFT_MARGIN));
auto checkbox_title = new wxStaticText(m_parent, wxID_ANY, title, wxDefaultPosition, DESIGN_TITLE_SIZE, wxST_NO_AUTORESIZE);
checkbox_title->SetForegroundColour(DESIGN_GRAY900_COLOR);
checkbox_title->SetFont(::Label::Body_14);
checkbox_title->Wrap(DESIGN_TITLE_SIZE.x);
checkbox_title->SetToolTip(tooltip);
auto checkbox = new ::CheckBox(m_parent);
checkbox->SetValue(app_config->get_bool("drc_lossy_switch"));
checkbox->SetToolTip(tooltip);
checkbox->Bind(wxEVT_TOGGLEBUTTON, [this, checkbox](wxCommandEvent& e) {
app_config->set_bool("drc_lossy_switch", checkbox->GetValue());
app_config->save();
if (m_draco_bits_textinput != nullptr) {
m_draco_bits_textinput->Enable(checkbox->GetValue());
}
e.Skip();
});
auto input = new ::TextInput(m_parent, wxEmptyString, side_label, wxEmptyString, wxDefaultPosition, wxSize(FromDIP(97), -1), wxTE_PROCESS_ENTER);
StateColor input_bg(std::pair<wxColour, int>(wxColour("#F0F0F1"), StateColor::Disabled),
std::pair<wxColour, int>(*wxWHITE, StateColor::Enabled));
input->SetBackgroundColor(input_bg);
input->GetTextCtrl()->SetValue(app_config->get("drc_bits"));
wxTextValidator validator(wxFILTER_DIGITS);
input->SetToolTip(tooltip);
input->GetTextCtrl()->SetValidator(validator);
m_sizer_input->Add(checkbox_title, 0, wxALIGN_CENTER | wxTOP | wxBOTTOM, FromDIP(3));
m_sizer_input->Add(checkbox, 0, wxALIGN_CENTER | wxLEFT | wxRIGHT, FromDIP(5));
m_sizer_input->Add(input, 0, wxALIGN_CENTER_VERTICAL);
std::function<void()> set_draco_bits = [this, input]() {
long drc_bits = DRC_BITS_DEFAULT;
input->GetTextCtrl()->GetValue().ToLong(&drc_bits);
if (drc_bits > DRC_BITS_MAX) {
drc_bits = DRC_BITS_MAX;
input->GetTextCtrl()->SetValue(std::to_string(drc_bits));
} else if (drc_bits < DRC_BITS_MIN) {
drc_bits = DRC_BITS_MIN;
input->GetTextCtrl()->SetValue(std::to_string(drc_bits));
}
app_config->set("drc_bits", std::to_string(drc_bits));
app_config->save();
};
input->GetTextCtrl()->Bind(wxEVT_TEXT_ENTER, [set_draco_bits](wxCommandEvent& e) {
set_draco_bits();
e.Skip();
});
input->GetTextCtrl()->Bind(wxEVT_KILL_FOCUS, [set_draco_bits](wxFocusEvent& e) {
set_draco_bits();
e.Skip();
});
input->Enable(app_config->get("drc_lossy_switch") == "true");
input->Refresh();
m_draco_bits_textinput = input;
return m_sizer_input;
}
wxBoxSizer* PreferencesDialog::create_item_darkmode(wxString title,wxString tooltip, std::string param)
{
wxBoxSizer* m_sizer_checkbox = new wxBoxSizer(wxHORIZONTAL);
@ -1360,13 +1430,10 @@ void PreferencesDialog::create_items()
g_sizer->Add(item_pop_up_filament_map_dialog);
#endif
auto item_draco_position_bits = create_item_spinctrl(_L("Draco export dimensional accuracy"),
wxEmptyString,
auto item_draco_position_bits = create_item_draco(_L("Use lossy compression on Draco export"),
_L("bits"),
_L("Reducing the bits reduces the file precision and size.\n"
"0 disables quantization producing an effectively lossless but compressed file."),
"~16 bits may be recommended and within the tolerances of 3D printing.\n"
"drc_bits", DRC_BITS_MIN, DRC_BITS_MAX);
"~16 bits may be recommended and within the tolerances of 3D printing."));
g_sizer->Add(item_draco_position_bits);
g_sizer->AddSpacer(FromDIP(10));

3
src/slic3r/GUI/Preferences.hpp
View file

@ -12,6 +12,7 @@
#include "Widgets/ComboBox.hpp"
#include "Widgets/CheckBox.hpp"
#include "Widgets/TextInput.hpp"
#include "Widgets/SpinInput.hpp"
#include "Widgets/TabCtrl.hpp"
#include "slic3r/Utils/bambu_networking.hpp"
@ -68,6 +69,7 @@ public:
::CheckBox * m_internal_developer_mode_ckeckbox = {nullptr};
::CheckBox * m_dark_mode_ckeckbox = {nullptr};
::TextInput *m_backup_interval_textinput = {nullptr};
::TextInput *m_draco_bits_textinput = {nullptr};
::ComboBox * m_network_version_combo = {nullptr};
wxBoxSizer * m_network_version_sizer = {nullptr};
std::vector<BBL::NetworkLibraryVersionInfo> m_available_versions;
@ -95,6 +97,7 @@ public:
wxBoxSizer *create_camera_orbit_mult_input(wxString title, wxString tooltip);
wxBoxSizer *create_item_backup(wxString title, wxString tooltip);
wxBoxSizer *create_item_auto_reslice(wxString title, wxString checkbox_tooltip, wxString delay_tooltip);
wxBoxSizer* create_item_draco(wxString title, wxString side_label, wxString tooltip);
wxBoxSizer *create_item_multiple_combobox(wxString title, wxString tooltip, std::string parama, std::vector<wxString> vlista, std::vector<wxString> vlistb);
#ifdef WIN32
wxBoxSizer *create_item_link_association(wxString url_prefix, wxString website_name);