GIT_REPOSITORIES/LPP/PythonQt Commit - r183:45f94c8a18d4

merged from MeVisLab: fixed wrong reuse of C++ wrappers, added unicode print support to sys.stdout redirection...

florianlink -

r183:45f94c8a18d4

parent child

Context file:

r183:45f94c8a18d4

Collapse all files

src/PythonQt.cpp +23 -1

                 return Py_None;
               }
               PythonQtInstanceWrapper* wrap = findWrapperAndRemoveUnused(obj);
+              if (wrap && wrap->_wrappedPtr) {
+                // uh oh, we want to wrap a QObject, but have a C++ wrapper at that
+                // address, so probably that C++ wrapper has been deleted earlier and
+                // now we see a QObject with the same address.
+                // Do not use the old wrapper anymore.
+                wrap = NULL;
+              }
               if (!wrap) {
                 // smuggling it in...
                 PythonQtClassInfo* classInfo = _knownClassInfos.value(obj->metaObject()->className());
               }
               PythonQtInstanceWrapper* wrap = findWrapperAndRemoveUnused(ptr);
+              PythonQtInstanceWrapper* possibleStillAliveWrapper = NULL;
+              if (wrap && wrap->_wrappedPtr) {
+                // we have a previous C++ wrapper... if the wrapper is for a C++ object,
+                // we are not sure if it may have been deleted earlier and we just see the same C++
+                // pointer once again. To make sure that we do not reuse a wrapper of the wrong type,
+                // we compare the classInfo() pointer and only reuse the wrapper if it has the same
+                // info. This is only needed for non-QObjects, since we know it when a QObject gets deleted.
+                possibleStillAliveWrapper = wrap;
+                wrap = NULL;
+              }
               if (!wrap) {
                 PythonQtClassInfo* info = _knownClassInfos.value(name);
                 if (!info) {
                     return p;
                   }
-                  // we do not know the metaobject yet, but we might know it by it's name:
+                  // we do not know the metaobject yet, but we might know it by its name:
                   if (_knownQObjectClassNames.find(name)!=_knownQObjectClassNames.end()) {
                     // yes, we know it, so we can convert to QObject
                     QObject* qptr = (QObject*)ptr;
                   info->setMetaObject(wrapper->metaObject());
                 }
+                if (possibleStillAliveWrapper && possibleStillAliveWrapper->classInfo() == info) {
+                  wrap = possibleStillAliveWrapper;
+                  Py_INCREF(wrap);
+                } else {
                   wrap = createNewPythonQtInstanceWrapper(wrapper, info, ptr);
+                }
                 //          mlabDebugConst("MLABPython","new c++ wrapper added " << wrap->_wrappedPtr << " " << wrap->_obj->className() << " " << wrap->classInfo()->wrappedClassName().latin1());
               } else {
                 Py_INCREF(wrap);

src/PythonQtStdOut.cpp +18 -2

             {
               PythonQtStdOutRedirect*  s = (PythonQtStdOutRedirect*)self;
               if (s->_cb) {
+                QString output;
+                if (PyTuple_GET_SIZE(args)>=1) {
+                  PyObject* obj = PyTuple_GET_ITEM(args,0);
+                  if (PyUnicode_Check(obj)) {
+                    PyObject *tmp = PyUnicode_AsUTF8String(obj);
+                    if(tmp) {
+                      output = QString::fromUtf8(PyString_AS_STRING(tmp));
+                      Py_DECREF(tmp);
+                    } else {
+                      return NULL;
+                    }
+                  } else {
                     char *string;
-                if (!PyArg_ParseTuple(args, "s", &string))
+                    if (!PyArg_ParseTuple(args, "s", &string)) {
                       return NULL;
+                    }
+                    output = QString::fromLatin1(string);
+                  }
+                }
                 if (s->softspace > 0) {
                   (*s->_cb)(QString(""));
                   s->softspace = 0;
                 }
-                (*s->_cb)(QString(string));
+                (*s->_cb)(output);
               }
               return Py_BuildValue("");
             }

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages