[QGIS Commit] r13112 - in docs/trunk/english_us/user_guide: . plugins_labeling_images

svn_qgis at osgeo.org svn_qgis at osgeo.org
Sat Mar 20 17:26:35 EDT 2010


Author: dassau
Date: 2010-03-20 17:26:34 -0400 (Sat, 20 Mar 2010)
New Revision: 13112

Added:
   docs/trunk/english_us/user_guide/plugins_labeling.tex
   docs/trunk/english_us/user_guide/plugins_labeling_images/
   docs/trunk/english_us/user_guide/plugins_labeling_images/Makefile
   docs/trunk/english_us/user_guide/plugins_labeling_images/labeling.png
Modified:
   docs/trunk/english_us/user_guide/Makefile
   docs/trunk/english_us/user_guide/core_plugins.tex
   docs/trunk/english_us/user_guide/user_guide.tex
Log:
added environment for labeling plugin


Modified: docs/trunk/english_us/user_guide/Makefile
===================================================================
--- docs/trunk/english_us/user_guide/Makefile	2010-03-20 20:45:56 UTC (rev 13111)
+++ docs/trunk/english_us/user_guide/Makefile	2010-03-20 21:26:34 UTC (rev 13112)
@@ -77,6 +77,7 @@
 	(cd ./plugins_gps_images && make)
 	(cd ./plugins_grass_module_images && make)
 	(cd ./plugins_interpolation_images && make)
+	(cd ./plugins_labeling_images && make)
 	(cd ./plugins_raster_terrain_images && make)
 	(cd ./plugins_mapserver_export_images && make)	
 	(cd ./plugins_ogr_converter_images && make)	
@@ -132,6 +133,7 @@
 	(cd ./plugins_gps_images && make clean)
 	(cd ./plugins_grass_module_images && make clean)
 	(cd ./plugins_interpolation_images && make clean)
+	(cd ./plugins_labeling_images && make clean)
 	(cd ./plugins_raster_terrain_images && make clean)
 	(cd ./plugins_mapserver_export_images && make clean)
 	(cd ./plugins_ogr_converter_images && make clean)

Modified: docs/trunk/english_us/user_guide/core_plugins.tex
===================================================================
--- docs/trunk/english_us/user_guide/core_plugins.tex	2010-03-20 20:45:56 UTC (rev 13111)
+++ docs/trunk/english_us/user_guide/core_plugins.tex	2010-03-20 21:26:34 UTC (rev 13112)
@@ -6,15 +6,12 @@
 % comment out the following line:
 %\updatedisclaimer
 
-QGIS \CURRENT contains 22 core plugins that can be loaded using the Plugin 
-Manager (see Table \ref{tab:core_plugins}).
-
 % minipage is needed to appear the footnote under the table
 % SH
 \begin{minipage}{\textwidth}
 \begin{table}[H]
 \centering
-\caption{QGIS Core Plugins}\label{tab:core_plugins}\medskip
+\caption{23 QGIS Core Plugins}\label{tab:core_plugins}\medskip
 \small
  \begin{tabular}{|l|l|p{4in}|}
 \hline \textbf{Icon} & \textbf{Plugin} & \textbf{Description}\\
@@ -47,11 +44,14 @@
  & GRASS \index{plugin!grass toolbox} & Activates the mighty GRASS Toolbox\\
 \hline
 \includegraphics[width=0.6cm]{georeferencer}
- & Georeferencer \index{plugin!georeferencer} & Adding projection info to Rasterfiles\\
+ & Georeferencer GDAL \index{plugin!georeferencer} & Adding projection info to Rasterfiles using GDAL\\
 \hline
 \includegraphics[width=0.6cm]{interpolation}
 & Interpolation plugin \index{plugins!Interpolation}& Interpolation on base of vertices of a vector layer\\
 \hline
+\includegraphics[width=0.6cm]{labeling}
+& Labeling \index{plugins!Labeling}& Smart labeling for vector layers\\
+\hline
 \includegraphics[width=0.6cm]{raster_terrain}
 & Raster Terrain Modelling \index{plugins!Raster Terrain Modelling}& Compute slope, aspect,
 ruggedness and total curvature of DEMs\\

Added: docs/trunk/english_us/user_guide/plugins_labeling.tex
===================================================================
--- docs/trunk/english_us/user_guide/plugins_labeling.tex	                        (rev 0)
+++ docs/trunk/english_us/user_guide/plugins_labeling.tex	2010-03-20 21:26:34 UTC (rev 13112)
@@ -0,0 +1,9 @@
+% vim: set textwidth=78 autoindent:
+
+\subsection{Labeling Plugin}
+
+% when the revision of a section has been finalized,
+% comment out the following line:
+%\updatedisclaimer
+
+The labeling plugin can

Added: docs/trunk/english_us/user_guide/plugins_labeling_images/Makefile
===================================================================
--- docs/trunk/english_us/user_guide/plugins_labeling_images/Makefile	                        (rev 0)
+++ docs/trunk/english_us/user_guide/plugins_labeling_images/Makefile	2010-03-20 21:26:34 UTC (rev 13112)
@@ -0,0 +1,40 @@
+# makefile to convert figures into eps format for the book
+
+# Comments from Michel Wurtz:
+# You will notice that the list given is the list of targets.  "all" just
+# refer to this list.  The most important rule is the next rule, that give
+# the generic rule for transforming a .fig into a .eps file.  Note the use
+# of % (define the couple target:source) and the use of
+# $< (source postfix, here .fig) and $@ (target postfix, here .eps)
+
+# with .eps extension:
+# JPG=qgis_icon_new_verylarge.eps\
+#	nextfile.eps
+
+PNG=labeling.eps\
+
+##### TARGETS #####
+
+all: $(PNG) $(JPG)
+	if [ ! -d ../finalpix/ ]; then mkdir ../finalpix; fi
+	#do not use move (mv):
+	cp *.eps ../finalpix/
+
+#$(EPS):	%.eps: %.fig
+#	fig2dev -L eps $< > $@
+
+#$(FIGPNG): %.png: %.fig
+#	fig2dev -L png -m 2 $< > $@
+
+$(PNG): %.eps: %.png
+	# Workaround for PDF
+	#convert -geometry 300x -depth 1 $< $@
+	convert $< $@ 
+
+$(JPG): %.eps: %.jpg
+	# Workaround for PDF
+	#convert -geometry 300x -depth 1 $< $@
+	convert $< $@
+
+clean:
+	rm -f *.bak *~ *.pdf $(PNG) $(JPG)

Added: docs/trunk/english_us/user_guide/plugins_labeling_images/labeling.png
===================================================================
(Binary files differ)


Property changes on: docs/trunk/english_us/user_guide/plugins_labeling_images/labeling.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: docs/trunk/english_us/user_guide/user_guide.tex
===================================================================
--- docs/trunk/english_us/user_guide/user_guide.tex	2010-03-20 20:45:56 UTC (rev 13111)
+++ docs/trunk/english_us/user_guide/user_guide.tex	2010-03-20 21:26:34 UTC (rev 13112)
@@ -35,6 +35,7 @@
 \include{plugins_georeferencer}
 \include{plugins_gps}
 \include{plugins_interpolation}
+\include{plugins_labeling}
 \include{plugins_mapserver_export}
 \include{plugins_ogr_converter}
 \include{plugins_oracle_raster}



More information about the QGIS-commit mailing list