feat: specify frequency limit on dyn windrose

akrherz · Oct 28, 2023 · c135980 · c135980
1 parent 29f8154
commit c135980
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/cgi-bin/mywindrose.py b/cgi-bin/mywindrose.py
@@ -124,8 +124,9 @@ def application(environ, start_response):
         nsector = 36
 
     rmax = None
-    if "staticrange" in environ and environ["staticrange"] == "1":
-        rmax = 100
+    if "staticrange" in environ:
+        val = int(environ["staticrange"])
+        rmax = val if (1 < val < 100) else 100
 
     nt = NetworkTable(network, only_online=False)
     if station not in nt.sts:

diff --git a/htdocs/sites/dyn_windrose.phtml b/htdocs/sites/dyn_windrose.phtml
@@ -49,6 +49,7 @@ $minute1 = get_int404("minute1", 0);
 $minute2 = get_int404("minute2", 0);
 $units = isset($_GET["units"]) ? xssafe($_GET["units"]) : "mph";
 $nsector = get_int404('nsector', 36);
+$staticrange = get_int404('staticrange', 0);
 $level = isset($_GET["level"]) ? floatval($_GET['level']) : 1000;
 $fmt = isset($_GET["fmt"]) ? xssafe($_GET["fmt"]) : 'png';
 $conv = isset($_GET["conv"]) ? xssafe($_GET["conv"]) : "from";
@@ -87,8 +88,8 @@ if (isset($_GET["hour1"])) {
     if (isset($_GET["hourrangelimit"])) {
         $rose_uri .= "&amp;hourrangelimit=1";
     }
-    if (isset($_GET["staticrange"])) {
-        $rose_uri .= "&amp;staticrange=1";
+    if ($staticrange > 1 && $staticrange < 101) {
+        $rose_uri .= "&amp;staticrange={$staticrange}";
     }
     if ($network == 'RAOB') {
         $rose_uri .= "&amp;level=" . $level;
@@ -198,9 +199,12 @@ $content .= '<br /><input type="checkbox" name="hourrangelimit" value="1" ';
 if (isset($_GET["hourrangelimit"])) $content .= "checked=\"checked\" ";
 $content .= 'id="r3"> <label for="r3">3. Limit to Range of hours given by start and end time</label>';
 
-$content .= '<br /><input type="checkbox" name="staticrange" value="1" ';
-if (isset($_GET["staticrange"])) $content .= "checked=\"checked\" ";
-$content .= 'id="o1"> <label for="o1">Optional: Hard code the frequency axis limit to 100%</label>';
+$content .= <<<EOM
+<br />
+<input type="text" name="staticrange" value="{$staticrange}" size="3"
+ id="staticrange">
+<label for="staticrange">Specify frequency axis limit (1-100%) (0 represents auto-scale).</label>
+EOM;
 
 // Allow setting of wind speed bins
 $missive = <<<EOM