diff --git a/docs/training_manual/grass/grass_setup.rst b/docs/training_manual/grass/grass_setup.rst index c026078ee54..738f8a3ca93 100644 --- a/docs/training_manual/grass/grass_setup.rst +++ b/docs/training_manual/grass/grass_setup.rst @@ -18,7 +18,7 @@ To launch GRASS from within QGIS, you need to activate it as with any other plugin: #. First, open a new QGIS project. -#. In the :guilabel:`Plugin Manager`, enable :guilabel:`GRASS` in the list: +#. In the :guilabel:`Plugin Manager`, enable |grassTools| :guilabel:`GRASS 8` in the list: .. figure:: img/enable_grass.png :align: center @@ -26,15 +26,10 @@ plugin: The GRASS toolbar and the GRASS panel will appear: - .. figure:: img/grass_toolbar.png - :align: center - - GRASS toolbar - .. figure:: img/grass_panel.png :align: center - GRASS Panel + GRASS Toolbar and Panel The GRASS panel is not active because, before you can use GRASS, you need to create a ``Mapset``. GRASS always works in a database environment, which means @@ -157,8 +152,8 @@ Go to the Browser, and simply drag the :file:`roads` layer from the .. figure:: img/grass_browser_import.png :align: center -That's it! If you expand the Mapset you will see the imported :file:`roads` -layer. You can now load in QGIS the imported layer like all the other layers. +That's it! If you expand the Mapset you will see the imported :file:`roads` layer. +You can now load in QGIS the imported layer like all the other layers. .. tip:: You can also load layers from the Layer Legend Panel to Mapset in the Browser Panel. This will speed up incredibly your workflow! @@ -173,7 +168,9 @@ same Mapset. #. Load data into QGIS as usual. Use the :file:`rivers.shp` dataset (found in the :file:`exercise_data/shapefile/` folder) #. As soon as it is loaded, click on the :guilabel:`Filter` box of the ``GRASS Panel`` - and find the vector import tool by entering the term ``v.in.ogr.qgis``: + and find the vector import tool by entering the term ``v.in.ogr.qgis`` + (available under :menuselection:`File management --> Import into GRASS --> + Import vector into GRASS`): .. warning:: There are 2 similar tools: ``v.in.ogr.qgis`` and ``v.in.ogr.qgis.loc``. We are looking for the **first** one. @@ -222,9 +219,10 @@ We are going to import in the GRASS Mapset the layer |srtmFileName|. #. Load the |srtmFileName| layer in QGIS #. Open the :guilabel:`GRASS Tools` dialog again. -#. Click on the :guilabel:`Modules List` tab. -#. Search for ``r.in.gdal.qgis`` and double click the tool to open the tool's - dialog. +#. Click on the :guilabel:`Modules` tab. +#. Search for ``r.in.gdal.qgis`` (available under :menuselection:`File management --> + Import into GRASS --> Import raster into GRASS --> Import raster into GRASS from QGIS view`) + and double click the tool to open the tool's dialog. #. Set it up so that the input layer is |srtmFileName| and the output is :file:`g_dem`. .. figure:: img/g_dem_settings.png @@ -269,8 +267,7 @@ Let's close the Mapset by clicking on the :guilabel:`Close Mapset` button of the :abbr:`★☆☆ (Basic level)` Follow Along: Using the GRASS plugin ............................................................................... -#. Click on the :guilabel:`Plugins --> GRASS --> Open Mapset` menu next to the - :guilabel:`Plugins --> GRASS --> New Mapset` menu that we saw in the previous section. +#. Click on the :menuselection:`Plugins --> GRASS --> Open Mapset` menu. #. Browse to the GRASS database folder: be careful! You must choose the parent folder, not the GRASS Mapset one. Indeed GRASS will read all the ``Locations`` of the @@ -331,6 +328,8 @@ operations that GRASS offers. :width: 1.5em .. |grassMapsetOpen| image:: /static/common/grass_mapset_open.png :width: 1.5em +.. |grassTools| image:: /static/common/grass_tools.png + :width: 1.5em .. |srtmFileName| replace:: :file:`srtm_41_19_4326.tif` .. |win| image:: /static/common/win.png :width: 1em diff --git a/docs/training_manual/grass/img/enable_grass.png b/docs/training_manual/grass/img/enable_grass.png index 4df5173faf6..5878a13729f 100644 Binary files a/docs/training_manual/grass/img/enable_grass.png and b/docs/training_manual/grass/img/enable_grass.png differ diff --git a/docs/training_manual/grass/img/g_dem_settings.png b/docs/training_manual/grass/img/g_dem_settings.png index a2bf46b4dc9..cb8b624b3f2 100644 Binary files a/docs/training_manual/grass/img/g_dem_settings.png and b/docs/training_manual/grass/img/g_dem_settings.png differ diff --git a/docs/training_manual/grass/img/grass_final.png b/docs/training_manual/grass/img/grass_final.png index b3c552ab32c..2fabc4c6460 100644 Binary files a/docs/training_manual/grass/img/grass_final.png and b/docs/training_manual/grass/img/grass_final.png differ diff --git a/docs/training_manual/grass/img/grass_folder.png b/docs/training_manual/grass/img/grass_folder.png index 44784c32bec..f2af9c43cad 100644 Binary files a/docs/training_manual/grass/img/grass_folder.png and b/docs/training_manual/grass/img/grass_folder.png differ diff --git a/docs/training_manual/grass/img/grass_mapset.png b/docs/training_manual/grass/img/grass_mapset.png index 4951dbbdd6f..8f4bab04143 100644 Binary files a/docs/training_manual/grass/img/grass_mapset.png and b/docs/training_manual/grass/img/grass_mapset.png differ diff --git a/docs/training_manual/grass/img/grass_open_mapset.png b/docs/training_manual/grass/img/grass_open_mapset.png index 27c945ec670..73e26bd3bbc 100644 Binary files a/docs/training_manual/grass/img/grass_open_mapset.png and b/docs/training_manual/grass/img/grass_open_mapset.png differ diff --git a/docs/training_manual/grass/img/grass_panel.png b/docs/training_manual/grass/img/grass_panel.png index 4d17af6d0fe..a6bf6ee8493 100644 Binary files a/docs/training_manual/grass/img/grass_panel.png and b/docs/training_manual/grass/img/grass_panel.png differ diff --git a/docs/training_manual/grass/img/grass_panel_import.png b/docs/training_manual/grass/img/grass_panel_import.png index c735583bcec..1a8a4077a29 100644 Binary files a/docs/training_manual/grass/img/grass_panel_import.png and b/docs/training_manual/grass/img/grass_panel_import.png differ diff --git a/docs/training_manual/grass/img/grass_tool_selected.png b/docs/training_manual/grass/img/grass_tool_selected.png index 5cf55f68463..165073683d9 100644 Binary files a/docs/training_manual/grass/img/grass_tool_selected.png and b/docs/training_manual/grass/img/grass_tool_selected.png differ diff --git a/docs/training_manual/grass/img/grass_toolbar.png b/docs/training_manual/grass/img/grass_toolbar.png deleted file mode 100644 index a47df562216..00000000000 Binary files a/docs/training_manual/grass/img/grass_toolbar.png and /dev/null differ diff --git a/docs/training_manual/grass/img/new_location.png b/docs/training_manual/grass/img/new_location.png index 8af643c4b09..30a78b3a727 100644 Binary files a/docs/training_manual/grass/img/new_location.png and b/docs/training_manual/grass/img/new_location.png differ diff --git a/docs/training_manual/grass/img/set_south_africa.png b/docs/training_manual/grass/img/set_south_africa.png index 43a2c8d0936..e7cde123f79 100644 Binary files a/docs/training_manual/grass/img/set_south_africa.png and b/docs/training_manual/grass/img/set_south_africa.png differ diff --git a/docs/training_manual/grass/img/wgs_84_selected.png b/docs/training_manual/grass/img/wgs_84_selected.png index 187d38fc73a..8c30f37ff91 100644 Binary files a/docs/training_manual/grass/img/wgs_84_selected.png and b/docs/training_manual/grass/img/wgs_84_selected.png differ diff --git a/docs/user_manual/working_with_gps/live_GPS_tracking.rst b/docs/user_manual/working_with_gps/live_GPS_tracking.rst index e9cc9645d31..1d1d0ae014f 100644 --- a/docs/user_manual/working_with_gps/live_GPS_tracking.rst +++ b/docs/user_manual/working_with_gps/live_GPS_tracking.rst @@ -326,10 +326,10 @@ or without it, by connecting the QGIS live tracking tool directly to the device .. |addTrackPoint| image:: /static/common/mActionAddTrackPoint.png :width: 1.5em -.. |capturePoint| image:: /static/common/mActionCapturePoint.png - :width: 1.5em .. |captureLine| image:: /static/common/mActionCaptureLine.png :width: 1.5em +.. |capturePoint| image:: /static/common/mActionCapturePoint.png + :width: 1.5em .. |capturePolygon| image:: /static/common/mActionCapturePolygon.png :width: 1.5em .. |gpsConnect| image:: /static/common/mIconGpsConnect.png