GIT_REPOSITORIES/LPP/PythonQt Commit - r6:569bd3d658ae

Documentation updates only. No changes to code....

ezust -

r6:569bd3d658ae

parent child

Context file:

r6:569bd3d658ae

Collapse all files

CHANGELOG.txt +1 -1

             - merged in features/fixes from the MeVisLab repository:
             - added createModuleFromFile/createModuleFromScript/createUniqueModule
             - switched object destruction to use QPointer and lazy wrapper removal to avoid expensive objectDestroyed signal connections
-            - added hash() support for PythnQtWrapper object
+            - added hash() support for PythonQtWrapper object
             - added support for signal to python function connections where the function has less arguments than the emitted signal
             - added setQObject[NoLonger]WrappedCallback API to support external reference counting on QObjects that are exposed to PythonQt
             - implemented flush on std redirect to support python logging framework

examples/CPPPyWrapperExample/CPPPyWrapperExample.cpp +2 -1

                 {
                   // evaluate a python file embedded in executable as resource:
                   mainModule.evalFile(":eyed3tagger.py");
+                  // create an object, hold onto its reference
                   PythonQtObjectPtr tag = mainModule.evalScript("EyeD3Tagger()\n", Py_eval_input);
                   Q_ASSERT(!tag.isNull());
                   tag.call("setFileName", QVariantList() << "t.mp3");
                   QVariant fn = tag.call("fileName", QVariantList());
                   Q_ASSERT(fn.toString() == QString("t.mp3"));
+                  // tag goes out of scope, reference count decremented.
                 }
                 qDebug() << "test1";
                 { // alternative using import and loading it as a real module from sys.path
                   mainModule.evalScript(QString("import sys\n"));
                   // append the current directory to the sys.path
                   mainModule.evalScript(QString("sys.path.append('%1')\n").arg(QDir::currentPath()));
                   mainModule.evalScript("import eyed3tagger\n");
                   PythonQtObjectPtr tag = mainModule.evalScript("eyed3tagger.EyeD3Tagger()\n", Py_eval_input);
                   Q_ASSERT(!tag.isNull());

examples/CPPPyWrapperExample/README.txt +3 -5

@@ -1,9 +1,7
1	~~It also~~ shows how to add user defined Python classes ~~to the~~	1	This example shows how to add user defined Python classes
2	embedded Python mainModule.	2	to the embedded Python mainModule.
		3
3	It also shows how to create objects in Python,	4	It also shows how to create objects in Python,
4	hold onto reference counted smart pointers to them from	5	hold onto reference counted smart pointers to them from
5	a Qt application, and invoke methods on them via	6	a Qt application, and invoke methods on them via
6	the PythonQtObjectPtr interface.	7	the PythonQtObjectPtr interface.
7
8
9

examples/PyGettingStarted/GettingStarted.py +1 0

@@ -24,3 +24,4 box.edit.connect('returnPressed()', appendLine)
24		24
25	# show the window	25	# show the window
26	box.show()	26	box.show()
		27

examples/PyGettingStarted/main.cpp +11 0

               // evaluate a simple python script and receive the result a qvariant:
               QVariant result = mainModule.evalScript("19*2+4", Py_eval_input);
+              // Create object from python, hold onto reference in C++:
+              PythonQtObjectPtr tag = mainModule.evalScript("EyeD3Tagger()\n", Py_eval_input);
+              Q_ASSERT(!tag.isNull());
+              // call python methods from C++
+              tag.call("setFileName", QVariantList() << "t.mp3");
+              QVariant fn = tag.call("fileName", QVariantList());
+              Q_ASSERT(fn.toString() == QString("t.mp3"));
               // create a small Qt GUI
               QVBoxLayout*  vbox = new QVBoxLayout;
               QGroupBox*    box  = new QGroupBox;
               // shows how to call the method with a text that will be append to the browser
               mainModule.call("appendText", QVariantList() << "The ultimate answer is ");
               return qapp.exec();
             }

