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

@Vojta request --> change ratio to decimation ratio

Browse source
This commit is contained in:
Filip Sykala 2021-08-25 13:09:37 +02:00
parent beb38d09ae
commit 9896a21904
2 changed files with 66 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

80
src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp
View file

@ -17,10 +17,17 @@ GLGizmoSimplify::GLGizmoSimplify(GLCanvas3D & parent,
: GLGizmoBase(parent, icon_filename, -1) : GLGizmoBase(parent, icon_filename, -1)
, m_state(State::settings) , m_state(State::settings)
, m_is_valid_result(false) , m_is_valid_result(false)
, m_exist_preview(false)
, m_progress(0) , m_progress(0)
, m_volume(nullptr) , m_volume(nullptr)
, m_obj_index(0) , m_obj_index(0)
, m_need_reload(false) , m_need_reload(false)
, tr_mesh_name(_u8L("Mesh name"))
, tr_triangles(_u8L("Triangles"))
, tr_preview(_u8L("Preview"))
, tr_detail_level(_u8L("Detail level"))
, tr_decimate_ratio(_u8L("Decimate ratio"))
{} {}
GLGizmoSimplify::~GLGizmoSimplify() { GLGizmoSimplify::~GLGizmoSimplify() {
@ -45,9 +52,7 @@ void GLGizmoSimplify::on_render_for_picking() {}
void GLGizmoSimplify::on_render_input_window(float x, float y, float bottom_limit) void GLGizmoSimplify::on_render_input_window(float x, float y, float bottom_limit)
{ {
const int max_char_in_name = 20;
create_gui_cfg(); create_gui_cfg();
const Selection &selection = m_parent.get_selection(); const Selection &selection = m_parent.get_selection();
int object_idx = selection.get_object_idx(); int object_idx = selection.get_object_idx();
ModelObject *obj = wxGetApp().plater()->model().objects[object_idx]; ModelObject *obj = wxGetApp().plater()->model().objects[object_idx];
@ -65,15 +70,15 @@ void GLGizmoSimplify::on_render_input_window(float x, float y, float bottom_limi
m_obj_index = object_idx; // to remember correct object m_obj_index = object_idx; // to remember correct object
m_volume = act_volume; m_volume = act_volume;
m_original_its = {}; m_original_its = {};
const TriangleMesh &tm = m_volume->mesh(); m_configuration.decimate_ratio = 50.; // default value
m_configuration.wanted_percent = 50.; // default value m_configuration.fix_count_by_ratio(m_volume->mesh().its.indices.size());
m_configuration.update_percent(tm.its.indices.size());
m_is_valid_result = false; m_is_valid_result = false;
m_exist_preview = false;
if (change_window_position) { if (change_window_position) {
ImVec2 pos = ImGui::GetMousePos(); ImVec2 pos = ImGui::GetMousePos();
pos.x -= m_gui_cfg->window_offset; pos.x -= m_gui_cfg->window_offset_x;
pos.y -= m_gui_cfg->window_offset; pos.y -= m_gui_cfg->window_offset_y;
// minimal top left value // minimal top left value
ImVec2 tl(m_gui_cfg->window_padding, m_gui_cfg->window_padding); ImVec2 tl(m_gui_cfg->window_padding, m_gui_cfg->window_padding);
if (pos.x < tl.x) pos.x = tl.x; if (pos.x < tl.x) pos.x = tl.x;
@ -81,8 +86,8 @@ void GLGizmoSimplify::on_render_input_window(float x, float y, float bottom_limi
// maximal bottom right value // maximal bottom right value
auto parent_size = m_parent.get_canvas_size(); auto parent_size = m_parent.get_canvas_size();
ImVec2 br( ImVec2 br(
parent_size.get_width() - (2 * m_gui_cfg->window_offset + m_gui_cfg->window_padding), parent_size.get_width() - (2 * m_gui_cfg->window_offset_x + m_gui_cfg->window_padding),
parent_size.get_height() - (2 * m_gui_cfg->window_offset + m_gui_cfg->window_padding)); parent_size.get_height() - (2 * m_gui_cfg->window_offset_y + m_gui_cfg->window_padding));
if (pos.x > br.x) pos.x = br.x; if (pos.x > br.x) pos.x = br.x;
if (pos.y > br.y) pos.y = br.y; if (pos.y > br.y) pos.y = br.y;
ImGui::SetNextWindowPos(pos, ImGuiCond_Always); ImGui::SetNextWindowPos(pos, ImGuiCond_Always);
@ -98,15 +103,23 @@ void GLGizmoSimplify::on_render_input_window(float x, float y, float bottom_limi
if (m_original_its.has_value()) if (m_original_its.has_value())
triangle_count = m_original_its->indices.size(); triangle_count = m_original_its->indices.size();
m_imgui->text_colored(ImGuiWrapper::COL_ORANGE_LIGHT, _L("Mesh name") + ":"); m_imgui->text_colored(ImGuiWrapper::COL_ORANGE_LIGHT, tr_mesh_name + ":");
ImGui::SameLine(m_gui_cfg->top_left_width); ImGui::SameLine(m_gui_cfg->top_left_width);
std::string name = m_volume->name; std::string name = m_volume->name;
if (name.length() > max_char_in_name) if (name.length() > m_gui_cfg->max_char_in_name)
name = name.substr(0, max_char_in_name-3) + "..."; name = name.substr(0, m_gui_cfg->max_char_in_name - 3) + "...";
m_imgui->text(name); m_imgui->text(name);
m_imgui->text_colored(ImGuiWrapper::COL_ORANGE_LIGHT, _L("Triangles") + ":"); m_imgui->text_colored(ImGuiWrapper::COL_ORANGE_LIGHT, tr_triangles + ":");
ImGui::SameLine(m_gui_cfg->top_left_width); ImGui::SameLine(m_gui_cfg->top_left_width);
m_imgui->text(std::to_string(triangle_count)); m_imgui->text(std::to_string(triangle_count));
/*
m_imgui->text_colored(ImGuiWrapper::COL_ORANGE_LIGHT, tr_preview + ":");
ImGui::SameLine(m_gui_cfg->top_left_width);
if (m_exist_preview) {
m_imgui->text(std::to_string(m_volume->mesh().its.indices.size()));
} else {
m_imgui->text("---");
}*/
ImGui::Separator(); ImGui::Separator();
@ -116,7 +129,7 @@ void GLGizmoSimplify::on_render_input_window(float x, float y, float bottom_limi
} }
ImGui::SameLine(); ImGui::SameLine();
m_imgui->disabled_begin(m_configuration.use_count); m_imgui->disabled_begin(m_configuration.use_count);
ImGui::Text(_L("Detail level").c_str()); ImGui::Text(tr_detail_level.c_str());
std::vector<std::string> reduce_captions = { std::vector<std::string> reduce_captions = {
static_cast<std::string>(_u8L("Extra high")), static_cast<std::string>(_u8L("Extra high")),
static_cast<std::string>(_u8L("High")), static_cast<std::string>(_u8L("High")),
@ -150,22 +163,23 @@ void GLGizmoSimplify::on_render_input_window(float x, float y, float bottom_limi
// show preview result triangle count (percent) // show preview result triangle count (percent)
if (m_need_reload && !m_configuration.use_count) { if (m_need_reload && !m_configuration.use_count) {
m_configuration.wanted_count = static_cast<uint32_t>(m_volume->mesh().its.indices.size()); m_configuration.wanted_count = static_cast<uint32_t>(m_volume->mesh().its.indices.size());
m_configuration.update_count(triangle_count); m_configuration.decimate_ratio =
(1.0f - (m_configuration.wanted_count / (float) triangle_count)) * 100.f;
} }
m_imgui->disabled_begin(!m_configuration.use_count); m_imgui->disabled_begin(!m_configuration.use_count);
ImGui::Text(_L("Ratio").c_str()); ImGui::Text(tr_decimate_ratio.c_str());
ImGui::SameLine(m_gui_cfg->bottom_left_width); ImGui::SameLine(m_gui_cfg->bottom_left_width);
ImGui::SetNextItemWidth(m_gui_cfg->input_width); ImGui::SetNextItemWidth(m_gui_cfg->input_width);
const char * format = (m_configuration.wanted_percent > 10)? "%.0f %%": const char * format = (m_configuration.decimate_ratio > 10)? "%.0f %%":
((m_configuration.wanted_percent > 1)? "%.1f %%":"%.2f %%"); ((m_configuration.decimate_ratio > 1)? "%.1f %%":"%.2f %%");
if (ImGui::SliderFloat("##triangle_ratio", &m_configuration.wanted_percent, 0.f, 100.f, format)) { if (ImGui::SliderFloat("##decimate_ratio", &m_configuration.decimate_ratio, 0.f, 100.f, format)) {
m_is_valid_result = false; m_is_valid_result = false;
if (m_configuration.wanted_percent < 0.f) if (m_configuration.decimate_ratio < 0.f)
m_configuration.wanted_percent = 0.01f; m_configuration.decimate_ratio = 0.01f;
if (m_configuration.wanted_percent > 100.f) if (m_configuration.decimate_ratio > 100.f)
m_configuration.wanted_percent = 100.f; m_configuration.decimate_ratio = 100.f;
m_configuration.update_percent(triangle_count); m_configuration.fix_count_by_ratio(triangle_count);
} }
ImGui::NewLine(); ImGui::NewLine();
@ -195,7 +209,7 @@ void GLGizmoSimplify::on_render_input_window(float x, float y, float bottom_limi
process(); process();
} else { } else {
// use preview and close // use preview and close
if (m_original_its.has_value()) { if (m_exist_preview) {
// fix hollowing, sla support points, modifiers, ... // fix hollowing, sla support points, modifiers, ...
auto plater = wxGetApp().plater(); auto plater = wxGetApp().plater();
plater->changed_mesh(m_obj_index); plater->changed_mesh(m_obj_index);
@ -286,6 +300,7 @@ void GLGizmoSimplify::process()
its_quadric_edge_collapse(collapsed, triangle_count, &max_error, throw_on_cancel, statusfn); its_quadric_edge_collapse(collapsed, triangle_count, &max_error, throw_on_cancel, statusfn);
set_its(collapsed); set_its(collapsed);
m_is_valid_result = true; m_is_valid_result = true;
m_exist_preview = true;
} catch (SimplifyCanceledException &) { } catch (SimplifyCanceledException &) {
// set state out of main thread // set state out of main thread
m_state = State::settings; m_state = State::settings;
@ -326,7 +341,7 @@ void GLGizmoSimplify::on_set_state()
} }
// revert preview // revert preview
if (m_original_its.has_value()) { if (m_exist_preview) {
set_its(*m_original_its); set_its(*m_original_its);
m_parent.reload_scene(true); m_parent.reload_scene(true);
m_need_reload = false; m_need_reload = false;
@ -344,18 +359,19 @@ void GLGizmoSimplify::create_gui_cfg() {
if (m_gui_cfg.has_value()) return; if (m_gui_cfg.has_value()) return;
int space_size = m_imgui->calc_text_size(":MM").x; int space_size = m_imgui->calc_text_size(":MM").x;
GuiCfg cfg; GuiCfg cfg;
cfg.top_left_width = std::max(m_imgui->calc_text_size(_L("Mesh name")).x, cfg.top_left_width = std::max(m_imgui->calc_text_size(tr_mesh_name).x,
m_imgui->calc_text_size(_L("Triangles")).x) m_imgui->calc_text_size(tr_triangles).x)
+ space_size; + space_size;
const float radio_size = ImGui::GetFrameHeight(); const float radio_size = ImGui::GetFrameHeight();
cfg.bottom_left_width = cfg.bottom_left_width =
std::max(m_imgui->calc_text_size(_L("Detail level")).x, std::max(m_imgui->calc_text_size(tr_detail_level).x,
m_imgui->calc_text_size(_L("Ratio")).x) + m_imgui->calc_text_size(tr_decimate_ratio).x) +
space_size + radio_size; space_size + radio_size;
cfg.input_width = cfg.bottom_left_width; cfg.input_width = cfg.bottom_left_width * 1.5;
cfg.window_offset = cfg.input_width; cfg.window_offset_x = (cfg.bottom_left_width + cfg.input_width)/2;
cfg.window_offset_y = ImGui::GetTextLineHeightWithSpacing() * 5;
m_gui_cfg = cfg; m_gui_cfg = cfg;
} }

27
src/slic3r/GUI/Gizmos/GLGizmoSimplify.hpp
View file

@ -37,7 +37,9 @@ private:
void create_gui_cfg(); void create_gui_cfg();
void request_rerender(); void request_rerender();
bool m_is_valid_result; // differ what to do in apply std::atomic_bool m_is_valid_result; // differ what to do in apply
std::atomic_bool m_exist_preview; // set when process end
volatile int m_progress; // percent of done work volatile int m_progress; // percent of done work
ModelVolume *m_volume; // ModelVolume *m_volume; //
size_t m_obj_index; size_t m_obj_index;
@ -59,20 +61,16 @@ private:
{ {
bool use_count = false; bool use_count = false;
// minimal triangle count // minimal triangle count
float wanted_percent = 50.f; float decimate_ratio = 50.f; // in percent
uint32_t wanted_count = 0; // initialize by percents uint32_t wanted_count = 0; // initialize by percents
// maximal quadric error // maximal quadric error
float max_error = 1.; float max_error = 1.;
void update_count(size_t triangle_count) void fix_count_by_ratio(size_t triangle_count)
{
wanted_percent = (float) wanted_count / triangle_count * 100.f;
}
void update_percent(size_t triangle_count)
{ {
wanted_count = static_cast<uint32_t>( wanted_count = static_cast<uint32_t>(
std::round(triangle_count * wanted_percent / 100.f)); std::round(triangle_count * (100.f-decimate_ratio) / 100.f));
} }
} m_configuration; } m_configuration;
@ -84,10 +82,21 @@ private:
int top_left_width = 100; int top_left_width = 100;
int bottom_left_width = 100; int bottom_left_width = 100;
int input_width = 100; int input_width = 100;
int window_offset = 100; int window_offset_x = 100;
int window_offset_y = 100;
int window_padding = 0; int window_padding = 0;
// trunc model name when longer
int max_char_in_name = 30;
}; };
std::optional<GuiCfg> m_gui_cfg; std::optional<GuiCfg> m_gui_cfg;
// translations used for calc window size
const std::string tr_mesh_name;
const std::string tr_triangles;
const std::string tr_preview;
const std::string tr_detail_level;
const std::string tr_decimate_ratio;
}; };
} // namespace GUI } // namespace GUI