Fix #1149 by handling "d" and "(dd)" types separately

[pulseview.git] / pv / prop / enum.cpp

diff --git a/pv/prop/enum.cpp b/pv/prop/enum.cpp
index 473e3d5f1a3ad36582a3d5c770d4793f607b6124..1f542b74a73d6da49552a08236903ce9dad1b3fe 100644 (file)
--- a/pv/prop/enum.cpp
+++ b/pv/prop/enum.cpp
@@ -14,32 +14,30 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <assert.h>
+#include <cassert>
+#include <cfloat>
+#include <cmath>
 
 #include <QComboBox>
 
-#include "enum.h"
+#include "enum.hpp"
 
+using std::abs;
 using std::pair;
 using std::vector;
 
 namespace pv {
 namespace prop {
 
-Enum::Enum(QString name,
+Enum::Enum(QString name, QString desc,
        vector<pair<Glib::VariantBase, QString> > values,
        Getter getter, Setter setter) :
-       Property(name, getter, setter),
+       Property(name, desc, getter, setter),
        values_(values),
-       selector_(NULL)
-{
-}
-
-Enum::~Enum()
+       selector_(nullptr)
 {
 }
 
@@ -49,20 +47,20 @@ QWidget* Enum::get_widget(QWidget *parent, bool auto_commit)
                return selector_;
 
        if (!getter_)
-               return NULL;
+               return nullptr;
 
        Glib::VariantBase variant = getter_();
        if (!variant.gobj())
-               return NULL;
+               return nullptr;
 
        selector_ = new QComboBox(parent);
        for (unsigned int i = 0; i < values_.size(); i++) {
                const pair<Glib::VariantBase, QString> &v = values_[i];
                selector_->addItem(v.second, qVariantFromValue(v.first));
-               if (v.first.equal(variant))
-                       selector_->setCurrentIndex(i);
        }
 
+       update_widget();
+
        if (auto_commit)
                connect(selector_, SIGNAL(currentIndexChanged(int)),
                        this, SLOT(on_current_item_changed(int)));
@@ -70,6 +68,42 @@ QWidget* Enum::get_widget(QWidget *parent, bool auto_commit)
        return selector_;
 }
 
+void Enum::update_widget()
+{
+       if (!selector_)
+               return;
+
+       Glib::VariantBase variant = getter_();
+       assert(variant.gobj());
+
+       for (unsigned int i = 0; i < values_.size(); i++) {
+               const pair<Glib::VariantBase, QString> &v = values_[i];
+
+               // g_variant_equal() doesn't handle floating point properly
+               if (v.first.is_of_type(Glib::VariantType("d"))) {
+                       gdouble a, b;
+                       g_variant_get(variant.gobj(), "d", &a);
+                       g_variant_get((GVariant*)(v.first.gobj()), "d", &b);
+                       if (abs(a - b) <= 2 * DBL_EPSILON)
+                               selector_->setCurrentIndex(i);
+               } else {
+                       // Check for "(dd)" type and handle it if it's found
+                       if (v.first.is_of_type(Glib::VariantType("(dd)"))) {
+                               gdouble a1, a2, b1, b2;
+                               g_variant_get(variant.gobj(), "(dd)", &a1, &a2);
+                               g_variant_get((GVariant*)(v.first.gobj()), "(dd)", &b1, &b2);
+                               if ((abs(a1 - b1) <= 2 * DBL_EPSILON) && \
+                                       (abs(a2 - b2) <= 2 * DBL_EPSILON))
+                                       selector_->setCurrentIndex(i);
+
+                       } else
+                               // Handle all other types
+                               if (v.first.equal(variant))
+                                       selector_->setCurrentIndex(i);
+               }
+       }
+}
+
 void Enum::commit()
 {
        assert(setter_);
@@ -89,5 +123,5 @@ void Enum::on_current_item_changed(int)
        commit();
 }
 
-} // prop
-} // pv
+}  // namespace prop
+}  // namespace pv