Doc: Fix issues

- Update the title for chapter 1 to be in line with the other
  chapter titles.
- Fix a typo
- Remove unified diffs to highlight changes to code between chapters

Change-Id: Iccf671c876fd78626014f52e58df49ed720aa7c1
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>

6 files changed, 23 insertions, 58 deletions

diff --git a/sources/pyside2/doc/tutorials/datavisualize/add_chart.rst b/sources/pyside2/doc/tutorials/datavisualize/add_chart.rst
index e42603333..0c9803269 100644
--- a/sources/pyside2/doc/tutorials/datavisualize/add_chart.rst
+++ b/sources/pyside2/doc/tutorials/datavisualize/add_chart.rst
@@ -9,10 +9,12 @@ The placeholder for a plot is a QChartView, and inside that Widget you can
 place a QChart. As a first step, try including only this without any data to
 plot.
 
-Make the following changes to :code:`main_widget.py` from the previous chapter
-to add a QChartView:
+Make the following highlighted changes to :code:`main_widget.py` from the
+previous chapter to add a QChartView:
 
 .. literalinclude:: datavisualize5/main_widget.py
    :linenos:
-   :diff: datavisualize4/main_widget.py
+   :lines: 40-
+   :emphasize-lines: 2-3,6,22-37,48-51
+
 
diff --git a/sources/pyside2/doc/tutorials/datavisualize/add_tableview.rst b/sources/pyside2/doc/tutorials/datavisualize/add_tableview.rst
index 5904b0c03..bbf27f2da 100644
--- a/sources/pyside2/doc/tutorials/datavisualize/add_tableview.rst
+++ b/sources/pyside2/doc/tutorials/datavisualize/add_tableview.rst
@@ -47,20 +47,22 @@ CustomTableModel.
 .. literalinclude:: datavisualize4/main_widget.py
    :language: python
    :linenos:
-   :emphasize-lines: 56-61
+   :emphasize-lines: 12-17
    :lines: 40-
 
-You also need these minor changes to the :code:`main_window.py` and
+You also need minor changes to the :code:`main_window.py` and
 :code:`main.py` from chapter 3 to include the Widget inside the
-MainWindow:
+MainWindow.
+
+In the following snippets you'll see those changes highlighted:
 
 .. literalinclude:: datavisualize4/main_window.py
    :language: python
    :linenos:
-   :diff: datavisualize3/main_window.py
+   :emphasize-lines: 8,11
 
 .. literalinclude:: datavisualize4/main.py
    :language: python
    :linenos:
-   :diff: datavisualize3/main.py
+   :emphasize-lines: 46-47
 
diff --git a/sources/pyside2/doc/tutorials/datavisualize/datavisualize5/main_widget.py b/sources/pyside2/doc/tutorials/datavisualize/datavisualize5/main_widget.py
index 2d2452bf9..08406d341 100644
--- a/sources/pyside2/doc/tutorials/datavisualize/datavisualize5/main_widget.py
+++ b/sources/pyside2/doc/tutorials/datavisualize/datavisualize5/main_widget.py
@@ -59,17 +59,15 @@ class Widget(QWidget):
         self.table_view.setModel(self.model)
 
         # QTableView Headers
-        resize = QHeaderView.ResizeToContents
         self.horizontal_header = self.table_view.horizontalHeader()
         self.vertical_header = self.table_view.verticalHeader()
-        self.horizontal_header.setSectionResizeMode(resize)
-        self.vertical_header.setSectionResizeMode(resize)
+        self.horizontal_header.setSectionResizeMode(QHeaderView.ResizeToContents)
+        self.vertical_header.setSectionResizeMode(QHeaderView.ResizeToContents)
         self.horizontal_header.setStretchLastSection(True)
 
         # Creating QChart
         self.chart = QtCharts.QChart()
         self.chart.setAnimationOptions(QtCharts.QChart.AllAnimations)
-        self.add_series("Magnitude (Column 1)", [0, 1])
 
         # Creating QChartView
         self.chart_view = QtCharts.QChartView(self.chart)
@@ -79,53 +77,15 @@ class Widget(QWidget):
         self.main_layout = QHBoxLayout()
         size = QSizePolicy(QSizePolicy.Preferred, QSizePolicy.Preferred)
 
-        # Left layout
+        ## Left layout
         size.setHorizontalStretch(1)
         self.table_view.setSizePolicy(size)
         self.main_layout.addWidget(self.table_view)
 
