diff options
| author | bubnikv <bubnikv@gmail.com> | 2020-04-28 19:00:42 +0300 |
|---|---|---|
| committer | bubnikv <bubnikv@gmail.com> | 2020-04-28 19:00:42 +0300 |
| commit | b8e02a54056dce138d17f7cc8449f3d8f88f6b5a (patch) | |
| tree | 34b121e92841f7722842e8c7917f08e4616907fe /src | |
| parent | ec81de75532fe45f880eb95ad2393cca1555101b (diff) | |
Fixed handling of fill_pattern field if not all patterns are allowed
for the internal infill.
Diffstat (limited to 'src')
| -rw-r--r-- | src/slic3r/GUI/Field.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/slic3r/GUI/Field.cpp b/src/slic3r/GUI/Field.cpp index 12699c37f..186444f66 100644 --- a/src/slic3r/GUI/Field.cpp +++ b/src/slic3r/GUI/Field.cpp @@ -943,7 +943,7 @@ void Choice::set_value(const boost::any& value, bool change_event) } case coEnum: { int val = boost::any_cast<int>(value); - if (m_opt_id == "top_fill_pattern" || m_opt_id == "bottom_fill_pattern") + if (m_opt_id == "top_fill_pattern" || m_opt_id == "bottom_fill_pattern" || m_opt_id == "fill_pattern") { if (!m_opt.enum_values.empty()) { std::string key; @@ -1013,7 +1013,7 @@ boost::any& Choice::get_value() if (m_opt.type == coEnum) { int ret_enum = field->GetSelection(); - if (m_opt_id == "top_fill_pattern" || m_opt_id == "bottom_fill_pattern") + if (m_opt_id == "top_fill_pattern" || m_opt_id == "bottom_fill_pattern" || m_opt_id == "fill_pattern") { if (!m_opt.enum_values.empty()) { std::string key = m_opt.enum_values[ret_enum]; @@ -1025,8 +1025,6 @@ boost::any& Choice::get_value() else m_value = static_cast<InfillPattern>(0); } - if (m_opt_id.compare("fill_pattern") == 0) - m_value = static_cast<InfillPattern>(ret_enum); else if (m_opt_id.compare("ironing_type") == 0) m_value = static_cast<IroningType>(ret_enum); else if (m_opt_id.compare("gcode_flavor") == 0) |