Refs #4399. Switch from long->int until Max fix is working.

mantidproject · Mar 5, 2012 · 92c0134 · 92c0134
1 parent 25280b4
commit 92c0134
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/...tid/Framework/PythonInterface/mantid/api/src/PythonAlgorithm/PropertyWithValueFactory.cpp b/...tid/Framework/PythonInterface/mantid/api/src/PythonAlgorithm/PropertyWithValueFactory.cpp
@@ -26,7 +26,7 @@ namespace Mantid
 
         // Map the Python types to the best match in C++
         REGISTER_MAPPING(PyFloat_Type, double);
-        REGISTER_MAPPING(PyInt_Type, long);
+        REGISTER_MAPPING(PyInt_Type, int);
         REGISTER_MAPPING(PyString_Type, std::string);
       }
 

diff --git a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/BoundedValidator.cpp b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/BoundedValidator.cpp
@@ -29,6 +29,7 @@ namespace
 void export_BoundedValidator()
 {
   EXPORT_BOUNDEDVALIDATOR(double);
+  EXPORT_BOUNDEDVALIDATOR(int);
   EXPORT_BOUNDEDVALIDATOR(long);
 }
 
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/IValidator.cpp b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/IValidator.cpp
@@ -17,6 +17,7 @@ namespace
 void export_IValidators()
 {
   EXPORT_IVALIDATOR(double,double);
+  EXPORT_IVALIDATOR(int,int);
   EXPORT_IVALIDATOR(long,long);
   EXPORT_IVALIDATOR(std::string,std_string);
 }

diff --git a/Code/Mantid/Framework/PythonInterface/mantid/kernel/validators.py b/Code/Mantid/Framework/PythonInterface/mantid/kernel/validators.py
@@ -16,11 +16,13 @@ def BoundedValidator(lower = None, upper = None):
         raise TypeError("Cannot create a BoundedValidator with both lower and upper limit unset.")
 
     def get_validator_class(value):
-        from mantid.kernel import BoundedValidator_double, BoundedValidator_long
+        from mantid.kernel import BoundedValidator_double, BoundedValidator_int
         if type(value) == float:
+            from mantid.kernel import BoundedValidator_double
             return BoundedValidator_double
         elif type(value) == int:
-            return BoundedValidator_long
+            from mantid.kernel import BoundedValidator_int
+            return BoundedValidator_int
         else:
             raise TypeError("Unknown type passed for BoundedValidator: %s" % str(type(value)))
     #