+ support comparison with double in quantity number protocol

FreeCAD · Jul 14, 2014 · 8aec46f · 8aec46f
1 parent 1fd7bd9
commit 8aec46f
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 3 deletions.
diff --git a/src/App/Application.cpp b/src/App/Application.cpp
@@ -237,6 +237,8 @@ Application::Application(ParameterManager * /*pcSysParamMngr*/,
     PyObject* pUnitsModule = Py_InitModule3("Units", Base::UnitsApi::Methods,
           "The Unit API");
     Base::Interpreter().addType(&Base::QuantityPy  ::Type,pUnitsModule,"Quantity");
+    // make sure to set the 'nb_true_divide' slot
+    Base::QuantityPy::Type.tp_as_number->nb_true_divide = Base::QuantityPy::Type.tp_as_number->nb_divide;
     Base::Interpreter().addType(&Base::UnitPy      ::Type,pUnitsModule,"Unit");
 
     Py_INCREF(pUnitsModule);

diff --git a/src/Base/QuantityPyImp.cpp b/src/Base/QuantityPyImp.cpp
@@ -466,13 +466,47 @@ PyObject* QuantityPy::richCompare(PyObject *v, PyObject *w, int op)
             Py_INCREF(res);
             return res;
         }
-
     }
-
+    else if (PyNumber_Check(v) && PyNumber_Check(w)) {
+        // Try to get floating numbers
+        double u1 = PyFloat_AsDouble(v);
+        double u2 = PyFloat_AsDouble(w);
+        PyObject *res=0;
+        if (op == Py_NE) {
+            res = (u1 != u2) ? Py_True : Py_False;
+            Py_INCREF(res);
+            return res;
+        }
+        else if (op == Py_LT) {
+            res = (u1 < u2) ? Py_True : Py_False;
+            Py_INCREF(res);
+            return res;
+        }
+        else if (op == Py_LE) {
+            res = (u1 <= u2) ? Py_True : Py_False;
+            Py_INCREF(res);
+            return res;
+        }
+        else if (op == Py_GT) {
+            res = (u1 > u2) ? Py_True : Py_False;
+            Py_INCREF(res);
+            return res;
+        }
+        else if (op == Py_GE) {
+            res = (u1 >= u2) ? Py_True : Py_False;
+            Py_INCREF(res);
+            return res;
+        }
+        else if (op == Py_EQ) {
+            res = (u1 == u2) ? Py_True : Py_False;
+            Py_INCREF(res);
+            return res;
+        }
+    }
+
     // This always returns False
     Py_INCREF(Py_NotImplemented);
     return Py_NotImplemented;
-
 }
 
 Py::Float QuantityPy::getValue(void) const