Changeset 4766 for branches/1.3/gui/scripts/vtkvolumeviewer.tcl

Timestamp:

Nov 23, 2014 1:12:25 AM (9 years ago)

Author:

ldelgass

Message:

merge r4765 from trunk

Location:

branches/1.3

Files:

• . (modified) (1 prop)
• gui/scripts/vtkvolumeviewer.tcl (modified) (8 diffs)

branches/1.3/gui/scripts/vtkvolumeviewer.tcl

@@ -62 +62 @@
     public method scale {args}
 
-    private method SetOrientation { side }
-    private method ViewToQuaternion {} { 
-        return [list $_view(-qw) $_view(-qx) $_view(-qy) $_view(-qz)]
-    }
-    private method QuaternionToView { q } { 
-        foreach { _view(-qw) _view(-qx) _view(-qy) _view(-qz) } $q break
-    }
-
-    protected method Connect {}
-    protected method CurrentDatasets {args}
-    protected method Disconnect {}
-    protected method DoResize {}
-    protected method DoRotate {}
-    protected method AdjustSetting {what {value ""}}
-    protected method InitSettings { args  }
-    protected method Pan {option x y}
-    protected method Pick {x y}
-    protected method Rebuild {}
-    protected method ReceiveDataset { args }
-    protected method ReceiveImage { args }
-    protected method ReceiveLegend { colormap title vmin vmax size }
-    protected method Rotate {option x y}
-    protected method Zoom {option}
-
     # The following methods are only used by this class.
+    private method AdjustSetting {what {value ""}}
     private method BuildAxisTab {}
     private method BuildCameraTab {}
@@ -95 +72 @@
     private method BuildVolumeTab {}
     private method DrawLegend {}
+    private method ChangeColormap { dataobj comp color }
     private method Combo { option }
+    private method Connect {}
+    private method CurrentDatasets {args}
+    private method Disconnect {}
+    private method DoResize {}
+    private method DoRotate {}
     private method EnterLegend { x y } 
     private method EventuallyResize { w h } 
@@ -103 +86 @@
     private method GetImage { args } 
     private method GetVtkData { args } 
+    private method InitSettings { args  }
     private method IsValidObject { dataobj } 
     private method LeaveLegend {}
-    private method MotionLegend { x y } 
+    private method MotionLegend { x y }
+    private method Pan {option x y}
     private method PanCamera {}
+    private method Pick {x y}
+    private method QuaternionToView { q } { 
+        foreach { _view(-qw) _view(-qx) _view(-qy) _view(-qz) } $q break
+    }
+    private method Rebuild {}
+    private method ReceiveDataset { args }
+    private method ReceiveImage { args }
+    private method ReceiveLegend { colormap title vmin vmax size }
     private method RequestLegend {}
     private method SetColormap { dataobj comp }
-    private method ChangeColormap { dataobj comp color }
+    private method Rotate {option x y}
     private method SetLegendTip { x y }
     private method SetObjectStyle { dataobj comp } 
+    private method SetOrientation { side }
     private method Slice {option args} 
+    private method ViewToQuaternion {} { 
+        return [list $_view(-qw) $_view(-qx) $_view(-qy) $_view(-qz)]
+    }
+    private method Zoom {option}
 
     private variable _arcball ""
@@ -206 +204 @@
     # Initialize the view to some default parameters.
     array set _view {
+        -ortho           0
         -qw              0.853553
         -qx              -0.353553
         -qy              0.353553
         -qz              0.146447
-        -zoom            1.0 
         -xpan            0
         -ypan            0
-        -ortho           0
+        -zoom            1.0 
     }
     set _arcball [blt::arcball create 100 100]
@@ -377 +375 @@
     bind $itk_component(view) <ButtonRelease-1> \
         [itcl::code $this Rotate release %x %y]
-    bind $itk_component(view) <Configure> \
-        [itcl::code $this EventuallyResize %w %h]
 
     # Bindings for panning via mouse
@@ -986 +982 @@
                     lappend info "dataset_size"  $length
                     lappend info "dataset_tag"   $tag
-                    SendCmd [list "clientinfo" $info]
-                }
-                append _outbuf "dataset add $tag data follows $length\n"
+                    SendCmd "clientinfo [list $info]"
+                }
+                SendCmd "dataset add $tag data follows $length"
                 append _outbuf $bytes
                 set _datasets($tag) 1
@@ -1135 +1131 @@
                 -qy      0.353553
                 -qz      0.146447
+                -xpan    0
+                -ypan    0
                 -zoom    1.0
-                -xpan   0
-                -ypan   0
             }
             if { $_first != "" } {
@@ -1157 +1153 @@
     SendCmd "camera pan $x $y"
 }
-
 
 # ----------------------------------------------------------------------