[QGIS Commit] r11048 - in docs/trunk/english_us/gis_introduction: . attributedata_images

[svn_qgis at osgeo.org]

Author: dassau
Date: 2009-07-12 05:29:45 -0400 (Sun, 12 Jul 2009)
New Revision: 11048

Added:
   docs/trunk/english_us/gis_introduction/attributedata_images/apricotdots.png
   docs/trunk/english_us/gis_introduction/attributedata_images/apricotline.png
   docs/trunk/english_us/gis_introduction/attributedata_images/blackline.png
   docs/trunk/english_us/gis_introduction/attributedata_images/blueline.png
   docs/trunk/english_us/gis_introduction/attributedata_images/colbrown1.png
   docs/trunk/english_us/gis_introduction/attributedata_images/colbrown2.png
   docs/trunk/english_us/gis_introduction/attributedata_images/colbrown3.png
   docs/trunk/english_us/gis_introduction/attributedata_images/colbrown4.png
   docs/trunk/english_us/gis_introduction/attributedata_images/colorange1.png
   docs/trunk/english_us/gis_introduction/attributedata_images/colorange2.png
   docs/trunk/english_us/gis_introduction/attributedata_images/colorange3.png
   docs/trunk/english_us/gis_introduction/attributedata_images/colorange4.png
   docs/trunk/english_us/gis_introduction/attributedata_images/colorange5.png
Modified:
   docs/trunk/english_us/gis_introduction/attributedata.tex
   docs/trunk/english_us/gis_introduction/attributedata_images/Makefile
Log:
finished attribute data section 


Modified: docs/trunk/english_us/gis_introduction/attributedata.tex
===================================================================
--- docs/trunk/english_us/gis_introduction/attributedata.tex	2009-07-12 00:13:10 UTC (rev 11047)
+++ docs/trunk/english_us/gis_introduction/attributedata.tex	2009-07-12 09:29:45 UTC (rev 11048)
@@ -47,24 +47,27 @@
 feature type in a houses polygon layer, and the attributes in an attribute
 table (see Figure \ref{fig:attrtable}).
 
-\begin{figure}[ht]
+%% Minipage to put both figures on one page
+\begin{figure}[htpb]
+   \begin{minipage}[h]{\textwidth}
    \begin{center}
    \caption{Every feature has characteristics that we can describe. These can
 be visible things, or things we know about the feature (e.g. year built).}
-\label{fig:houses}\smallskip
-   \includegraphics[clip=true, width=\textwidth]{Houses}
-\end{center}
-\end{figure}
-
-\begin{figure}[h]
+   \label{fig:houses}\smallskip
+   \includegraphics[clip=true, width=0.9\textwidth]{Houses}
+   \end{center}
+   \end{minipage} \\
+   \vspace{1cm}
+   \begin{minipage}[h]{\textwidth}
    \begin{center}
    \caption{A houses layer. House features have attributes that describe the
 houses' roof colour and other properties. The attribute table (lower image)
 lists the attributes for the house areas shown on the map. When a feature is
 highlighted  in the table, it will appear as a yellow polygon on the map.}
-\label{fig:attrtable}\smallskip
-   \includegraphics[clip=true, width=0.5\textwidth]{AttributeTable}
-\end{center}
+   \label{fig:attrtable}\smallskip
+   \includegraphics[clip=true, width=0.6\textwidth]{AttributeTable}
+   \end{center}
+   \end{minipage}
 \end{figure}
 
 The fact that features have attributes as well geometry in a GIS Application
@@ -115,23 +118,25 @@
 and \textbf{attributes} (which describe the feature).
 This is shown in Figure \ref{fig:attdiagram}. 
 
-\begin{figure}[ht]
+%% Minipage to put both figures on one page
+\begin{figure}[htpb]
+   \begin{minipage}[h]{\textwidth}
    \begin{center}
    \caption{In a GIS Application, we can also search for features based on
 their attributes. Here we see a search for houses with black roofs. Results
 are shown in yellow in the map, turquoise on the table.}
 \label{fig:housesearch}\smallskip
