diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-08 11:30:15 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-08 11:46:38 +0100 |
| commit | 3f5c27908314074f177454ddcb1c18fce123fa6c (patch) | |
| tree | 4fca1ae043413014e997a04a562e7ee6b4ae9270 /examples/datavisualization/itemmodel | |
| parent | 779f6d8c23e75f12a830a4229db55f28ad1537b7 (diff) | |
| parent | 90aff7026205d71efde65f1783a06af82e528287 (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
examples/datavisualization/bars/doc/src/bars.qdoc
examples/datavisualization/custominput/doc/src/custominput.qdoc
examples/datavisualization/customitems/doc/src/customitems.qdoc
examples/datavisualization/draggableaxes/doc/src/draggableaxes.qdoc
examples/datavisualization/itemmodel/doc/src/itemmodel.qdoc
examples/datavisualization/qmlaxisdrag/doc/src/qmlaxisdrag.qdoc
examples/datavisualization/qmlaxisformatter/doc/src/qmlaxisformatter.qdoc
examples/datavisualization/qmlcustominput/doc/src/qmlcustominput.qdoc
examples/datavisualization/qmloscilloscope/doc/src/qmloscilloscope.qdoc
examples/datavisualization/qmlscatter/doc/src/qmlscatter.qdoc
examples/datavisualization/qmlspectrogram/doc/src/qmlspectrogram.qdoc
examples/datavisualization/qmlsurface/doc/src/qmlsurface.qdoc
examples/datavisualization/qmlsurfacelayers/doc/src/qmlsurfacelayers.qdoc
examples/datavisualization/rotations/doc/src/rotations.qdoc
examples/datavisualization/scatter/doc/src/scatter.qdoc
examples/datavisualization/surface/doc/src/surface.qdoc
examples/datavisualization/texturesurface/doc/src/texturesurface.qdoc
examples/datavisualization/volumetric/doc/src/volumetric.qdoc
src/datavisualization/doc/src/qtdatavisualization.qdoc
Change-Id: Ic15e77b1fee0708a235bf21815f72b854981537a
Diffstat (limited to 'examples/datavisualization/itemmodel')
| -rw-r--r-- | examples/datavisualization/itemmodel/doc/src/itemmodel.qdoc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/examples/datavisualization/itemmodel/doc/src/itemmodel.qdoc b/examples/datavisualization/itemmodel/doc/src/itemmodel.qdoc index b7cd7d15..c0a69218 100644 --- a/examples/datavisualization/itemmodel/doc/src/itemmodel.qdoc +++ b/examples/datavisualization/itemmodel/doc/src/itemmodel.qdoc @@ -48,7 +48,7 @@ \include examples-run.qdocinc - \section1 Creating the application + \section1 Creating the Application First, in main.cpp, we create a QApplication, instantiate Q3DBars and a window container for it: @@ -87,7 +87,7 @@ \snippet itemmodel/main.cpp 4 - \section1 Setting up the graph + \section1 Setting up the Graph Let's set up the visual attributes for the graph in the constructor of \c GraphDataGenerator: @@ -115,7 +115,7 @@ \note You do not need to set any of these in case you're happy with the defaults. You can easily try them by commenting out the contents of the constructor. - \section1 Adding data to the graph + \section1 Adding Data to the Graph We created the data generator in the application main and gave it the graph and the table widget as parameters: @@ -165,7 +165,7 @@ rows and columns for itself directly, as we set the QItemModelBarDataProxy::useModelCategories property to true, and the graph gets the data to be displayed via the series that owns the proxy. - \section1 Interacting with the data + \section1 Interacting with the Data We made a couple of signal connections in the application main earlier: @@ -190,5 +190,5 @@ \image itemmodel-example.png - \section1 Example contents + \section1 Example Contents */ |