src/PythonQtDoc.h +14 -10

              \section Introduction
              \b PythonQt is a dynamic Python (http://www.python.org) binding for Qt (http://www.trolltech.com).
-             It offers an easy way to embedd the Python scripting language into
+             It offers an easy way to embed the Python scripting language into
              your Qt applications. It makes heavy use of the QMetaObject system and thus requires Qt4.x.
              In contrast to <a href="http://www.riverbankcomputing.co.uk/pyqt/">PyQt</a> , PythonQt is \b not a complete
              Python wrapper around the complete Qt functionality. So if you are looking for a way to
              write complete applications in Python using the Qt GUI, you should use PyQt.
-             If you are looking for a simple way to embed the Python language into your Qt Application
+             If you are looking for a simple way to embed Python objects into your C++/Qt Application
              and to script parts of your application via Python, PythonQt is the way to go!
-             PythonQt is a stable library that was developed to make the Image Processing and Visualization platform MeVisLab (http://www.mevislab.de)
+             PythonQt is a stable library that was developed to make the
+             Image Processing and Visualization platform MeVisLab (http://www.mevislab.de)
              scriptable from Python.
              \section Licensing
              \section Features
+             - Easy wrapping of Python objects from C++ with smart, reference-counting PythonQtObjectPtr.
+             - Convenient conversions to/from QVariant for PythonQtObjectPtr.
              - Access all \b slots, \b properties, children and registered enums of any QObject derived class from Python
              - Connecting Qt Signals to Python functions (both from within Python and from C++)
-             - Wrapping of C++ objects (which are not derived from QObject) via PythonQtCPPWrapperFactory
+             - Wrapping of C++ objects (which are not derived from QObject) via PythonQtCppWrapperFactory
              - Extending C++ and QObject derived classes with additional slots, static methods and constructors (see Decorators)
              - StdOut/Err redirection to Qt signals instead of cout
-             - Interface for creating your own \c import replacement, so that Python scripts can be e.g. signed/verified before they are executed (PythonQtImportInterface)
+             - Interface for creating your own \c import replacement, so that Python scripts can be e.g. signed/verified before they are executed (PythonQtImportFileInterface)
              - Mapping of plain-old-datatypes and ALL QVariant types to and from Python
              - Support for wrapping of user QVariant types which are registerd via QMetaType
              - Support for Qt namespace (with all enumerators)
              Features that PythonQt does NOT support (and will not support):
              - you can not derive from QObjects inside of Python, this would require wrapper generation like PyQt does
-             - you can only script QObject derived classes, for normal C++ classes you need to create a PythonQtCPPWrapperFactory and adequate wrapper classes or add decorator slots
+             - you can only script QObject derived classes, for normal C++ classes you need to create a PythonQtCppWrapperFactory and adequate wrapper classes or add decorator slots
              - you can not access normal member functions of QObjects, only slots and properties, because the \b moc does not store normal member functions in the MetaObject system
              \section Interface
               <tr><td>OwnRegisteredMetaType</td><td>variant wrapper, optionally with a wrapper provided by addVariantWrapper()</td></tr>
               <tr><td>EnumType</td><td>integer (all enums that are known via the moc and the Qt namespace are supported)</td></tr>
               <tr><td>QObject (and derived classes)</td><td>QObject wrapper</td></tr>
-              <tr><td>C++ object</td><td>CPP wrapper, either wrapped via PythonQtCPPWrapperFactory or just decorated with decorators</td></tr>
+              <tr><td>C++ object</td><td>CPP wrapper, either wrapped via PythonQtCppWrapperFactory or just decorated with decorators</td></tr>
               <tr><td>PyObject</td><td>PyObject</td></tr>
               </table>
             \section CPP CPP Wrapping
-            You can create dedicated wrapper QObject for any C++ class. This is done by deriving from PythonQtCPPWrapperFactory
+            You can create dedicated wrapper QObject for any C++ class. This is done by deriving from PythonQtCppWrapperFactory
-            and adding your factory via addWrapperFactory(). Whenever PythonQt encounters a CPP pointer (e.g. on a slot or signal)
+            and adding your factory via addWrapperFactory().
+            Whenever PythonQt encounters a CPP pointer (e.g. on a slot or signal)
             and it does not known it as a QObject derived class, it will create a generic CPP wrapper. So even unknown C++ objects
             can be passed through Python. If the wrapper factory supports the CPP class, a QObject wrapper will be created for each
             instance that enters Python. An alternative to a complete wrapper via the wrapper factory are decorators, see \ref Decorators

src/PythonQtImportFileInterface.h +2 -1

             #include <QString>
             #include <QByteArray>
-            //! defines an abstract interface to file access for the Python import statement
+            //! Defines an abstract interface to file access for the Python import statement.
+            //! see PythonQt::setImporter()
             class PythonQtImportFileInterface {
             public:

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