Changeset 3498

Timestamp:

Mar 14, 2013 8:01:36 AM (11 years ago)

Author:

ldelgass

Message:

Delay Rebuild until window size larger than 1x1 - copying this code from
VTK viewers to nanovis viewers. Helps get proper aspect for initial camera
reset. There is still a problem with the updir coming too late (needs to come
before camera reset).

Location:

trunk/gui/scripts

Files:

• flowvisviewer.tcl (modified) (3 diffs)
• nanovisviewer.tcl (modified) (2 diffs)
• vtkheightmapviewer.tcl (modified) (1 diff)

trunk/gui/scripts/flowvisviewer.tcl

@@ -1155 +1155 @@
 #
 itcl::body Rappture::FlowvisViewer::Rebuild {} {
-
-    # Hide all the isomarkers. Can't remove them. Have to remember the
-    # settings since the user may have created/deleted/moved markers.
-
-    foreach tf [array names _isomarkers] {
-        foreach m $_isomarkers($tf) {
-            $m visible no
-        }
-    }
-
-    set _first ""
+    set w [winfo width $itk_component(3dview)]
+    set h [winfo height $itk_component(3dview)]
+    if { $w < 2 || $h < 2 } {
+        $_dispatcher event -idle !rebuild
+        return
+    }
+
     # Turn on buffering of commands to the server.  We don't want to
     # be preempted by a server disconnect/reconnect (which automatically
     # generates a new call to Rebuild).   
     StartBufferingCommands
+
+    # Hide all the isomarkers. Can't remove them. Have to remember the
+    # settings since the user may have created/deleted/moved markers.
+
+    foreach tf [array names _isomarkers] {
+        foreach m $_isomarkers($tf) {
+            $m visible no
+        }
+    }
+
+    if { $_width != $w || $_height != $h || $_reset } {
+        set _width $w
+        set _height $h
+        $_arcball resize $w $h
+        Resize
+    }
+
+    set _first ""
 
     if { $_reset } {
@@ -1194 +1208 @@
             SendCmd "clientinfo [list $info]"
         }
-        set _width [winfo width $itk_component(3dview)]
-        set _height [winfo height $itk_component(3dview)]
-        Resize
     }
     foreach dataobj [get] {
@@ -1236 +1247 @@
 
     # Reset the camera and other view parameters
-    InitSettings isosurface grid axes volume outline light2side light transp
+    InitSettings light2side light transp isosurface grid axes volume outline
     
     # nothing to send -- activate the proper volume

trunk/gui/scripts/nanovisviewer.tcl

@@ -838 +838 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::NanovisViewer::Rebuild {} {
+    set w [winfo width $itk_component(3dview)]
+    set h [winfo height $itk_component(3dview)]
+    if { $w < 2 || $h < 2 } {
+        $_dispatcher event -idle !rebuild
+        return
+    }
 
     # Turn on buffering of commands to the server.  We don't want to
@@ -853 +859 @@
     }
 
+    if { $_width != $w || $_height != $h || $_reset } {
+        set _width $w
+        set _height $h
+        $_arcball resize $w $h
+        DoResize
+    }
     if { $_reset } {
-        set _width [winfo width $itk_component(3dview)]
-        set _height [winfo height $itk_component(3dview)]
-        DoResize
         if { $_reportClientInfo }  {
+            # Tell the server the name of the tool, the version, and
+            # dataset that we are rendering.  Have to do it here because
+            # we don't know what data objects are using the renderer until
+            # be get here.
             global env
 

trunk/gui/scripts/vtkheightmapviewer.tcl

@@ -859 +859 @@
     }
 
-    StartBufferingCommands
     # Turn on buffering of commands to the server.  We don't want to
     # be preempted by a server disconnect/reconnect (which automatically
     # generates a new call to Rebuild).   
+    StartBufferingCommands
+
     if { $_width != $w || $_height != $h || $_reset } {
         set _width $w