From 70ced5b0628d157b4c048253ce1a891a14412edc Mon Sep 17 00:00:00 2001 From: Alexandre Neto Date: Mon, 13 Mar 2017 16:27:10 +0000 Subject: [PATCH] Adds Order to General Tasks Lessons --- .../Add_annotations_to_the_map_canvas/lesson.yaml | 7 ++----- .../Add_decorations_to_the_map_canvas/lesson.yaml | 4 ++-- General_tasks/Create_spatial_bookmarks/lesson.yaml | 4 ++-- General_tasks/Create_visibility_presets/lesson.yaml | 7 +++++-- General_tasks/Define_vector_layer_CRS/__init__.py | 4 ++-- General_tasks/Export_raster_layer/lesson.yaml | 4 ++-- General_tasks/Export_raster_layer/saveas.html | 2 +- .../Export_raster_layer_using_Processing/lesson.yaml | 6 +++++- General_tasks/Export_vector_layer/__init__.py | 6 +++--- General_tasks/Group_layers/lesson.yaml | 5 ++--- General_tasks/Reproject_vector_layer/__init__.py | 4 ++-- .../Reproject_vector_layer_using_Processing/lesson.yaml | 5 ++++- .../Save_map_canvas_as_a_georeferenced_image/lesson.yaml | 5 ++++- .../__init__.py | 5 ++++- .../Using_preview_modes_in_map_canvas/lesson.yaml | 5 ++++- 15 files changed, 44 insertions(+), 29 deletions(-) diff --git a/General_tasks/Add_annotations_to_the_map_canvas/lesson.yaml b/General_tasks/Add_annotations_to_the_map_canvas/lesson.yaml index 349d101..d10f979 100644 --- a/General_tasks/Add_annotations_to_the_map_canvas/lesson.yaml +++ b/General_tasks/Add_annotations_to_the_map_canvas/lesson.yaml @@ -1,4 +1,4 @@ -name: Add annotations to the map canvas +name: 14. Add annotations to the map canvas group: General tasks description: lesson.html steps: @@ -18,7 +18,4 @@ steps: description: move_annotation_box.html - name: Resize annotation - description: resize_annotation.html -nextLessons: - - name: Export raster layer (using Processing) - group: General tasks + description: resize_annotation.html \ No newline at end of file diff --git a/General_tasks/Add_decorations_to_the_map_canvas/lesson.yaml b/General_tasks/Add_decorations_to_the_map_canvas/lesson.yaml index 619170f..3d636bf 100644 --- a/General_tasks/Add_decorations_to_the_map_canvas/lesson.yaml +++ b/General_tasks/Add_decorations_to_the_map_canvas/lesson.yaml @@ -1,4 +1,4 @@ -name: Add decorations to the map canvas +name: 13. Add decorations to the map canvas group: General tasks description: lesson.html steps: @@ -20,5 +20,5 @@ steps: - name: Set Grid options description: grid_settings.html nextLessons: - - name: Add annotations to the map canvas + - name: 14. Add annotations to the map canvas group: General tasks diff --git a/General_tasks/Create_spatial_bookmarks/lesson.yaml b/General_tasks/Create_spatial_bookmarks/lesson.yaml index 677a9ac..fa3b9d1 100644 --- a/General_tasks/Create_spatial_bookmarks/lesson.yaml +++ b/General_tasks/Create_spatial_bookmarks/lesson.yaml @@ -1,4 +1,4 @@ -name: Create spatial bookmarks +name: 11. Create spatial bookmarks group: General tasks description: lesson.html steps: @@ -28,5 +28,5 @@ steps: - name: Use bookmarks description: use_bookmarks.html nextLessons: - - name: Create visibility presets + - name: 12. Create visibility presets group: General tasks diff --git a/General_tasks/Create_visibility_presets/lesson.yaml b/General_tasks/Create_visibility_presets/lesson.yaml index e77ec5a..1d8e258 100644 --- a/General_tasks/Create_visibility_presets/lesson.yaml +++ b/General_tasks/Create_visibility_presets/lesson.yaml @@ -1,4 +1,4 @@ -name: Create visibility presets +name: 12. Create visibility presets group: General tasks description: lesson.html steps: @@ -12,4 +12,7 @@ steps: description: createpreset2.html - name: Use presets - description: usepresets.html \ No newline at end of file + description: usepresets.html +nextLessons: + - name: 13. Add decorations to the map canvas + group: General tasks \ No newline at end of file diff --git a/General_tasks/Define_vector_layer_CRS/__init__.py b/General_tasks/Define_vector_layer_CRS/__init__.py index 1cb57a4..ec61bbf 100644 --- a/General_tasks/Define_vector_layer_CRS/__init__.py +++ b/General_tasks/Define_vector_layer_CRS/__init__.py @@ -8,7 +8,7 @@ from qgis.utils import iface from lessons import addLessonModule -lesson = Lesson("Define vector layer CRS", "General tasks", "lesson.html") +lesson = Lesson("04. Define vector layer CRS", "General tasks", "lesson.html") lesson.addStep("Set 'Wake_BlockGroup_2010' layer as active layer", "activelayer.html", function=lambda: setActiveLayer("Wake_BlockGroup_2010"), @@ -18,4 +18,4 @@ lesson.addStep("Set the layer's correct CRS", "setcrs.html", steptype=Step.MANUALSTEP) lesson.addMenuClickStep("Vector/Data Management Tools/Define Current Projection...", "gotodefineprojection.html") lesson.addStep("Define new CRS to file", "defineprojection.html", steptype=Step.MANUALSTEP) -lesson.addNextLesson("General tasks", "Reproject vector layer") +lesson.addNextLesson("General tasks", "05. Reproject vector layer") diff --git a/General_tasks/Export_raster_layer/lesson.yaml b/General_tasks/Export_raster_layer/lesson.yaml index 5e6249f..5337dcf 100644 --- a/General_tasks/Export_raster_layer/lesson.yaml +++ b/General_tasks/Export_raster_layer/lesson.yaml @@ -1,4 +1,4 @@ -name: Export raster layer +name: 02. Export raster layer group: General tasks description: lesson.html steps: @@ -9,5 +9,5 @@ steps: description: saveas.html nextLessons: - - name: Export raster layer (using Processing) + - name: 03. Export raster layer (using Processing) group: General tasks \ No newline at end of file diff --git a/General_tasks/Export_raster_layer/saveas.html b/General_tasks/Export_raster_layer/saveas.html index f527a5e..c392e3a 100644 --- a/General_tasks/Export_raster_layer/saveas.html +++ b/General_tasks/Export_raster_layer/saveas.html @@ -36,5 +36,5 @@ The new file will be saved in the new format, and loaded into the map canvas.

- Once you are done, click Next step to finish the lesson. + Once you are done, click Finishp to end the lesson.

\ No newline at end of file diff --git a/General_tasks/Export_raster_layer_using_Processing/lesson.yaml b/General_tasks/Export_raster_layer_using_Processing/lesson.yaml index 7b64990..bbfd1d1 100644 --- a/General_tasks/Export_raster_layer_using_Processing/lesson.yaml +++ b/General_tasks/Export_raster_layer_using_Processing/lesson.yaml @@ -1,4 +1,4 @@ -name: Export raster layer (using Processing) +name: 03. Export raster layer (using Processing) group: General tasks description: lesson.html steps: @@ -10,3 +10,7 @@ steps: - name: Run the GDAL Translate algorithm description: runtranslate.html + +nextLessons: + - name: 04. Define vector layer CRS + group: General tasks \ No newline at end of file diff --git a/General_tasks/Export_vector_layer/__init__.py b/General_tasks/Export_vector_layer/__init__.py index 93ca0d3..20c7732 100644 --- a/General_tasks/Export_vector_layer/__init__.py +++ b/General_tasks/Export_vector_layer/__init__.py @@ -9,12 +9,12 @@ from lessons import addLessonModule -lesson = Lesson("Export vector layer", "General tasks", "lesson.html") +lesson = Lesson("01. Export vector layer", "General tasks", "lesson.html") lesson.addStep("Set 'points' layer as active layer", "activelayer.html", function=lambda: setActiveLayer("points"), endcheck=lambda: layerActive("points"), steptype=Step.MANUALSTEP) -lesson.addMenuClickStep("Layer/Save As...") +lesson.addMenuClickStep("Layer/Save As...", name="Click on 'Layer > Save As...' menu item.") lesson.addStep("Save layer to new format", "saveas.html", steptype=Step.MANUALSTEP) -lesson.addNextLesson("General tasks", "Reproject vector layer") +lesson.addNextLesson("General tasks", "02. Export raster layer") diff --git a/General_tasks/Group_layers/lesson.yaml b/General_tasks/Group_layers/lesson.yaml index 15da58e..29cdef3 100644 --- a/General_tasks/Group_layers/lesson.yaml +++ b/General_tasks/Group_layers/lesson.yaml @@ -1,4 +1,4 @@ -name: Group layers +name: 08. Group layers group: General tasks description: lesson.html steps: @@ -16,7 +16,6 @@ steps: - name: Remove layer from group description: removelayer.html - nextLessons: - - name: Create visibility presets + - name: 09. Save map canvas as a georeferenced image group: General tasks diff --git a/General_tasks/Reproject_vector_layer/__init__.py b/General_tasks/Reproject_vector_layer/__init__.py index 4c8c99a..e4c51fa 100644 --- a/General_tasks/Reproject_vector_layer/__init__.py +++ b/General_tasks/Reproject_vector_layer/__init__.py @@ -9,7 +9,7 @@ from lessons import addLessonModule -lesson = Lesson("Reproject vector layer", "General tasks", "lesson.html") +lesson = Lesson("05. Reproject vector layer", "General tasks", "lesson.html") lesson.addStep("Set 'points' layer as active layer", "activelayer.html", function=lambda: setActiveLayer("points"), endcheck=lambda: layerActive("points"), @@ -18,5 +18,5 @@ lesson.addStep("Confirm layer CRS", "confirmcrs.html", steptype=Step.MANUALSTEP) lesson.addMenuClickStep("Layer/Save As...") lesson.addStep("Save a reprojected copy of the layer", "saveas.html", steptype=Step.MANUALSTEP) -lesson.addNextLesson("General tasks", "Reproject vector layer (using Processing)") +lesson.addNextLesson("General tasks", "06. Reproject vector layer (using Processing)") diff --git a/General_tasks/Reproject_vector_layer_using_Processing/lesson.yaml b/General_tasks/Reproject_vector_layer_using_Processing/lesson.yaml index 30fcccf..dcd49cd 100644 --- a/General_tasks/Reproject_vector_layer_using_Processing/lesson.yaml +++ b/General_tasks/Reproject_vector_layer_using_Processing/lesson.yaml @@ -1,4 +1,4 @@ -name: Reproject vector layer (using Processing) +name: 06. Reproject vector layer (using Processing) group: General tasks description: lesson.html steps: @@ -11,3 +11,6 @@ steps: - name: Setup and run the Reproject layer algorithm description: runreproject.html +nextLessons: + - name: 07. Transform X and Y CSV table into a point vector layer + group: General tasks diff --git a/General_tasks/Save_map_canvas_as_a_georeferenced_image/lesson.yaml b/General_tasks/Save_map_canvas_as_a_georeferenced_image/lesson.yaml index fe1a425..d32b637 100644 --- a/General_tasks/Save_map_canvas_as_a_georeferenced_image/lesson.yaml +++ b/General_tasks/Save_map_canvas_as_a_georeferenced_image/lesson.yaml @@ -1,4 +1,4 @@ -name: Save map canvas as a georeferenced image +name: 09. Save map canvas as a georeferenced image group: General tasks description: lesson.html steps: @@ -16,3 +16,6 @@ steps: - name: Load image description: load_image.html +nextLessons: + - name: 10. Using preview modes in map canvas + group: General tasks \ No newline at end of file diff --git a/General_tasks/Transform_X_and_Y_CSV_table_into_a_point_vector_layer/__init__.py b/General_tasks/Transform_X_and_Y_CSV_table_into_a_point_vector_layer/__init__.py index 622d044..4e68932 100644 --- a/General_tasks/Transform_X_and_Y_CSV_table_into_a_point_vector_layer/__init__.py +++ b/General_tasks/Transform_X_and_Y_CSV_table_into_a_point_vector_layer/__init__.py @@ -3,6 +3,7 @@ from lessons.utils import * from qgis.utils import iface from lessons import addLessonModule +from lessons.utils import copyLessonData def copyTable(): @@ -10,7 +11,7 @@ def copyTable(): copyLessonData(filepath, os.path.basename(os.path.dirname(__file__))) -lesson = Lesson ("Transform X and Y CSV table into a point vector layer", +lesson = Lesson ("07. Transform X and Y CSV table into a point vector layer", "General tasks", "lesson.html") lesson.addStep("Copy data", "Copy data", copyTable) @@ -19,3 +20,5 @@ def copyTable(): lesson.addStep('Set layer as active layer', 'set_active_layer.html', steptype=Step.MANUALSTEP) lesson.addMenuClickStep('Layer/Save As...') lesson.addStep('Save the file as GeoPackage', 'save_as_geopackage.html', steptype=Step.MANUALSTEP) + +lesson.addNextLesson("General tasks", "08. Group layers") \ No newline at end of file diff --git a/General_tasks/Using_preview_modes_in_map_canvas/lesson.yaml b/General_tasks/Using_preview_modes_in_map_canvas/lesson.yaml index 2f7e096..725d0b6 100644 --- a/General_tasks/Using_preview_modes_in_map_canvas/lesson.yaml +++ b/General_tasks/Using_preview_modes_in_map_canvas/lesson.yaml @@ -1,4 +1,4 @@ -name: Using preview modes in map canvas +name: 10. Using preview modes in map canvas group: General tasks description: lesson.html steps: @@ -21,3 +21,6 @@ steps: - name: Conclusion description: end.html +nextLessons: + - name: 11. Create spatial bookmarks + group: General tasks \ No newline at end of file