Changeset 4760 for branches/1.3

Timestamp:

Nov 22, 2014, 10:51:31 PM (10 years ago)

Author:

ldelgass

Message:

remove experimental map support from release branch

Location:

branches/1.3/gui

Files:

• apps/Makefile.in (modified) (1 diff)
• apps/mapviewer-test (deleted)
• scripts/Makefile.in (modified) (1 diff)
• scripts/analyzer.tcl (modified) (1 diff)
• scripts/images/layers.png (deleted)
• scripts/map.tcl (deleted)
• scripts/mapviewer.tcl (deleted)
• scripts/resultviewer.tcl (modified) (2 diffs)

branches/1.3/gui/apps/Makefile.in

@@ -25 +25 @@
                 encodedata \
                 $(srcdir)/launcher.tcl \
-                $(srcdir)/mapviewer-test \
                 $(srcdir)/grabdata \
                 $(srcdir)/nanovis-test \

branches/1.3/gui/scripts/Makefile.in

@@ -77 +77 @@
                 $(srcdir)/main.tcl \
                 $(srcdir)/mainwin.tcl \
-                $(srcdir)/map.tcl \
-                $(srcdir)/mapviewer.tcl \
                 $(srcdir)/mesh.tcl \
                 $(srcdir)/meshresult.tcl \

branches/1.3/gui/scripts/analyzer.tcl

@@ -806 +806 @@
                         _autoLabel $xmlobj output.$item "String" counters
                     }
-                    histogram* - curve* - field* - map* {
+                    histogram* - curve* - field* {
                         _autoLabel $xmlobj output.$item "Plot" counters
                     }

branches/1.3/gui/scripts/resultviewer.tcl

@@ -293 +293 @@
             }
         }
-        ::Rappture::Map {
-            if { ![$dataobj isvalid] } {
-                return;                 # Ignore invalid map objects.
-            }
-            set mode "map"
-            if {![info exists _mode2widget($mode)]} {
-                set servers [Rappture::VisViewer::GetServerList "geovis"]
-                set w $itk_interior.$mode
-                Rappture::MapViewer $w $servers
-                set _mode2widget($mode) $w
-            }
-        }
         ::Rappture::Field {
             if { ![$dataobj isvalid] } {
@@ -493 +481 @@
             set dobj [Rappture::Field ::#auto $xmlobj $path]
         }
-        map {
-            set dobj [Rappture::Map ::#auto $xmlobj $path]
-        }
         mesh {
             set dobj [Rappture::Mesh ::#auto $xmlobj $path]