Changeset 6657

Timestamp:

Dec 5, 2016 12:58:07 PM (8 years ago)

Author:

ldelgass

Message:

add ephemeris time map style setting

Location:

trunk/gui/scripts

Files:

• map.tcl (modified) (1 diff)
• mapviewer.tcl (modified) (4 diffs)

trunk/gui/scripts/map.tcl

@@ -614 +614 @@
     foreach key [array names styleinfo] {
         set valid 0
-        foreach validkey {-ambient -color -edgecolor -edges -lighting -linewidth -vertscale -wireframe} {
+        foreach validkey {-ambient -color -edgecolor -edges -lighting -linewidth -time -vertscale -wireframe} {
             if {$key == $validkey} {
                 set valid 1

trunk/gui/scripts/mapviewer.tcl

@@ -92 +92 @@
     private method Camera {option args}
     private method Connect {}
+    private method ConvertTime { timeval }
     private method CurrentLayers {args}
     private method DisablePanningMouseBindings {}
@@ -2654 +2655 @@
 }
 
+# Convert from Tcl integer epoch time value to hours as a double
+itcl::body Rappture::MapViewer::ConvertTime { timeval } {
+    set hrs [clock format $timeval -format %k -gmt 1]
+    set min [clock format $timeval -format %M -gmt 1]
+    set sec [clock format $timeval -format %S -gmt 1]
+    set val [expr {$hrs + $min/60.0 + $sec/3600.0}]
+}
+
 itcl::body Rappture::MapViewer::SetTerrainStyle { style } {
     array set settings {
@@ -2662 +2671 @@
         -lighting 1
         -linewidth 1.0
+        -time now
         -vertscale 1.0
         -wireframe 0
@@ -2673 +2683 @@
     SendCmd "map terrain color [Color2RGB $settings(-color)]"
     #SendCmd "map terrain colormode constant"
+    if {$settings(-time) eq "now"} {
+        set settings(-time) [ConvertTime [clock seconds]]
+    } else {
+        set settings(-time) [ConvertTime [clock scan $settings(-time) -gmt 1]]
+    }
+    SendCmd "map time $settings(-time)"
+    set _settings(time) $settings(-time)
     SendCmd "map terrain lighting $settings(-lighting)"
     set _settings(terrain-lighting) $settings(-lighting)