-        # Right Layout
+        ## Right Layout
         size.setHorizontalStretch(4)
         self.chart_view.setSizePolicy(size)
         self.main_layout.addWidget(self.chart_view)
 
         # Set the layout to the QWidget
         self.setLayout(self.main_layout)
-
-    def add_series(self, name, columns):
-        # Create QLineSeries
-        self.series = QtCharts.QLineSeries()
-        self.series.setName(name)
-
-        # Filling QLineSeries
-        for i in range(self.model.rowCount()):
-            # Getting the data
-            t = self.model.index(i, 0).data()
-            date_fmt = "yyyy-MM-dd HH:mm:ss.zzz"
-
-            x = QDateTime().fromString(t, date_fmt).toSecsSinceEpoch()
-            y = float(self.model.index(i, 1).data())
-
-            if x > 0 and y > 0:
-                self.series.append(x, y)
-
-        self.chart.addSeries(self.series)
-
-        # Setting X-axis
-        self.axis_x = QtCharts.QDateTimeAxis()
-        self.axis_x.setTickCount(10)
-        self.axis_x.setFormat("dd.MM (h:mm)")
-        self.axis_x.setTitleText("Date")
-        self.chart.addAxis(self.axis_x, Qt.AlignBottom)
-        self.series.attachAxis(self.axis_x)
-        # Setting Y-axis
-        self.axis_y = QtCharts.QValueAxis()
-        self.axis_y.setTickCount(10)
-        self.axis_y.setLabelFormat("%.2f")
-        self.axis_y.setTitleText("Magnitude")
-        self.chart.addAxis(self.axis_y, Qt.AlignLeft)
-        self.series.attachAxis(self.axis_y)
-
-        # Getting the color from the QChart to use it on the QTableView
-        self.model.color = "{}".format(self.series.pen().color().name())
-
diff --git a/sources/pyside2/doc/tutorials/datavisualize/filter_data.rst b/sources/pyside2/doc/tutorials/datavisualize/filter_data.rst
index 09c086db1..f54ba217c 100644
--- a/sources/pyside2/doc/tutorials/datavisualize/filter_data.rst
+++ b/sources/pyside2/doc/tutorials/datavisualize/filter_data.rst
@@ -18,13 +18,13 @@ The Date column provides data in UTC format (for example,
 defining the structure of the string. Additionally, you can adapt the time
 based on the timezone you are in, using QTimeZone.
 
-The following script filters and formatts the CSV data as described earlier:
+The following script filters and formats the CSV data as described earlier:
 
 .. literalinclude:: datavisualize2/main.py
    :language: python
    :linenos:
    :emphasize-lines: 44,47-69
-   :line: 40-
+   :lines: 40-
 
 Now that you have a tuple of QDateTime and float data, try improving the
 output further. That's what you'll learn in the following chapters.
diff --git a/sources/pyside2/doc/tutorials/datavisualize/plot_datapoints.rst b/sources/pyside2/doc/tutorials/datavisualize/plot_datapoints.rst
index 9b86ca8b8..8ebdd2b08 100644
--- a/sources/pyside2/doc/tutorials/datavisualize/plot_datapoints.rst
+++ b/sources/pyside2/doc/tutorials/datavisualize/plot_datapoints.rst
@@ -7,13 +7,14 @@ this, you need to go over our data and include the data on a QLineSeries.
 After adding the data to the series, you can modify the axis to properly
 display the QDateTime on the X-axis, and the magnitude values on the Y-axis.
 
-Here is the updated main_widget.py from with an additional function that adds
-the QLineSeries.
+Here is the updated :code:`main_widget.py` that includes an additional
+function to plot data using a QLineSeries:
 
 .. literalinclude:: datavisualize6/main_widget.py
    :language: python
    :linenos:
-   :pyobject: Widget.add_series
+   :lines: 40-
+   :emphasize-lines: 33,56-91
 
 Now, run the application to visualize the earthquake magnitudes
 data at different times.
diff --git a/sources/pyside2/doc/tutorials/datavisualize/read_data.rst b/sources/pyside2/doc/tutorials/datavisualize/read_data.rst
index a8b04eea7..f7bf9337a 100644
--- a/sources/pyside2/doc/tutorials/datavisualize/read_data.rst
+++ b/sources/pyside2/doc/tutorials/datavisualize/read_data.rst
@@ -1,4 +1,4 @@
-Chapter 1: Reading data from a CSV
+Chapter 1 - Reading data from a CSV
 ===================================
 
 There are several ways to read data from a CSV file. The following are the most