Changeset 4267 for trunk

Timestamp:

Mar 25, 2014, 6:32:12 PM (11 years ago)

Author:

ldelgass

Message:

Remove geoviewer, update test to use mapviewer

Location:

trunk/gui

Files:

• apps/geoviewer-test (modified) (6 diffs)
• scripts/Makefile.in (modified) (1 diff)
• scripts/geoviewer.tcl (deleted)

trunk/gui/apps/geoviewer-test

@@ -2 +2 @@
 # -*- mode: Tcl -*-
 # ----------------------------------------------------------------------
-#  TEST PROGRAM for GeoViewer
+#  TEST PROGRAM for MapViewer
 #
 #  This program is a test harness for the GeoVis visualization
@@ -130 +130 @@
         set cmd $last_command
     }
-    namespace eval Rappture::GeoViewer [list $widgets(geoviewer) SendCmd $cmd]
+    namespace eval Rappture::MapViewer [list $widgets(mapviewer) SendCmd $cmd]
     $widgets(command) delete 0 end
 }
@@ -142 +142 @@
 proc reset {} {
     global widgets
-    $widgets(geoviewer) delete
-    $widgets(geoviewer) disconnect
+    $widgets(mapviewer) delete
+    $widgets(mapviewer) disconnect
     $widgets(comm) configure -state normal
     $widgets(comm) delete 1.0 end
@@ -194 +194 @@
     global widgets images
 
-    set imh [$widgets(geoviewer) get -image $images(which)]
+    set imh [$widgets(mapviewer) get -image $images(which)]
 
     set file [tk_getSaveFile -title "Save Image File" \
@@ -223 +223 @@
     set h [winfo height $c]
 
-    set imh [$widgets(geoviewer) get -image $images(which)]
+    set imh [$widgets(mapviewer) get -image $images(which)]
     set iw [image width $imh]
     set ih [image height $imh]
@@ -287 +287 @@
 set f [.main pane 0]
 set servers [Rappture::VisViewer::GetServerList "geovis"]
-Rappture::GeoViewer $f.viewer $servers
+Rappture::MapViewer $f.viewer $servers
 pack $f.viewer -expand yes -fill both
-set widgets(geoviewer) $f.viewer
+set widgets(mapviewer) $f.viewer
 
 $f.viewer configure \

trunk/gui/scripts/Makefile.in

@@ -60 +60 @@
                 $(srcdir)/flowvisviewer.tcl \
                 $(srcdir)/gauge.tcl \
-                $(srcdir)/geoviewer.tcl \
                 $(srcdir)/getopts.tcl \
                 $(srcdir)/grab.tcl \