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/bars | |
| 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/bars')
| -rw-r--r-- | examples/datavisualization/bars/doc/src/bars.qdoc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/examples/datavisualization/bars/doc/src/bars.qdoc b/examples/datavisualization/bars/doc/src/bars.qdoc index 4d1275cb..fc4d2dfb 100644 --- a/examples/datavisualization/bars/doc/src/bars.qdoc +++ b/examples/datavisualization/bars/doc/src/bars.qdoc @@ -51,7 +51,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: @@ -80,7 +80,7 @@ \snippet bars/main.cpp 3 - \section1 Setting up the graph + \section1 Setting up the Graph Let's set up the graph in the constructor of the \c GraphModifier class we instantiated in the application main: @@ -127,7 +127,7 @@ That concludes setting up the graph. - \section1 Adding data to the graph + \section1 Adding Data to the Graph At the end of the constructor there's a call: @@ -139,7 +139,7 @@ Now the series have data to show. - \section1 Using widgets to control the graph + \section1 Using Widgets to Control the Graph There isn't much interaction yet, so let's continue by adding some widgets back in the application main. Let's just focus on two as an example: @@ -187,7 +187,7 @@ \li Axis label rotation \endlist - \section1 Selecting a row/column by clicking an axis label + \section1 Selecting a Row/column by Clicking an Axis Label Selection by axis label is default functionality for bar graphs. As an example, you can select rows by clicking an axis label in the following way: @@ -201,7 +201,7 @@ You can use the same method with \c SelectionSlice and \c SelectionItem flags, as long as you have either \c SelectionRow or \c SelectionColumn set as well. - \section1 Zooming to selection + \section1 Zooming to Selection As an example of adjusting camera target we have implemented an animation of zooming to selection via a button press. Animation initializations are done in the constructor: @@ -225,6 +225,6 @@ \snippet bars/graphmodifier.cpp 15 - \section1 Example contents + \section1 Example Contents */ |