meso-web

commit 2008410fc549a818d58027932eab2e0860624f2b
parent 59d90711685335f16faf1352f053429c08c509ad
Author: Vincent Forest <vincent.forest@meso-star.com>
Date:   Tue, 31 Aug 2021 09:47:17 +0200

Add images to the htrdr Athmosphere SPK page

Add renderings of the DZVAR_ortho scene and of the city_thin_lens scene.

Diffstat:
A
htrdr/DZVAR_ortho.jpg
 | 
2
++
A
htrdr/city_thin_lens.jpg
 | 
2
++
M
htrdr/htrdr.sh
 | 
47
+++++++++++++++++++++++++++++++++++++++++++++--

3 files changed, 49 insertions(+), 2 deletions(-)
diff --git a/htrdr/DZVAR_ortho.jpg b/htrdr/DZVAR_ortho.jpg
@@ -0,0 +1 @@
+#$# git-wad 16ac882503e76e5c1a20b6a22148b797d995bf4c0d62b6783c203d093c0dd992 393861
+\ No newline at end of file
diff --git a/htrdr/city_thin_lens.jpg b/htrdr/city_thin_lens.jpg
@@ -0,0 +1 @@
+#$# git-wad c0d4e1e5d218ebb2e6b905f0a6f6add4fd9a048102b481800079396ba9d6aee6 469088
+\ No newline at end of file
diff --git a/htrdr/htrdr.sh b/htrdr/htrdr.sh
@@ -135,9 +135,22 @@ intro=$(cat $dir_temp/$htrdr_atmspk/README.html \
   | sed 1d \
   | sed '/^<h2>Content<\/h2>/,$d')
 
-content=$(cat $dir_temp/$htrdr_atmspk/README.html \
+#content=$(cat $dir_temp/$htrdr_atmspk/README.html \
+#  | sed '/^<h2>Content<\/h2>/,$!d' \
+#  | sed 1d \
+#  | sed '/^<h2>Quick start<\/h2>/,$d')
+
+content1=$(cat $dir_temp/$htrdr_atmspk/README.html \
   | sed '/^<h2>Content<\/h2>/,$!d' \
   | sed 1d \
+  | sed '/^<h3>Geometries<\/h3>/,$d')
+
+content2=$(cat $dir_temp/$htrdr_atmspk/README.html \
+  | sed '/^<h3>Geometries<\/h3>/,$!d' \
+  | sed '/^<h3>Ground materials<\/h3>/,$d')
+
+content3=$(cat $dir_temp/$htrdr_atmspk/README.html \
+  | sed '/^<h3>Ground materials<\/h3>/,$!d' \
   | sed '/^<h2>Quick start<\/h2>/,$d')
 
 release_notes=$(cat $dir_temp/$htrdr_atmspk/README.html \
@@ -183,7 +196,29 @@ archs+=" $(find downloads -regex ".*/High-Tune-Starter-Pack.*\.tar.gz" | sort -r
   echo "  </div>"
   echo "</div>"
 
-  echo $content
+  echo $content1
+
+  echo "<div class=\"img\" style=\"margin-top:3em; width: 17em;\">"
+  echo "  <a href=\"city_thin_lens.jpg\"><img src=\"city_thin_lens.jpg\" alt=\"city_thin_lens\"></a>"
+  echo "  <div class=\"caption\">"
+  echo "  The image of the scene city_thin_lens rendered with"
+  echo "  <code>htrdr-atmosphere</code>. The thin lens camera used in this"
+  echo "  rendering focuses on background elements; the foreground vegetation"
+  echo "  is out of focus."
+  echo "  </div>"
+  echo "</div>"
+
+  echo $content2
+
+  echo "<div class=\"img\" style=\"margin-top:3em; width: 13em;\">"
+  echo "  <a href=\"DZVAR_ortho.jpg\"><img src=\"DZVAR_ortho.jpg\" alt=\"DZVAR_ortho\"></a>"
+  echo "  <div class=\"caption\">"
+  echo "  Image of the DZVAR cloud field rendered from the top of the"
+  echo "  atmosphere with an orthographic camera."
+  echo "  </div>"
+  echo "</div>"
+
+  echo $content3
 
   echo "<h2>Install and run</h2>"
   echo ""
@@ -259,6 +294,7 @@ content=$(cat $dir_temp/$htrdr_comspk/README.html \
   | sed 1d \
   | sed '0,/<code>htrdr<\/code>/s//<a href=man\/man1\/htrdr.1.html>htrdr<\/a>/' \
   | sed '0,/<code>htrdr-combustion<\/code>/s//<a href=man\/man1\/htrdr-combustion.1.html>htrdr-combustion<\/a>/' \
+  | sed 's/PPM image than/PPM image that/' \
   | sed '/^<h2>Copyright notice<\/h2>/,$d')
 
 copying=$(cat $dir_temp/$htrdr_comspk/README.html \
@@ -337,6 +373,13 @@ for((i=0; i<${#htrdr_man_pages[@]}; ++i)); do
   if [ "$man_name" == "htrdr-combustion" ]; then
     # Fix typos and misspellings
     sed -i 's/\<spectrallyole\>/spectrally/g' $output
+    sed -i 's/Be default,/By default,/g' $output
+  fi
+
+  if [ "$man_name" == "htrdr-atmosphere" ]; then
+    # Fix typos and misspellings
+    sed -i 's/\<spectrallyole\>/spectrally/g' $output
+    sed -i 's/Be default,/By default,/g' $output
   fi
 done