From bafa4d6d1909c3e9541b349129e6929ee962368b Mon Sep 17 00:00:00 2001 From: tamasmeszaros <meszaros.q@gmail.com> Date: Tue, 20 Aug 2019 16:00:26 +0200 Subject: [PATCH] Follow up: Adding new sla material parameters... Small fix for redundant operations. --- src/slic3r/GUI/Tab.cpp | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp index 188bb50cf..030165337 100644 --- a/src/slic3r/GUI/Tab.cpp +++ b/src/slic3r/GUI/Tab.cpp @@ -3699,16 +3699,17 @@ void bound_check(Tab &tb, e_cmp cmp, const char *id, const char *boundid) double ddiff = value - bound; int diff = ddiff < 0 ? SMALLER : (std::abs(ddiff) < EPSILON ? EQUAL : GREATER); - wxString fmt; - switch (cmp) { - case EQUAL: fmt = _(L("%s should be equal to %s")); break; - case SMALLER: fmt = _(L("%s should be smaller than %s")); break; - case GREATER: fmt = _(L("%s should be greater than %s")); break; - case SMALLER_EQ: fmt = _(L("%s should be smaller or equal to %s")); break; - case GREATER_EQ: fmt = _(L("%s should be greater or equal to %s")); break; - } - if ((cmp | diff) != cmp) { + wxString fmt; + + switch (cmp) { + case EQUAL: fmt = _(L("%s should be equal to %s")); break; + case SMALLER: fmt = _(L("%s should be smaller than %s")); break; + case GREATER: fmt = _(L("%s should be greater than %s")); break; + case SMALLER_EQ: fmt = _(L("%s should be smaller or equal to %s")); break; + case GREATER_EQ: fmt = _(L("%s should be greater or equal to %s")); break; + } + wxString msg_text = wxString::Format(fmt, valuelabel, boundlabel); wxMessageDialog dialog(tb.parent(), msg_text,