Merge remote-tracking branch 'origin/feature/4311_mantidplot_python_c…

…ompletion'
mantidproject · Oct 25, 2013 · 5c74762 · 5c74762
2 parents ad73031 + 856d3ad
commit 5c74762
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/Code/Mantid/MantidPlot/CMakeLists.txt b/Code/Mantid/MantidPlot/CMakeLists.txt
@@ -518,7 +518,7 @@ set( SRC_UNITY_IGNORE_FILES )
 add_custom_command ( OUTPUT ${SIP_SRC_AUTO}
                      COMMAND ${SIP_EXECUTABLE}
                           -I ${PYQT4_SIP_DIR} -I ${CMAKE_CURRENT_SOURCE_DIR}/../MantidQt/Python ${PYQT4_SIP_FLAGS}
-                          -c ${CMAKE_CURRENT_BINARY_DIR} -j1 -w 
+                          -c ${CMAKE_CURRENT_BINARY_DIR} -j1 -w -o
                           ${SIP_SPEC}
                      DEPENDS src/qti.sip ${SIP_HDRS}
                      COMMENT "Generating python bindings using sip"

diff --git a/Code/Mantid/MantidPlot/mantidplotpy/proxies.py b/Code/Mantid/MantidPlot/mantidplotpy/proxies.py
@@ -29,6 +29,7 @@ def __init__(self, callable):
         QtCore.QObject.__init__(self)
         self.moveToThread(QtGui.qApp.thread())
         self.__callable = callable
+        self.__call__.__func__.__doc__ = callable.__doc__
 
     def dispatch(self, *args, **kwargs):
         """Dispatches a call to callable with
@@ -163,6 +164,9 @@ def __getattr__(self, attr):
         callable = getattr(self._getHeldObject(), attr)
         return CrossThreadCall(callable)
 
+    def __dir__(self):
+        return dir(self._getHeldObject())
+
     def __str__(self):
         """
         Return a string representation of the proxied object