[GRASS-SVN] r69293 - grass-addons/grass7/vector/v.kriging

svn_grass at osgeo.org svn_grass at osgeo.org
Sun Aug 28 14:06:57 PDT 2016


Author: evas
Date: 2016-08-28 14:06:57 -0700 (Sun, 28 Aug 2016)
New Revision: 69293

Modified:
   grass-addons/grass7/vector/v.kriging/Makefile
   grass-addons/grass7/vector/v.kriging/v.kriging.html
Log:
v.kriging: html layout modified; Makefile with VPATH to the images

Modified: grass-addons/grass7/vector/v.kriging/Makefile
===================================================================
--- grass-addons/grass7/vector/v.kriging/Makefile	2016-08-28 08:29:45 UTC (rev 69292)
+++ grass-addons/grass7/vector/v.kriging/Makefile	2016-08-28 21:06:57 UTC (rev 69293)
@@ -7,6 +7,8 @@
 EXTRA_INC = $(VECT_INC) $(PROJINC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)
 
+VPATH=%.png images
+
 include $(MODULE_TOPDIR)/include/Make/Module.make
 
 default: cmd

Modified: grass-addons/grass7/vector/v.kriging/v.kriging.html
===================================================================
--- grass-addons/grass7/vector/v.kriging/v.kriging.html	2016-08-28 08:29:45 UTC (rev 69292)
+++ grass-addons/grass7/vector/v.kriging/v.kriging.html	2016-08-28 21:06:57 UTC (rev 69293)
@@ -75,26 +75,61 @@
 <table>
 	<tr>
 		<td>
-			<b>Fig. 1:</b> Experimental and theoretical variograms in horiontl and vertical direction<br>
-			left: whole region; middle: small region; right: small region with modified horizontal range
+			<b>Fig. 1:</b> Experimental and theoretical variograms in horizontal and vertical direction<br>
 		</td>
 	</tr>
 	<tr>
 		<td>
-			<img src="images/v_kriging_variogram_hz_100000.png" alt="var_hz_initial" style="float: left; width: 24%; margin-right: 1%; margin-bottom: 0.5em;">
-			<img src="images/small/v_kriging_variogram_hz_20000.png" alt="var_hz_small_initial" style="float: left; width: 24%; margin-right: 1%; margin-bottom: 0.5em;">
-			<img src="images/small/v_kriging_variogram_hz_15000.png" alt="var_hz_small_add" style="float: left; width: 24%; margin-right: 1%; margin-bottom: 0.5em;">
+			a) whole region (horizontal direction):
 		</td>
 	</tr>
-</table>
-
-<table>
 	<tr>
 		<td>
-			<img src="images/v_kriging_variogram_vertical_1600.png" alt="var_vert" style="float: left; width: 24%; margin-right: 1%; margin-bottom: 0.5em;">
-			<img src="images/small/v_kriging_variogram_vertical_1200.png" alt="var_vert_add" style="float: left; width: 24%; margin-left: 12%; margin-bottom: 0.5em;">
+			<img src="images/v_kriging_variogram_hz_100000.png" alt="var_hz_initial" style="float: left; width: 75%; margin-right: 1%; margin-bottom: 0.5em;">
 		</td>
 	</tr>
+	<tr>
+		<td>
+			b) small region (horizontal direction):
+		</td>
+	</tr>
+	<tr>
+		<td>
+			<img src="images/small/v_kriging_variogram_hz_20000.png" alt="var_hz_small_initial" style="float: left; width: 75%; margin-right: 1%; margin-bottom: 0.5em;">
+		</td>
+	</tr>
+	<tr>
+		<td>
+			c) small region with modified horizontal range (horizontal direction):
+		</td>
+	</tr>
+	<tr>
+		<td>	
+			<img src="images/small/v_kriging_variogram_hz_15000.png" alt="var_hz_small_add" style="float: left; width: 75%; margin-right: 1%; margin-bottom: 0.5em;">
+		</td>
+	</tr>
+	<tr>
+		<td>
+			d) whole region (vertical direction):
+		</td>
+	</tr>
+	<tr>
+		<td>
+			<img src="images/v_kriging_variogram_vertical_1600.png" alt="var_vert" style="float: left; width: 75%; 
+			margin-right: 1%; margin-bottom: 0.5em;">
+		</td>
+	</tr>
+	<tr>
+		<td>
+			e) small region (vertical direction):
+		</td>
+	</tr>
+	<tr>
+		<td>	
+			<img src="images/small/v_kriging_variogram_vertical_1200.png" alt="var_vert_add" style="float: left; width: 75%; 
+			margin-right: 1%; margin-bottom: 0.5em;">
+		</td>
+	</tr>
 </table>
 
 The final phase results into theoretical variogram and interpolated values of the 3D raster:
@@ -115,11 +150,44 @@
 <table>
 	<tr>
 		<td>
-			<img src="images/v_kriging_variogram_linear.png" alt="linear" style="float: left; width: 24%; margin-right: 1%; margin-bottom: 0.5em;">
-			<img src="images/v_kriging_variogram_exponential.png" alt="exponential" style="float: left; width: 24%; margin-right: 1%; margin-bottom: 0.5em;">
-			<img src="images/v_kriging_variogram_spherical.png" alt="spherical" style="float: left; width: 24%; margin-right: 1%; margin-bottom: 0.5em;">
-			<img src="images/v_kriging_variogram_gaussian.png" alt="gaussian" style="float: left; width: 24%; margin-right: 1%; margin-bottom: 0.5em;">
+			a) linear 
+		</td>
 	</tr>
