diff --git a/gui/wxpython/docs/wxGUI_layer_manager.png b/gui/wxpython/docs/history_images/wxGUI_layer_manager.png similarity index 100% rename from gui/wxpython/docs/wxGUI_layer_manager.png rename to gui/wxpython/docs/history_images/wxGUI_layer_manager.png diff --git a/gui/wxpython/docs/wxGUI_map_display.jpg b/gui/wxpython/docs/history_images/wxGUI_map_display.jpg similarity index 100% rename from gui/wxpython/docs/wxGUI_map_display.jpg rename to gui/wxpython/docs/history_images/wxGUI_map_display.jpg diff --git a/gui/wxpython/docs/wxGUI_modules_flags.png b/gui/wxpython/docs/history_images/wxGUI_modules_flags.png similarity index 100% rename from gui/wxpython/docs/wxGUI_modules_flags.png rename to gui/wxpython/docs/history_images/wxGUI_modules_flags.png diff --git a/gui/wxpython/docs/wxGUI_modules_parameters.png b/gui/wxpython/docs/history_images/wxGUI_modules_parameters.png similarity index 100% rename from gui/wxpython/docs/wxGUI_modules_parameters.png rename to gui/wxpython/docs/history_images/wxGUI_modules_parameters.png diff --git a/gui/wxpython/docs/wxGUI_modules_style_left.png b/gui/wxpython/docs/history_images/wxGUI_modules_style_left.png similarity index 100% rename from gui/wxpython/docs/wxGUI_modules_style_left.png rename to gui/wxpython/docs/history_images/wxGUI_modules_style_left.png diff --git a/gui/wxpython/docs/wxGUI_modules_style_top.png b/gui/wxpython/docs/history_images/wxGUI_modules_style_top.png similarity index 100% rename from gui/wxpython/docs/wxGUI_modules_style_top.png rename to gui/wxpython/docs/history_images/wxGUI_modules_style_top.png diff --git a/gui/wxpython/docs/images/wxGUI_layer_manager.png b/gui/wxpython/docs/images/wxGUI_layer_manager.png new file mode 100644 index 00000000000..e12622aaa06 Binary files /dev/null and b/gui/wxpython/docs/images/wxGUI_layer_manager.png differ diff --git a/gui/wxpython/docs/images/wxGUI_map_display.jpeg b/gui/wxpython/docs/images/wxGUI_map_display.jpeg new file mode 100644 index 00000000000..f8ff858c06d Binary files /dev/null and b/gui/wxpython/docs/images/wxGUI_map_display.jpeg differ diff --git a/gui/wxpython/docs/images/wxGUI_modules_flags.png b/gui/wxpython/docs/images/wxGUI_modules_flags.png new file mode 100644 index 00000000000..2f2596023c4 Binary files /dev/null and b/gui/wxpython/docs/images/wxGUI_modules_flags.png differ diff --git a/gui/wxpython/docs/images/wxGUI_modules_parameters.png b/gui/wxpython/docs/images/wxGUI_modules_parameters.png new file mode 100644 index 00000000000..f89e63431ad Binary files /dev/null and b/gui/wxpython/docs/images/wxGUI_modules_parameters.png differ diff --git a/gui/wxpython/docs/wxGUI_modules_widget_file1.png b/gui/wxpython/docs/images/wxGUI_modules_widget_file1.png similarity index 100% rename from gui/wxpython/docs/wxGUI_modules_widget_file1.png rename to gui/wxpython/docs/images/wxGUI_modules_widget_file1.png diff --git a/gui/wxpython/docs/wxGUI_modules_widget_file2.png b/gui/wxpython/docs/images/wxGUI_modules_widget_file2.png similarity index 100% rename from gui/wxpython/docs/wxGUI_modules_widget_file2.png rename to gui/wxpython/docs/images/wxGUI_modules_widget_file2.png diff --git a/gui/wxpython/docs/wxGUI_modules_widget_selection.png b/gui/wxpython/docs/images/wxGUI_modules_widget_selection.png similarity index 100% rename from gui/wxpython/docs/wxGUI_modules_widget_selection.png rename to gui/wxpython/docs/images/wxGUI_modules_widget_selection.png diff --git a/gui/wxpython/docs/wxGUI.md b/gui/wxpython/docs/wxGUI.md index 67391e42191..d7281a4ff02 100644 --- a/gui/wxpython/docs/wxGUI.md +++ b/gui/wxpython/docs/wxGUI.md @@ -251,7 +251,7 @@ from the window, a map canvas where a map composition of one or more layers is displayed, and a statusbar with information about the geographic region of the maps displayed. -![Map Display Window](wxGUI_map_display.jpg) +![Map Display Window](wxGUI_map_display.png) *Figure: Map Display screenshot on Ubuntu* Each Map Display Window has a unique layer tree (in the layer manager) diff --git a/lib/init/Makefile b/lib/init/Makefile index 99366b060a9..1e978f2957d 100644 --- a/lib/init/Makefile +++ b/lib/init/Makefile @@ -25,15 +25,15 @@ FILES = \ $(ETC)/echo$(EXE) \ $(ETC)/license \ $(ETC)/VERSIONNUMBER \ - $(HTMLDIR)/help_project_structure.png \ - $(HTMLDIR)/grassdb.png \ - $(HTMLDIR)/location.png \ - $(HTMLDIR)/location-add.png \ - $(HTMLDIR)/location-download.png \ - $(HTMLDIR)/mapset.png \ - $(HTMLDIR)/raster-import.png \ - $(HTMLDIR)/vector-import.png \ - $(HTMLDIR)/grass_start.png + $(HTMLDIR)/images/help_project_structure.png \ + $(HTMLDIR)/images/grass_start.png \ + $(HTMLDIR)/icons/grassdb.png \ + $(HTMLDIR)/icons/location.png \ + $(HTMLDIR)/icons/location-add.png \ + $(HTMLDIR)/icons/location-download.png \ + $(HTMLDIR)/icons/mapset.png \ + $(HTMLDIR)/icons/raster-import.png \ + $(HTMLDIR)/icons/vector-import.png ifeq ($(findstring darwin,$(ARCH)),darwin) FILES += \ diff --git a/lib/init/grass_start.png b/lib/init/grass_start.png deleted file mode 100644 index 966b0b47872..00000000000 Binary files a/lib/init/grass_start.png and /dev/null differ diff --git a/lib/init/helptext.md b/lib/init/helptext.md index 3eedb97b4e9..e7f174c44a8 100644 --- a/lib/init/helptext.md +++ b/lib/init/helptext.md @@ -9,25 +9,26 @@ When [launching](grass.md) GRASS GIS for the first time, you will open a called "country_boundaries" showing a world map in the WGS84 coordinate system. -![GRASS GIS after first startup](grass_start.png) +![GRASS GIS after first startup](images/grass_start.png) The main component of the Data tab is the *Data Catalog* which shows the GRASS GIS hierarchical structure consisting of database ![GRASS -Database](grassdb.png), project ![project](location.png) and -mapset ![mapset](mapset.png). +Database](icons/grassdb.png), project ![project](icons/location.png) and +mapset ![mapset](icons/mapset.png). -![GRASS Database](grassdb.png) **GRASS database** (directory with projects) +![GRASS Database](icons/grassdb.png) **GRASS database** +(directory with projects) Running GRASS GIS for the first time, a folder named "grassdata" is automatically created. Depending on your operating system, you can find it in your $HOME directory (\*nix) or My Documents (MS Windows). -![project](location.png) **project** (previously called location) +![project](icons/location.png) **project** (previously called location) A project is defined by its coordinate reference system (CRS). In the case of the default project, it is a geographic coordinate reference system WGS84 (EPSG:4326). If you have data in another CRS than WGS84, you should create a new project corresponding to your system. -![mapset](mapset.png) **mapset** (a subproject) +![mapset](icons/mapset.png) **mapset** (a subproject) Each project can have many mapsets for managing different aspects of a project or project's subregions. When creating a new project, GRASS GIS automatically creates a special mapset called PERMANENT where the core @@ -42,13 +43,13 @@ First, if you would like to get to know GRASS better before importing your own data, please download provided samples such as the "North Carolina" dataset. You can simply reach them through "Download sample project to current database" management icon ![Download -project](location-download.png). +project](icons/location-download.png). To work with your own data, you typically want to first create a new project with a [coordinate reference system (CRS)](https://en.wikipedia.org/wiki/Spatial_reference_system) suitable for your study area or one that matches your data's CRS. The Project -Wizard ![Add project](location-add.png) will help you with that by +Wizard ![Add project](icons/location-add.png) will help you with that by guiding you through a series of dialogs to browse and select predefined projections (also via EPSG code) or to define individual projections. @@ -65,8 +66,8 @@ included). After creating a new project, you are ready to import your data. You can use simple raster or vector data import ![Raster -import](raster-import.png), ![Vector import](vector-import.png) or -a variety of more specialized tools. If the data's CRS does not match +import](icons/raster-import.png), ![Vector import](icons/vector-import.png) +or a variety of more specialized tools. If the data's CRS does not match your project's CRS, data will be automatically reprojected. After import your raster or vector data are added as a layer to Map Display. To change layer properties, go to Display tab. To analyze your data, search diff --git a/lib/init/grassdb.png b/lib/init/icons/grassdb.png similarity index 100% rename from lib/init/grassdb.png rename to lib/init/icons/grassdb.png diff --git a/lib/init/location-add.png b/lib/init/icons/location-add.png similarity index 100% rename from lib/init/location-add.png rename to lib/init/icons/location-add.png diff --git a/lib/init/location-download.png b/lib/init/icons/location-download.png similarity index 100% rename from lib/init/location-download.png rename to lib/init/icons/location-download.png diff --git a/lib/init/location.png b/lib/init/icons/location.png similarity index 100% rename from lib/init/location.png rename to lib/init/icons/location.png diff --git a/lib/init/mapset.png b/lib/init/icons/mapset.png similarity index 100% rename from lib/init/mapset.png rename to lib/init/icons/mapset.png diff --git a/lib/init/raster-import.png b/lib/init/icons/raster-import.png similarity index 100% rename from lib/init/raster-import.png rename to lib/init/icons/raster-import.png diff --git a/lib/init/vector-import.png b/lib/init/icons/vector-import.png similarity index 100% rename from lib/init/vector-import.png rename to lib/init/icons/vector-import.png diff --git a/lib/init/images/grass_start.png b/lib/init/images/grass_start.png new file mode 100644 index 00000000000..22157449b3a Binary files /dev/null and b/lib/init/images/grass_start.png differ diff --git a/lib/init/help_project_structure.png b/lib/init/images/help_project_structure.png similarity index 100% rename from lib/init/help_project_structure.png rename to lib/init/images/help_project_structure.png