Changeset 5121 for branches/uq/gui/scripts/resultviewer.tcl

Timestamp:

Mar 11, 2015, 10:26:15 AM (10 years ago)

Author:

dkearney

Message:

merging updates from 1.3 branch

looks like this branch originally came from the 1.3 branch and then had some
additions from the 1.4-pre branch and then a sync from the 1.3 branch. to get
this branch updated, I am reverting r4797 (additions from 1.4-pre branch),
reverting r4798 (additions from 1.3 branch), then merging in updates from 1.3
branch.

I fixed merge conflicts for the following files:

gui/scripts/gauge.tcl
gui/scripts/main.tcl
gui/scripts/tool.tcl
lang/tcl/scripts/task.tcl

Location:

branches/uq

Files:

• . (modified) (1 prop)
• gui/scripts/resultviewer.tcl (modified) (2 diffs)

branches/uq/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]