+	<tr>
+		<td>
+			<img src="images/v_kriging_variogram_linear.png" alt="linear" style="float: left; width: 75%; margin-right: 1%; margin-bottom: 0.5em;">
+		</td>
+	</tr>
+	<tr>
+		<td>
+			b) exponential 
+		</td>
+	</tr>
+	<tr>
+		<td>	
+			<img src="images/v_kriging_variogram_exponential.png" alt="exponential" style="float: left; width: 75%; margin-right: 1%; margin-bottom: 0.5em;">
+		</td>
+	</tr>
+	<tr>
+		<td>
+			c) spherical 
+		</td>
+	</tr>
+	<tr>
+		<td>
+			<img src="images/v_kriging_variogram_spherical.png" alt="spherical" style="float: left; width: 75%; margin-right: 1%; margin-bottom: 0.5em;">
+		</td>
+	</tr>
+	<tr>
+		<td>
+			d) Gaussian 
+		</td>
+	</tr>
+	<tr>
+		<td>
+			<img src="images/v_kriging_variogram_gaussian.png" alt="gaussian" style="float: left; width: 75%; margin-right: 1%; margin-bottom: 0.5em;">
+		</td>
+	</tr>
 	<caption>
 		<b>Fig. 2:</b> Variogram modelling of the whole region with horizontal range of 100 000 m and vertical range of 1 600 m
 	</caption>
@@ -183,12 +251,44 @@
 <table>
 	<tr>
 		<td>
-			<img src="images/small/v_kriging_variogram_linear.png" alt="small_linear" style="float: left; width: 24%; margin-right: 1%; margin-bottom: 0.5em;">
-			<img src="images/small/v_kriging_variogram_exponential.png" alt="small_exp" style="float: left; width: 24%; margin-right: 1%; margin-bottom: 0.5em;">
-			<img src="images/small/v_kriging_variogram_spherical.png" alt="small_spher" style="float: left; width: 24%; margin-right: 1%; margin-bottom: 0.5em;">
-			<img src="images/small/v_kriging_variogram_gauss.png" alt="small_gauss" style="float: left; width: 24%; margin-right: 1%; margin-bottom: 0.5em;">
+			a) linear:
 		</td>
 	</tr>
+	<tr>
+		<td>
+			<img src="images/small/v_kriging_variogram_linear.png" alt="small_linear" style="float: left; width: 75%; margin-right: 1%; margin-bottom: 0.5em;">
+		</td>
+	</tr>
+	<tr>
+		<td>
+			b) exponential:
+		</td>
+	</tr>
+	<tr>
+		<td>		
+			<img src="images/small/v_kriging_variogram_exponential.png" alt="small_exp" style="float: left; width: 75%; margin-right: 1%; margin-bottom: 0.5em;">
+		</td>
+	</tr>
+	<tr>
+		<td>
+			c) spherical:
+		</td>
+	</tr>
+	<tr>
+		<td>
+			<img src="images/small/v_kriging_variogram_spherical.png" alt="small_spher" style="float: left; width: 75%; margin-right: 1%; margin-bottom: 0.5em;">
+		</td>
+	</tr>
+	<tr>
+		<td>
+			d) Gaussian:
+		</td>
+	</tr>
+	<tr>
+		<td>
+			<img src="images/small/v_kriging_variogram_gauss.png" alt="small_gauss" style="float: left; width: 75%; margin-right: 1%; margin-bottom: 0.5em;">
+		</td>
+	</tr>
 	<caption>
 		<b>Fig. 3:</b> Variogram modelling of small region with horizontal range of 20 000 m and vertical range of 1 200 m
 	</caption>
@@ -252,12 +352,44 @@
 <table>
 	<tr>
 		<td>
-			<img src="images/small/v_kriging_variogram_linear_1.png" alt="small_linear_1" style="float: left; width: 24%; margin-right: 1%; margin-bottom: 0.5em;">
-			<img src="images/small/v_kriging_variogram_exponential_1.png" alt="small_exp_1" style="float: left; width: 24%; margin-right: 1%; margin-bottom: 0.5em;">
-			<img src="images/small/v_kriging_variogram_spherical_1.png" alt="small_spher_1" style="float: left; width: 24%; margin-right: 1%; margin-bottom: 0.5em;">
-			<img src="images/small/v_kriging_variogram_gauss_1.png" alt="small_gauss_1" style="float: left; width: 24%; margin-right: 1%; margin-bottom: 0.5em;">
+			a) linear		
+		</td>	
+	</tr>
+	<tr>
+		<td>
+			<img src="images/small/v_kriging_variogram_linear_1.png" alt="small_linear_1" style="float: left; width: 75%; margin-right: 1%; margin-bottom: 0.5em;">
 		</td>
 	</tr>
+	<tr>
+		<td>
+			b) exponential		
+		</td>	
+	</tr>
+	<tr>
+		<td>		
+			<img src="images/small/v_kriging_variogram_exponential_1.png" alt="small_exp_1" style="float: left; width: 75%; margin-right: 1%; margin-bottom: 0.5em;">
+		</td>
+	</tr>
+	<tr>
+		<td>
+			c) spherical		
+		</td>	
+	</tr>
+	<tr>
+		<td>
+			<img src="images/small/v_kriging_variogram_spherical_1.png" alt="small_spher_1" style="float: left; width: 75%; margin-right: 1%; margin-bottom: 0.5em;">
+		</td>
+	</tr>
+	<tr>
+		<td>
+			d) Gaussian		
+		</td>	
+	</tr>
+	<tr>
+		<td>
+			<img src="images/small/v_kriging_variogram_gauss_1.png" alt="small_gauss_1" style="float: left; width: 75%; margin-right: 1%; margin-bottom: 0.5em;">
+		</td>
+	</tr>
 	<caption>
 		<b>Fig. 4:</b> Variogram modelling of small region with horizontal range of 15 000 m and vertical range of 1 200 m
 	</caption>



More information about the grass-commit mailing list