# HG changeset patch
# User Tom Henderson <tomh@tomh.org>
# Date 1452960880 28800
# Node ID 9142266fbb253e2db0a283111d8ea1cc29a74e65
# Parent  085c4ff7a60f57851b7e2b7aaaa76e62703b1eb2
add figures to main documentation build

diff -r 085c4ff7a60f -r 9142266fbb25 doc/models/Makefile
--- a/doc/models/Makefile	Thu Jan 14 14:23:17 2016 -0800
+++ b/doc/models/Makefile	Sat Jan 16 08:14:40 2016 -0800
@@ -109,6 +109,8 @@
 	$(SRC)/internet/doc/routing-specialization.dia \
 	$(SRC)/wifi/doc/source/figures/WifiArchitecture.dia \
 	$(SRC)/wifi/doc/source/figures/snir.dia \
+	$(SRC)/wifi/doc/source/figures/clear-channel.eps \
+	$(SRC)/wifi/doc/source/figures/nist-frame-success-rate.eps \
 	$(SRC)/wimax/doc/WimaxArchitecture.dia \
 	$(SRC)/lte/doc/source/figures/epc-ctrl-arch.dia \
 	$(SRC)/lte/doc/source/figures/epc-data-flow-dl.dia \
@@ -352,7 +354,9 @@
 	$(FIGURES)/lr-wpan-arch.eps \
 	$(FIGURES)/802-15-4-ber.eps \
 	$(FIGURES)/802-15-4-per-sens.eps \
-	$(FIGURES)/802-15-4-psr-distance.eps 
+	$(FIGURES)/802-15-4-psr-distance.eps \
+	$(FIGURES)/clear-channel.eps \
+	$(FIGURES)/nist-frame-success-rate.eps
 
 # rescale pdf figures as necessary
 $(FIGURES)/testbed.pdf_width = 5in
@@ -405,6 +409,8 @@
 $(FIGURES)/spectrum-tv-rand-geo-points.pdf_width = 8cm
 $(FIGURES)/lr-wpan-primitives.pdf_width = 3in
 $(FIGURES)/lr-wpan-arch.pdf_width = 2in
+$(FIGURES)/clear-channel.pdf_width = 12cm
+$(FIGURES)/nist-frame-success-rate.pdf_width = 12cm
 
 IMAGES_PNG = ${IMAGES_EPS:.eps=.png}
 IMAGES_PDF = ${IMAGES_EPS:.eps=.pdf}
diff -r 085c4ff7a60f -r 9142266fbb25 src/wifi/doc/Makefile
--- a/src/wifi/doc/Makefile	Thu Jan 14 14:23:17 2016 -0800
+++ b/src/wifi/doc/Makefile	Sat Jan 16 08:14:40 2016 -0800
@@ -1,8 +1,7 @@
 EPSTOPDF = epstopdf
 DIA = dia
 DOT = dot
-CONVERT = convert -density 250
-
+CONVERT = convert -density 120
 
 SOURCE = source
 FIGURES = $(SOURCE)/figures
diff -r 085c4ff7a60f -r 9142266fbb25 src/wifi/doc/source/wifi-testing.rst
--- a/src/wifi/doc/source/wifi-testing.rst	Thu Jan 14 14:23:17 2016 -0800
+++ b/src/wifi/doc/source/wifi-testing.rst	Sat Jan 16 08:14:40 2016 -0800
@@ -36,7 +36,6 @@
 
 .. figure:: figures/clear-channel.*
    :align: center
-   :width: 80%
 
    Clear channel (AWGN) error model for 802.11b
 
@@ -50,7 +49,6 @@
 
 .. figure:: figures/nist-frame-success-rate.*
    :align: center
-   :width: 80%
 
    Frame error rate (NIST model) for OFDM Wi-Fi