-   \includegraphics[clip=true, width=0.5\textwidth]{HousesSearch}
-\end{center}
-\end{figure}
-
-
-\begin{figure}[ht]
+   \includegraphics[clip=true, width=0.6\textwidth]{HousesSearch}
+   \end{center}
+   \end{minipage} \\
+   \vspace{1cm}
+   \begin{minipage}[h]{\textwidth}
    \begin{center}
    \caption{Vector features at a glance.}
-\label{fig:attdiagram}\smallskip
+   \label{fig:attdiagram}\smallskip
    \includegraphics[clip=true, width=0.5\textwidth]{attribute_diagram}
-\end{center}
+   \end{center}
+   \end{minipage}
 \end{figure}
 
 \subsection{Attributes in detail}
@@ -155,7 +160,7 @@
  \begin{tabular}{|p{4cm}|p{4cm}|p{4cm}|p{4cm}|}
  \hline
  \rowcolor{black}
- \textcolor{blue}{\textbf{Attribute Table}} &
+ &
  \textcolor{white}{\textbf{Field 1: YearBuilt}} & 
  \textcolor{white}{\textbf{Field 2: RoofColour}} &
  \textcolor{white}{\textbf{Field 3: Balcony}} \\
@@ -240,24 +245,26 @@
 lying areas with one colour, mid-altitude areas with another and
 high-altitude areas with a third.
 
-\begin{figure}[ht]
+%% Minipage to put both figures on one page
+\begin{figure}[htpb]
+   \begin{minipage}[h]{\textwidth}
    \begin{center}
    \caption{The height attribute of contours can be used to separate the
 contours into 3 classes. Contours between 980m and 1120m will be drawn in
 brown, those between 1120m and 1240m in green and those between 1240m and
 1500m in purple.}
-\label{fig:gradcoldialog}\smallskip
+   \label{fig:gradcoldialog}\smallskip
    \includegraphics[clip=true, width=0.5\textwidth]{graduated_colour_dialog}
-\end{center}
-\end{figure}
-
-
-\begin{figure}[ht]
+   \end{center}
+   \end{minipage} \\
+   \vspace{1cm}
+   \begin{minipage}[h]{\textwidth}
    \begin{center}
    \caption{Our map after setting graduated colours for our contours.}
-\label{fig:gradcontours}\smallskip
+   \label{fig:gradcontours}\smallskip
    \includegraphics[clip=true, width=0.5\textwidth]{graduated_contours}
-\end{center}
+   \end{center}
+   \end{minipage}
 \end{figure}
 
 Setting colours based on discrete groups of attribute values is called
@@ -320,15 +327,15 @@
  \rowcolor{black}
  \textcolor{white}{\textbf{Attribute Value}} &
  \textcolor{white}{\textbf{Colour (no classes or grouping)}} \\
- \hline 1 &  \\
- \hline 2 &  \\
- \hline 3 &  \\
- \hline 4 &  \\
- \hline 5 &  \\
- \hline 6 &  \\
- \hline 7 &  \\
- \hline 8 &  \\
- \hline 9 &  \\
+ \hline 1 & \includegraphics[width=7.5cm]{colorange1} \\
+ \hline 2 & \includegraphics[width=7.5cm]{colorange2} \\
+ \hline 3 & \includegraphics[width=7.5cm]{colorange3} \\
+ \hline 4 & \includegraphics[width=7.5cm]{colorange4} \\
+ \hline 5 & \includegraphics[width=7.5cm]{colorange5} \\
+ \hline 6 & \includegraphics[width=7.5cm]{colbrown1} \\
+ \hline 7 & \includegraphics[width=7.5cm]{colbrown2} \\
+ \hline 8 & \includegraphics[width=7.5cm]{colbrown3} \\
+ \hline 9 & \includegraphics[width=7.5cm]{colbrown4} \\
 \hline
 \end{tabular}
 \end{table}
@@ -390,10 +397,10 @@
  \rowcolor{black}
  \textcolor{white}{\textbf{Attribute Value}} &
  \textcolor{white}{\textbf{Colour class and symbol}} \\
- \hline Arterial route &  \\
- \hline Main road &  \\
- \hline Secondary road &  \\
- \hline Street &  \\
+ \hline Arterial route & \includegraphics[width=7.5cm]{blueline} \\
+ \hline Main road & \includegraphics[width=7.5cm]{blackline} \\
+ \hline Secondary road & \includegraphics[width=7.5cm]{apricotline} \\
+ \hline Street & \includegraphics[width=7.5cm]{apricotdots} \\
 \hline
 \end{tabular}
 \end{table}

Modified: docs/trunk/english_us/gis_introduction/attributedata_images/Makefile
===================================================================
--- docs/trunk/english_us/gis_introduction/attributedata_images/Makefile	2009-07-12 00:13:10 UTC (rev 11047)
+++ docs/trunk/english_us/gis_introduction/attributedata_images/Makefile	2009-07-12 09:29:45 UTC (rev 11048)
@@ -28,7 +28,20 @@
     single_symbol_dialog_point.eps\
     unique_value_dialog.eps\
     unique_value_roads.eps\
- 
+    blueline.eps\
+    blackline.eps\
+    apricotline.eps\
+    apricotdots.eps\
+    colorange1.eps\
+    colorange2.eps\
+    colorange3.eps\
+    colorange4.eps\
+    colorange5.eps\
+    colbrown1.eps\
+    colbrown2.eps\
+    colbrown3.eps\
+    colbrown4.eps\
+
 #JPG=
 
 ##### TARGETS #####

Added: docs/trunk/english_us/gis_introduction/attributedata_images/apricotdots.png
===================================================================
(Binary files differ)


Property changes on: docs/trunk/english_us/gis_introduction/attributedata_images/apricotdots.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: docs/trunk/english_us/gis_introduction/attributedata_images/apricotline.png
===================================================================
(Binary files differ)


Property changes on: docs/trunk/english_us/gis_introduction/attributedata_images/apricotline.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: docs/trunk/english_us/gis_introduction/attributedata_images/blackline.png
===================================================================
(Binary files differ)


Property changes on: docs/trunk/english_us/gis_introduction/attributedata_images/blackline.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: docs/trunk/english_us/gis_introduction/attributedata_images/blueline.png
===================================================================
(Binary files differ)


Property changes on: docs/trunk/english_us/gis_introduction/attributedata_images/blueline.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: docs/trunk/english_us/gis_introduction/attributedata_images/colbrown1.png
===================================================================
(Binary files differ)


Property changes on: docs/trunk/english_us/gis_introduction/attributedata_images/colbrown1.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: docs/trunk/english_us/gis_introduction/attributedata_images/colbrown2.png
===================================================================
(Binary files differ)


Property changes on: docs/trunk/english_us/gis_introduction/attributedata_images/colbrown2.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: docs/trunk/english_us/gis_introduction/attributedata_images/colbrown3.png
===================================================================
(Binary files differ)


Property changes on: docs/trunk/english_us/gis_introduction/attributedata_images/colbrown3.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: docs/trunk/english_us/gis_introduction/attributedata_images/colbrown4.png
===================================================================
(Binary files differ)


Property changes on: docs/trunk/english_us/gis_introduction/attributedata_images/colbrown4.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: docs/trunk/english_us/gis_introduction/attributedata_images/colorange1.png
===================================================================
(Binary files differ)


Property changes on: docs/trunk/english_us/gis_introduction/attributedata_images/colorange1.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: docs/trunk/english_us/gis_introduction/attributedata_images/colorange2.png
===================================================================
(Binary files differ)


Property changes on: docs/trunk/english_us/gis_introduction/attributedata_images/colorange2.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: docs/trunk/english_us/gis_introduction/attributedata_images/colorange3.png
===================================================================
(Binary files differ)


Property changes on: docs/trunk/english_us/gis_introduction/attributedata_images/colorange3.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: docs/trunk/english_us/gis_introduction/attributedata_images/colorange4.png
===================================================================
(Binary files differ)


Property changes on: docs/trunk/english_us/gis_introduction/attributedata_images/colorange4.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: docs/trunk/english_us/gis_introduction/attributedata_images/colorange5.png
===================================================================
(Binary files differ)


Property changes on: docs/trunk/english_us/gis_introduction/attributedata_images/colorange5.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream