Changeset 4481 for branches/1.3/gui/scripts

Timestamp:

Jul 10, 2014 6:08:15 AM (10 years ago)

Author:

ldelgass

Message:

Merge r4169,r4344 from trunk: merge field 2D/3D result, add VTK surface viewer

Location:

branches/1.3

Files:

• . (modified) (1 prop)
• gui/scripts/Makefile.in (modified) (2 diffs)
• gui/scripts/field2dresult.tcl (deleted)
• gui/scripts/field3dresult.tcl (deleted)
• gui/scripts/fieldresult.tcl (copied) (copied from trunk/gui/scripts/fieldresult.tcl) (3 diffs)
• gui/scripts/resultviewer.tcl (modified) (1 diff)
• gui/scripts/sequenceresult.tcl (modified) (1 diff)
• gui/scripts/vtkglyphviewer.tcl (modified) (5 diffs)
• gui/scripts/vtksurfaceviewer.tcl (copied) (copied from trunk/gui/scripts/vtksurfaceviewer.tcl)

branches/1.3/gui/scripts/Makefile.in

@@ -51 +51 @@
                 $(srcdir)/energyLevels.tcl \
                 $(srcdir)/field.tcl \
-                $(srcdir)/field2dresult.tcl \
-                $(srcdir)/field3dresult.tcl \
+                $(srcdir)/fieldresult.tcl \
                 $(srcdir)/filexfer.tcl \
                 $(srcdir)/flowdial.tcl \
@@ -135 +134 @@
                 $(srcdir)/vtkmeshviewer.tcl \
                 $(srcdir)/vtkstreamlinesviewer.tcl \
+                $(srcdir)/vtksurfaceviewer.tcl \
                 $(srcdir)/vtkvolumeviewer.tcl \
                 $(srcdir)/vtkheightmapviewer.tcl \

branches/1.3/gui/scripts/fieldresult.tcl

@@ -61 +61 @@
             set servers [Rappture::VisViewer::GetServerList "nanovis"]
         }
-        "contour" - "glyphs" - "heightmap" - "isosurface" - "streamlines" - "vtkimage" - "vtkviewer" - "vtkvolume" {
+        "contour" - "glyphs" - "heightmap" - "isosurface" - "streamlines" - "surface" - "vtkimage" - "vtkviewer" - "vtkvolume" {
             set servers [Rappture::VisViewer::GetServerList "vtkvis"]
         }
@@ -87 +87 @@
             "contour" - "heightmap" {
                 itk_component add renderer {
-                    Rappture::VtkHeightmapViewer $itk_interior.ren \
-                        $servers -mode $flags(-mode)
+                    Rappture::VtkHeightmapViewer $itk_interior.ren $servers \
+                        -mode $flags(-mode)
                 }
             }
@@ -99 +99 @@
                 itk_component add renderer {
                     Rappture::VtkStreamlinesViewer $itk_interior.ren $servers
+                }
+            }
+            "surface" {
+                itk_component add renderer {
+                    Rappture::VtkSurfaceViewer $itk_interior.ren $servers
                 }
             }

branches/1.3/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
                         if { ![winfo exists $w] } {
-                            Rappture::Field3DResult $w -mode $mode
+                            Rappture::FieldResult $w -mode $mode
                         }
                         set _mode2widget($mode) $w
                     }
-                }
-                default {
-                    puts stderr "WARNING: can't handle \"$dims\" dimension field"
-                    return
                 }
             }

branches/1.3/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
             }

branches/1.3/gui/scripts/vtkglyphviewer.tcl

@@ -1 +1 @@
 # -*- mode: tcl; indent-tabs-mode: nil -*- 
-
 # ----------------------------------------------------------------------
 #  COMPONENT: vtkglyphviewer - Vtk 3D glyphs object viewer
@@ -8 +7 @@
 # ======================================================================
 #  AUTHOR:  Michael McLennan, Purdue University
-#  Copyright (c) 2004-2005  Purdue Research Foundation
+#  Copyright (c) 2004-2014  HUBzero Foundation, LLC
 #
 #  See the file "license.terms" for information on usage and
@@ -1478 +1477 @@
 itcl::body Rappture::VtkGlyphViewer::RequestLegend {} {
     set _legendPending 0
-    if { ![info exists _fields($_curFldName)] } {
-        return
-    }
+    set font "Arial 8"
+    set w 12
+    set lineht [font metrics $font -linespace]
+    # color ramp height = (canvas height) - (min and max value lines) - 2 
+    set h [expr {$_height - 2 * ($lineht + 2)}]
+
     set fname $_curFldName
-    set font "Arial 8"
-    set lineht [font metrics $font -linespace]
-    set w 12
-    set h [expr {$_height - 2 * ($lineht + 2)}]
-    if { $h < 1 } {
-        return
-    }
     if { [string match "component*" $fname] } {
         set title ""
@@ -1504 +1499 @@
     if { $title != "" } {
         incr h -$lineht 
+    }
+    if { $h < 1 } {
+        return
     }
     # Set the legend on the first heightmap dataset.
@@ -2299 +2297 @@
         # If there's a legend title, create a text item for the title.
         $c create text $x $y \
-                -anchor ne \
-                -fill $itk_option(-plotforeground) -tags "title legend" \
-                -font $font 
-            incr y $lineht
+            -anchor ne \
+            -fill $itk_option(-plotforeground) -tags "title legend" \
+            -font $font 
+        if { $title != "" } {
+            incr y $lineht
+        }
         $c create text $x $y \
-            -anchor ne \
-            -fill $itk_option(-plotforeground) -tags "vmax legend" \
-            -font $font
+            -anchor ne \
+            -fill $itk_option(-plotforeground) -tags "vmax legend" \
+            -font $font
         incr y $lineht
         $c create image $x $y \
-            -anchor ne \
-            -image $_image(legend) -tags "colormap legend"
+            -anchor ne \
+            -image $_image(legend) -tags "colormap legend"
         $c create rectangle $x $y 1 1 \
-            -fill "" -outline "" -tags "sensor legend"
+            -fill "" -outline "" -tags "sensor legend"
         $c create text $x [expr {$h-2}] \
-            -anchor se \
-            -fill $itk_option(-plotforeground) -tags "vmin legend" \
-            -font $font
+            -anchor se \
+            -fill $itk_option(-plotforeground) -tags "vmin legend" \
+            -font $font
         $c bind sensor <Enter> [itcl::code $this EnterLegend %x %y]
         $c bind sensor <Leave> [itcl::code $this LeaveLegend]