Changeset 4169

Timestamp:

Feb 6, 2014, 2:03:40 PM (11 years ago)

Author:

ldelgass

Message:

Collapse Field2DResult and Field3DResult into FieldResult? and rely on Field
object to set default viewer appropriately. Also, don't try to fall back to
old Tcl VTK contour viewer. We should probably show the user an appropriate
error message if we don't have a valid viewer (which really shouldn't ever
happen). If no server can be reached, should we leave it to the specific
viewer widget to handle the error or should we delete the viewer and bubble
the error up to the FieldResult? widget?

Location:

trunk/gui/scripts

Files:

• Makefile.in (modified) (1 diff)
• field2dresult.tcl (deleted)
• field3dresult.tcl (deleted)
• fieldresult.tcl (added)
• resultviewer.tcl (modified) (1 diff)
• sequenceresult.tcl (modified) (1 diff)

trunk/gui/scripts/Makefile.in

@@ -51 +51 @@
                 $(srcdir)/energyLevels.tcl \
                 $(srcdir)/field.tcl \
-                $(srcdir)/field2dresult.tcl \
-                $(srcdir)/field3dresult.tcl \
+                $(srcdir)/fieldresult.tcl \
                 $(srcdir)/filechoiceentry.tcl \
                 $(srcdir)/filelistentry.tcl \

trunk/gui/scripts/resultviewer.tcl

@@ -307 +307 @@
                     }
                 }
-                2D {
-                    set mode "field2d"
-                    set viewer [$dataobj viewer]
-                    set extents [$dataobj extents]
-                    if { $extents > 1 } {
-                        set mode "flowvis"
-                    }
-                    if {![info exists _mode2widget($mode)]} {
-                        set w $itk_interior.$mode
-                        if { ![winfo exists $w] } {
-                            Rappture::Field2DResult $w -mode $viewer
-                        }
-                        set _mode2widget($mode) $w
-                    }
-                }
-                3D {
+                default {
                     set mode [$dataobj viewer]
-                    set extents [$dataobj extents]
-                    if { $extents > 1 } {
-                        set mode "flowvis"
-                    }
                     if {![info exists _mode2widget($mode)]} {
                         set w $itk_interior.$mode
-                        Rappture::Field3DResult $w -mode $mode
+                        if { ![winfo exists $w] } {
+                            Rappture::FieldResult $w -mode $mode
+                        }
                         set _mode2widget($mode) $w
                     }
-                }
-                default {
-                    puts stderr "WARNING: can't handle \"$dims\" dimension field"
-                    return
                 }
             }

trunk/gui/scripts/sequenceresult.tcl

@@ -493 +493 @@
                 }
                 set mode [$dataobj viewer]
-                switch -- $dimensions {
-                    2D {
-                        Rappture::Field2DResult $w -mode $mode
-                    }
-                    3D {
-                        Rappture::Field3DResult $w -mode $mode
-                    }
-                    default {
-                        error "don't know how to view sequences of $type\
-                            with \"$dimensions\" dimensions dim=[$dataobj components -dimensions]"
-                    }
-                }
+                FieldResult $w -mode $mode
                 pack $w -expand yes -fill both
             }