Commit 94493332 authored by David Gobbi's avatar David Gobbi
Browse files

COMP: Fix python wrapping of GUISupport/Qt classes in release.

A modification to GUISupport/Qt/CMakeLists.txt in commit 7aaf1d8e,
meant to enhance the wrapping QVTKInteractor, had some serious side
effects on the wrapping in this directory.  These were undetected
because this directory is only wrapped if VTK_WRAP_PYTHON_SIP is ON.
This commit reverts the changes of commit 7aaf1d8e and instead fixes
the QVTKInteractor issue by hard-coding its name into vtkWrapPython.c.
After this is merged, the hard-coded class name will be removed from
vtkWrapPython.c in the master branch.

Change-Id: I1dd2f6227997e9df62710e76459361de4c7b2459
parent 90764ae6
......@@ -227,12 +227,6 @@ if(VTK_WRAP_PYTHON_SIP)
)
ENDIF(VTK_USE_VIEWS AND VTK_QT_USE_WEBKIT)
# GUISupport/Qt doesn't have a hierarchy file, use Rendering
IF(VTK_IGNORE_BTX)
SET(KIT_HIERARCHY_FILE
${VTK_BINARY_DIR}/Rendering/vtkRenderingHierarchy.txt)
ENDIF(VTK_IGNORE_BTX)
VTK_WRAP_PYTHON3(vtkQtPython QVTK_PythonSrcs "${QVTK_PythonHeaders}")
VTK_ADD_LIBRARY(vtkQtPythonD ${QVTK_PythonSrcs})
TARGET_LINK_LIBRARIES(vtkQtPythonD QVTK)
......
......@@ -222,7 +222,11 @@ const char *vtkWrapPython_GetSuperClass(
vtkParse_FreeTemplateDecomposition(name, 2, args);
}
if (vtkWrap_IsVTKObjectBaseType(hinfo, data->Name))
// Add QVTKInteractor as the sole exception: It is derived
// from vtkObject but does not start with "vtk". Given its
// name, it would be expected to be derived from QObject.
if (vtkWrap_IsVTKObjectBaseType(hinfo, data->Name) ||
strcmp(data->Name, "QVTKInteractor") == 0)
{
if (vtkWrap_IsClassWrapped(hinfo, supername) &&
vtkWrap_IsVTKObjectBaseType(hinfo, supername))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment